From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 79A331F8C6 for ; Fri, 10 Sep 2021 13:10:04 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] INSTALL: depend on URI rather than URI::Escape Date: Fri, 10 Sep 2021 13:10:04 +0000 Message-Id: <20210910131004.22669-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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. --- INSTALL | 4 ++-- Makefile.PL | 2 +- ci/deps.perl | 5 ++--- 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',