[libhtml-mason-perl] 01/02: Drop git-debcherry framework as per decision of the pkg-perl BoF at DebConf17.
gregor herrmann
gregoa at debian.org
Fri Sep 22 18:11:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libhtml-mason-perl.
commit 355409ed904428ec2bea6b5cb47d34b9d87889df
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Sep 22 20:01:01 2017 +0200
Drop git-debcherry framework as per decision of the pkg-perl BoF at DebConf17.
Unapply patches, update patch headers, remove git notes, remove
debian/README.source and debian/gbp.conf.
---
debian/README.source | 18 ------------------
debian/gbp.conf | 3 ---
debian/patches/01_apachehandler.patch | 11 +----------
debian/patches/02_cgihandler.patch | 8 --------
debian/patches/manpage-has-bad-whatis-entry.patch | 8 --------
lib/HTML/Mason.pm | 4 ----
lib/HTML/Mason/ApacheHandler.pm | 16 +++++-----------
lib/HTML/Mason/CGIHandler.pm | 3 ---
8 files changed, 6 insertions(+), 65 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index cb28e02..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,18 +0,0 @@
-git-debcherry in use
-====================
-
-If you are reading this from a Debian source package, you can stop now;
-this package should build normally after extracting with dpkg-source -x.
-
-If you are working in a checkout of the package's git repo, you should
-also be able to just ignore debcherry and work on patches with quilt,
-with the difference that the master branch is patches-applied. You are
-however invited to take a look at git-debcherry and let it handle the
-debian/patches directory automatically.
-
-If you so wish, the following command will set up quilt to work with
-patches-appled in this repository:
-
- for patch in `quilt series | tac`; \
- do patch -p1 -R --no-backup-if-mismatch <"debian/patches/$patch"; done; \
- quilt push -a
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 6c88b1f..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[import-orig]
-merge-mode=merge
-rollback=False
diff --git a/debian/patches/01_apachehandler.patch b/debian/patches/01_apachehandler.patch
index b8d5d90..b66fd03 100644
--- a/debian/patches/01_apachehandler.patch
+++ b/debian/patches/01_apachehandler.patch
@@ -1,17 +1,8 @@
From: Florian Schlichting <fsfs at debian.org>
Date: Sat, 9 Jul 2011 17:10:59 +0200
-Subject: [PATCH] fix $VERSION handling; use /var/cache/mason as default
- data_dir
-
-
+Subject: [PATCH] fix $VERSION handling; use /var/cache/mason as default data_dir
Origin: vendor
-Patch-Name: 01_apachehandler.patch
----
-
- lib/HTML/Mason/ApacheHandler.pm | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
-diff --git a/lib/HTML/Mason/ApacheHandler.pm b/lib/HTML/Mason/ApacheHandler.pm
--- a/lib/HTML/Mason/ApacheHandler.pm
+++ b/lib/HTML/Mason/ApacheHandler.pm
@@ -9,9 +9,6 @@ use warnings;
diff --git a/debian/patches/02_cgihandler.patch b/debian/patches/02_cgihandler.patch
index 4784c63..0683b7e 100644
--- a/debian/patches/02_cgihandler.patch
+++ b/debian/patches/02_cgihandler.patch
@@ -1,16 +1,8 @@
From: Florian Schlichting <fsfs at debian.org>
Date: Sat, 9 Jul 2011 17:10:59 +0200
Subject: [PATCH] mimic mod_perl behaviour in HTML::Mason::CGIHandler
-
-
Origin: vendor
-Patch-Name: 02_cgihandler.patch
----
-
- lib/HTML/Mason/CGIHandler.pm | 3 +++
- 1 file changed, 3 insertions(+)
-diff --git a/lib/HTML/Mason/CGIHandler.pm b/lib/HTML/Mason/CGIHandler.pm
--- a/lib/HTML/Mason/CGIHandler.pm
+++ b/lib/HTML/Mason/CGIHandler.pm
@@ -86,6 +86,9 @@ sub _handler {
diff --git a/debian/patches/manpage-has-bad-whatis-entry.patch b/debian/patches/manpage-has-bad-whatis-entry.patch
index 56daeb6..15a7fd1 100644
--- a/debian/patches/manpage-has-bad-whatis-entry.patch
+++ b/debian/patches/manpage-has-bad-whatis-entry.patch
@@ -2,14 +2,6 @@ From: Florian Schlichting <fsfs at debian.org>
Date: Tue, 18 Aug 2015 18:19:54 +0200
Subject: [PATCH] Fix "manpage-has-bad-whatis-entry" lintian warning
-
-Patch-Name: manpage-has-bad-whatis-entry.patch
----
-
- lib/HTML/Mason.pm | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/HTML/Mason.pm b/lib/HTML/Mason.pm
--- a/lib/HTML/Mason.pm
+++ b/lib/HTML/Mason.pm
@@ -20,6 +20,10 @@ sub version
diff --git a/lib/HTML/Mason.pm b/lib/HTML/Mason.pm
index 88e9d3f..0473965 100644
--- a/lib/HTML/Mason.pm
+++ b/lib/HTML/Mason.pm
@@ -20,10 +20,6 @@ sub version
__END__
-=head1 NAME
-
-Mason - High-performance, dynamic web site authoring system
-
=pod
=head1 VERSION
diff --git a/lib/HTML/Mason/ApacheHandler.pm b/lib/HTML/Mason/ApacheHandler.pm
index c607366..c8424c8 100644
--- a/lib/HTML/Mason/ApacheHandler.pm
+++ b/lib/HTML/Mason/ApacheHandler.pm
@@ -9,6 +9,9 @@ use warnings;
package HTML::Mason::ApacheHandler;
+use vars qw($VERSION);
+# do not change the version number
+$VERSION = 1.69;
# PerlAddVar was introduced in mod_perl-1.24
@@ -24,7 +27,7 @@ BEGIN
require mod_perl;
}
- my $mpver = ($mod_perl2::VERSION || $mod_perl::VERSION || 0);
+ my $mpver = (mod_perl2->VERSION || mod_perl->VERSION || 0);
# This is the version that introduced PerlAddVar
if ($mpver && $mpver < 1.24)
@@ -267,11 +270,6 @@ if ( $ENV{MOD_PERL} && ! APACHE2 )
unless Apache::perl_hook('TableApi');
}
-# CFRY: moved down from top of file in Debian (by a previous maintainer)
-use vars qw($VERSION);
-# do not change the version number
-$VERSION = 1.69;
-
use base qw(HTML::Mason::Handler);
BEGIN
@@ -600,11 +598,7 @@ sub new
if (exists $allowed_params->{data_dir} and not exists $params{data_dir})
{
# constructs path to <server root>/mason
- # CFRY: use /var/cache/mason as default data_dir on Debian
- if (-d '/var/cache/mason') {
- $defaults{data_dir} = '/var/cache/mason';
- }
- elsif (UNIVERSAL::can('Apache2::ServerUtil','server_root')) {
+ if (UNIVERSAL::can('Apache2::ServerUtil','server_root')) {
$defaults{data_dir} = File::Spec->catdir(Apache2::ServerUtil::server_root(),'mason');
} else {
$defaults{data_dir} = Apache->server_root_relative('mason');
diff --git a/lib/HTML/Mason/CGIHandler.pm b/lib/HTML/Mason/CGIHandler.pm
index af3baed..1c4b581 100644
--- a/lib/HTML/Mason/CGIHandler.pm
+++ b/lib/HTML/Mason/CGIHandler.pm
@@ -86,9 +86,6 @@ sub _handler {
$sent_headers = 1;
}
- # mimic mod_perl behaviour
- use bytes;
-
# We could perhaps install a new, faster out_method here that
# wouldn't have to keep checking whether headers have been
# sent and what the $r->method is. That would require
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libhtml-mason-perl.git
More information about the Pkg-perl-cvs-commits
mailing list