about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-09-10 13:10:04 +0000
committerEric Wong <e@80x24.org>2021-09-10 20:43:34 +0000
commit47ad2954fa34cdc75fa5c56f38f352d77afba553 (patch)
tree8994316a269e145e895ef61587f76141a10ec857
parent6b3dd4a43a50d3bcefe92f5f5934647e7f57d1be (diff)
downloadpublic-inbox-47ad2954fa34cdc75fa5c56f38f352d77afba553.tar.gz
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.
-rw-r--r--INSTALL4
-rw-r--r--Makefile.PL2
-rwxr-xr-xci/deps.perl5
3 files changed, 5 insertions, 6 deletions
diff --git a/INSTALL b/INSTALL
index e93731f1..eb939a59 100644
--- 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 bfabb171..1e935012 100644
--- 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 643e86c0..a797911a 100755
--- 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',