INSTALL: depend on URI rather than URI::Escape

As far as I can tell, URI::Escape has always been a part of the
`URI' package (aka "distribution" on CPAN) and not distributed
separately (unlike URI::Escape::XS).  So avoid confusing users
with `URI::Escape' and just document `URI' instead.

Along the same lines, we depend on the `Plack' package rather
than Plack::Util or Plack::Builder, after all.

diff --git a/INSTALL b/INSTALL
index e93731f155d7b9ec3754dffa24dfb52207564216..eb939a59d596c0f20e7f03f931791b4337b9dee5 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -36,9 +36,9 @@ To accept incoming mail into a public inbox, you'll likely want:
 * MTA - postfix is recommended (for public-inbox-mda)
 * SpamAssassin (spamc/spamd)   (for public-inbox-watch/public-inbox-mda)
 
-Beyond that, there is one non-standard Perl module required:
+Beyond that, there is one non-standard Perl package required:
 
-* URI::Escape                      deb: liburi-perl
+* URI                              deb: liburi-perl
                                    pkg: p5-URI
                                    rpm: perl-URI
                                    (for HTML/Atom generation)

diff --git a/Makefile.PL b/Makefile.PL
index bfabb171502a0bf5814ea6529f9acd80ab72970a..1e935012e3751c5838bbd30c080d19b2fd4beed5 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -168,7 +168,7 @@ WriteMakefile(
                # Plack is needed for public-inbox-httpd and PublicInbox::WWW
                # 'Plack' => 0,
 
-               'URI::Escape' => 0,
+               'URI' => 0,
 
                # We have more test dependencies, but do not force
                # users to install them.  See INSTALL

diff --git a/ci/deps.perl b/ci/deps.perl
index 643e86c0563a1895f7b981cc861b8bf395c79427..a797911a7a57d0c7df5ba4d6d8a289dea652d648 100755 (executable)
--- a/ci/deps.perl
+++ b/ci/deps.perl
@@ -14,7 +14,6 @@ my @test_essential = qw(Test::Simple); # we actually use Test::More
 # package profiles
 my $profiles = {
        # the smallest possible profile for testing
-       # TODO: trim URI::Escape from this, maybe
        essential => [ qw(
                git
                perl
@@ -23,7 +22,7 @@ my $profiles = {
                Encode
                ExtUtils::MakeMaker
                IO::Compress::Gzip
-               URI::Escape
+               URI
                ), @test_essential ],
 
        # everything optional for normal use
@@ -109,7 +108,7 @@ my $non_auto = {
                pkg => 'p5-Plack',
                rpm => 'perl-Plack-Test',
        },
-       'URI::Escape' => {
+       'URI' => {
                deb => 'liburi-perl',
                pkg => 'p5-URI',
                rpm => 'perl-URI',