Dear release-team,
I have the following changess pending in pkg-perl SVN repository.
The question is, would you mind the additional changes to slip along
with the fix for #503375?
Interdiff attached. I bit of noise in it is caused by the refreshment
of the quilt patches using -pab --no-timestamp.
----------------------------------------------------------
libapache2-mod-perl2 (2.0.4-4) UNRELEASED; urgency=medium
[ Frank Lichtenheld ]
* Convert debian/copyright to proposed new format.
* Refer to Apache License in /usr/share/common-licenses.
* Bump Standards-Version to 3.8.0.
[ gregor herrmann ]
* Add debian/README.source to document quilt usage, as required by
Debian Policy since 3.8.0.
[ Damyan Ivanov ]
* add dependency on apache2 (>= 2.2.4) because of the new
ap_get_server_banner symbol not available in previous apaches
Closes: #503375: libapache2-mod-perl2 - Uses undefined symbol
ap_get_server_banner
Thanks to Bastian Blank for reporting.
----------------------------------------------------------
Thanks for your time.
--
dam JabberID: dam@jabber.minus273.org
diff -u libapache2-mod-perl2-2.0.4/debian/changelog libapache2-mod-perl2-2.0.4/debian/changelog
--- libapache2-mod-perl2-2.0.4/debian/changelog
+++ libapache2-mod-perl2-2.0.4/debian/changelog
@@ -1,3 +1,25 @@
+libapache2-mod-perl2 (2.0.4-4) UNRELEASED; urgency=medium
+
+ WAIT FOR -3 to hit lenny
+
+ [ Frank Lichtenheld ]
+ * Convert debian/copyright to proposed new format.
+ * Refer to Apache License in /usr/share/common-licenses.
+ * Bump Standards-Version to 3.8.0.
+
+ [ gregor herrmann ]
+ * Add debian/README.source to document quilt usage, as required by
+ Debian Policy since 3.8.0.
+
+ [ Damyan Ivanov ]
+ * add dependency on apache2 (>= 2.2.4) because of the new
+ ap_get_server_banner symbol not available in previous apaches
+ Closes: #503375: libapache2-mod-perl2 - Uses undefined symbol
+ ap_get_server_banner
+ Thanks to Bastian Blank for reporting.
+
+ -- Frank Lichtenheld <djpig@debian.org> Wed, 06 Aug 2008 20:12:39 -0300
+
libapache2-mod-perl2 (2.0.4-3) unstable; urgency=low
* Add an alternative (and preferred) build-dependency on
diff -u libapache2-mod-perl2-2.0.4/debian/control libapache2-mod-perl2-2.0.4/debian/control
--- libapache2-mod-perl2-2.0.4/debian/control
+++ libapache2-mod-perl2-2.0.4/debian/control
@@ -4,7 +4,7 @@
Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
Uploaders: Gunnar Wolf <gwolf@debian.org>, Damyan Ivanov <dmn@debian.org>,
Niko Tyni <ntyni@debian.org>, gregor herrmann <gregoa@debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://perl.apache.org/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libapache2-mod-perl2/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/
@@ -19,7 +19,8 @@
Package: libapache2-mod-perl2
Architecture: any
Depends: apache2.2-common, ${perl:Depends}, libwww-perl, libmime-base64-perl,
- libdevel-symdump-perl, liburi-perl, ${shlibs:Depends}, netbase
+ libdevel-symdump-perl, liburi-perl, ${shlibs:Depends}, netbase,
+ apache2 (>= 2.2.4)
Recommends: libbsd-resource-perl, libapache2-reload-perl
Description: Integration of perl with the Apache2 web server
mod_perl allows the use of Perl for just about anything
diff -u libapache2-mod-perl2-2.0.4/debian/copyright libapache2-mod-perl2-2.0.4/debian/copyright
--- libapache2-mod-perl2-2.0.4/debian/copyright
+++ libapache2-mod-perl2-2.0.4/debian/copyright
@@ -1,219 +1,43 @@
-This package was debianized by Thom May on
-Wed, 23 Oct 2002 16:21:08 +0100, and was co-maintained by him and
-Andres Salomon <dilinger@debian.org>.
-
-As of Fri Aug 17 16:40:06 UTC 2007, this package was adopted by the
-Debian Pkg-Perl group. Modifications and packaging information added
-to this package by the Perl group are covered by the same license as
-the package itself, the Apache License 2.0
-
-It was downloaded from http://perl.apache.org/dist/
-
-Authors: mod_perl-2.0 was designed and written by Doug MacEachern, with
-contributions from many others (see Changes files).
-
-Copyright: 2002-2008 Doug MacEachern
-
-License:
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+
+Debianized-By: Thom May <thom@debian.org>
+Debianized-Date: Wed, 23 Oct 2002 16:21:08 +0100
+
+Original-Source-Location: http://perl.apache.org/dist/
+Original-Source-Command: uscan --force
+
+Upstream-Author: mod_perl-2.0 was designed and written by Doug MacEachern, with
+ contributions from many others (see Changes files).
+
+Files: *
+Copyright: © 2002-2008 Doug MacEachern
+License: Apache-2.0
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+Files: debian/*
+Copyright:
+ © 2008 Niko Tyni <ntyni@debian.org>
+ © 2007-2008 Gunnar Wolf <gwolf@debian.org>
+ © 2007-2008 Damyan Ivanov <dmn@debian.org>
+ © 2003-2006 Andres Salomon <dilinger@voxel.net>
+ © 2002-2005 Thom May <thom@debian.org>
+License: Apache-2.0
+ The packaging work is licensed under the same terms as the software itself.
+
+License: Apache-2.0
+ On Debian systems the Apache License 2.0 can be found at
+ `/usr/share/common-licenses/Apache-2.0'.
+
diff -u libapache2-mod-perl2-2.0.4/debian/patches/004-bugs-to-debian-bts.patch libapache2-mod-perl2-2.0.4/debian/patches/004-bugs-to-debian-bts.patch
--- libapache2-mod-perl2-2.0.4/debian/patches/004-bugs-to-debian-bts.patch
+++ libapache2-mod-perl2-2.0.4/debian/patches/004-bugs-to-debian-bts.patch
@@ -1,8 +1,6 @@
-Index: libapache2-mod-perl2/lib/ModPerl/TestReport.pm
-===================================================================
---- libapache2-mod-perl2.orig/lib/ModPerl/TestReport.pm 2007-08-21 13:16:40.000000000 +0300
-+++ libapache2-mod-perl2/lib/ModPerl/TestReport.pm 2007-08-21 13:35:30.000000000 +0300
-@@ -97,7 +97,11 @@
+--- a/lib/ModPerl/TestReport.pm
++++ b/lib/ModPerl/TestReport.pm
+@@ -97,7 +97,11 @@ sub package2filename {
return $package;
}
diff -u libapache2-mod-perl2-2.0.4/debian/patches/009-allow-parallel-build.patch libapache2-mod-perl2-2.0.4/debian/patches/009-allow-parallel-build.patch
--- libapache2-mod-perl2-2.0.4/debian/patches/009-allow-parallel-build.patch
+++ libapache2-mod-perl2-2.0.4/debian/patches/009-allow-parallel-build.patch
@@ -1,8 +1,6 @@
-Index: libapache2-mod-perl2/Makefile.PL
-===================================================================
---- libapache2-mod-perl2.orig/Makefile.PL 2007-10-30 09:36:28.000000000 +0100
-+++ libapache2-mod-perl2/Makefile.PL 2007-10-30 09:43:38.000000000 +0100
-@@ -738,7 +738,9 @@
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -738,7 +738,9 @@ sub MY::install {
ModPerl::MM::add_dep_after(\$string, qw(install doc_install modperl_banner));
# glue_pods target must come first
diff -u libapache2-mod-perl2-2.0.4/debian/patches/030-apxs-no-prefix.patch libapache2-mod-perl2-2.0.4/debian/patches/030-apxs-no-prefix.patch
--- libapache2-mod-perl2-2.0.4/debian/patches/030-apxs-no-prefix.patch
+++ libapache2-mod-perl2-2.0.4/debian/patches/030-apxs-no-prefix.patch
@@ -1,9 +1,9 @@
As a comment inside apxs2 indicates:
# Debian doesn't have a CFG_PREFIX [...]
so use SYSCONFDIR instead to shut up apxs warnings.
---- libapache2-mod-perl2.orig/Apache-Test/lib/Apache/TestConfigParse.pm
-+++ libapache2-mod-perl2/Apache-Test/lib/Apache/TestConfigParse.pm
-@@ -86,7 +86,7 @@
+--- a/Apache-Test/lib/Apache/TestConfigParse.pm
++++ b/Apache-Test/lib/Apache/TestConfigParse.pm
+@@ -86,7 +86,7 @@ sub server_file_rel2abs {
'user-supplied $base' ],
[ $self->{inherit_config}->{ServerRoot},
'httpd.conf inherited ServerRoot' ],
diff -u libapache2-mod-perl2-2.0.4/debian/patches/006_man_section_and_build_warnings.patch libapache2-mod-perl2-2.0.4/debian/patches/006_man_section_and_build_warnings.patch
--- libapache2-mod-perl2-2.0.4/debian/patches/006_man_section_and_build_warnings.patch
+++ libapache2-mod-perl2-2.0.4/debian/patches/006_man_section_and_build_warnings.patch
@@ -1,8 +1,6 @@
-Index: libapache2-mod-perl2/lib/ModPerl/BuildMM.pm
-===================================================================
---- libapache2-mod-perl2.orig/lib/ModPerl/BuildMM.pm 2007-08-21 13:16:41.000000000 +0300
-+++ libapache2-mod-perl2/lib/ModPerl/BuildMM.pm 2007-08-21 13:39:47.000000000 +0300
-@@ -281,7 +281,7 @@
+--- a/lib/ModPerl/BuildMM.pm
++++ b/lib/ModPerl/BuildMM.pm
+@@ -281,7 +281,7 @@ sub ModPerl::BuildMM::MY::postamble {
$man =~ s!/!::!g;
push @target,
diff -u libapache2-mod-perl2-2.0.4/debian/patches/001-gtop2.patch libapache2-mod-perl2-2.0.4/debian/patches/001-gtop2.patch
--- libapache2-mod-perl2-2.0.4/debian/patches/001-gtop2.patch
+++ libapache2-mod-perl2-2.0.4/debian/patches/001-gtop2.patch
@@ -1,8 +1,6 @@
-Index: libapache2-mod-perl2/lib/Apache2/Build.pm
-===================================================================
---- libapache2-mod-perl2.orig/lib/Apache2/Build.pm 2006-11-20 01:31:40.000000000 +0200
-+++ libapache2-mod-perl2/lib/Apache2/Build.pm 2007-08-21 13:33:39.000000000 +0300
-@@ -449,7 +449,7 @@
+--- a/lib/Apache2/Build.pm
++++ b/lib/Apache2/Build.pm
+@@ -449,7 +449,7 @@ sub gtop_ldopts_old {
$xlibs .= ' -lintl';
}
diff -u libapache2-mod-perl2-2.0.4/debian/patches/031-test-extra-args.patch libapache2-mod-perl2-2.0.4/debian/patches/031-test-extra-args.patch
--- libapache2-mod-perl2-2.0.4/debian/patches/031-test-extra-args.patch
+++ libapache2-mod-perl2-2.0.4/debian/patches/031-test-extra-args.patch
@@ -1,8 +1,8 @@
Honour $(APACHE_TEST_EXTRA_ARGS); Makefile.PL has apparently not been updated
since this was added to Apache::Test.
---- libapache2-mod-perl2.orig/Makefile.PL
-+++ libapache2-mod-perl2/Makefile.PL
-@@ -779,12 +779,12 @@
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -779,12 +779,12 @@ TEST_FILES =
test_clean :
$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
only in patch2:
unchanged:
--- libapache2-mod-perl2-2.0.4.orig/debian/README.source
+++ libapache2-mod-perl2-2.0.4/debian/README.source
@@ -0,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
Attachment:
signature.asc
Description: Digital signature