pre-approval for perl/5.10.1-15
Hi release team,
would you be OK with some or all of these changes for squeeze?
perl (5.10.1-15) UNRELEASED; urgency=low
.
* Include the Text::Tabs license in debian/copyright. Thanks to "v.nix.is".
(Closes: #596844)
* Downgrade the 'make' recommendation to a suggestion to avoid pulling
it in by default after all. (Closes: #596734) (Reopens: #293908)
* Put the libfile-spec-perl conflict version in line with the separate
package, which uses four digits. (Closes: #595121)
* Squelch useless locale warnings during package maintainer scripts.
(Closes: #508764)
Full debdiff attached.
Many thanks for your work,
--
Niko Tyni ntyni@debian.org
diff -Nru perl-5.10.1/debian/changelog perl-5.10.1/debian/changelog
--- perl-5.10.1/debian/changelog 2010-08-04 17:57:40.000000000 +0300
+++ perl-5.10.1/debian/changelog 2010-10-06 09:46:51.000000000 +0300
@@ -1,3 +1,16 @@
+perl (5.10.1-15) UNRELEASED; urgency=low
+
+ * Include the Text::Tabs license in debian/copyright. Thanks to "v.nix.is".
+ (Closes: #596844)
+ * Downgrade the 'make' recommendation to a suggestion to avoid pulling
+ it in by default after all. (Closes: #596734) (Reopens: #293908)
+ * Put the libfile-spec-perl conflict version in line with the separate
+ package, which uses four digits. (Closes: #595121)
+ * Squelch useless locale warnings during package maintainer scripts.
+ (Closes: #508764)
+
+ -- Niko Tyni <ntyni@debian.org> Sat, 02 Oct 2010 21:15:09 +0300
+
perl (5.10.1-14) unstable; urgency=medium
* Don't override -DDEBIAN on GNU/Hurd, fixing @INC breakage and other
diff -Nru perl-5.10.1/debian/control perl-5.10.1/debian/control
--- perl-5.10.1/debian/control 2010-08-04 13:59:42.000000000 +0300
+++ perl-5.10.1/debian/control 2010-10-06 09:46:51.000000000 +0300
@@ -17,7 +17,7 @@
Pre-Depends: ${shlibs:Depends}, dpkg (>= 1.14.20)
Conflicts: autoconf2.13 (<< 2.13-45),
libscalar-list-utils-perl (<< 1:1.21),
- libfile-spec-perl (<< 3.30),
+ libfile-spec-perl (<< 3.3000),
safe-rm (<< 0.8),
libxsloader-perl (<< 0.10)
Replaces: perl (<< 5.10.1-12), perl-modules (<< 5.10.1-1), libperl5.8 (<< 5.8.0-20),
@@ -93,7 +93,7 @@
libparent-perl (<< 0.221),
libautodie-perl (<< 2.06.01),
libthread-queue-perl (<< 2.11),
- libfile-spec-perl (<< 3.30),
+ libfile-spec-perl (<< 3.3000),
libtime-local-perl (<< 1.1901),
libpod-plainer-perl (<< 0.01),
libclass-isa-perl (<< 0.33),
@@ -288,8 +288,9 @@
libthreads-perl,
libthreads-shared-perl,
libtime-piece-perl
-Recommends: netbase, make
-Suggests: perl-doc, libterm-readline-gnu-perl | libterm-readline-perl-perl
+Recommends: netbase
+Suggests: perl-doc, libterm-readline-gnu-perl | libterm-readline-perl-perl,
+ make
Description: Larry Wall's Practical Extraction and Report Language
An interpreted scripting language, known among some as "Unix's Swiss
Army Chainsaw".
diff -Nru perl-5.10.1/debian/copyright perl-5.10.1/debian/copyright
--- perl-5.10.1/debian/copyright 2010-08-04 13:59:42.000000000 +0300
+++ perl-5.10.1/debian/copyright 2010-10-06 09:46:51.000000000 +0300
@@ -199,6 +199,16 @@
--------------------------------------------------------------------------
+The Text::Tabs module in lib/Text/Tabs.pm has the following
+copyright and license:
+
+ Copyright (C) 1996-2002,2005,2006 David Muir Sharnoff.
+ Copyright (C) 2005 Aristotle Pagaltzis
+ This module may be modified, used, copied, and redistributed at your own risk.
+ Publicly redistributed modified versions must use a different name.
+
+--------------------------------------------------------------------------
+
Portions of the Debian packaging are
Copyright 2008-2010 Niko Tyni <ntyni@debian.org>
The other people listed in debian/changelog are most probably
diff -Nru perl-5.10.1/debian/patches/debian/squelch-locale-warnings.diff perl-5.10.1/debian/patches/debian/squelch-locale-warnings.diff
--- perl-5.10.1/debian/patches/debian/squelch-locale-warnings.diff 1970-01-01 02:00:00.000000000 +0200
+++ perl-5.10.1/debian/patches/debian/squelch-locale-warnings.diff 2010-10-06 09:47:02.000000000 +0300
@@ -0,0 +1,53 @@
+From: Niko Tyni <ntyni@debian.org>
+Subject: Squelch locale warnings in Debian package maintainer scripts
+Bug-Debian: http://bugs.debian.org/508764
+
+The system locales are rather frequently out of sync with the C library
+during package upgrades, causing a huge amount of useless Perl locale
+warnings. Squelch them when running package maintainer scripts, detected
+by the DPKG_RUNNING_VERSION environment variable.
+
+Any real locale problem will show up after the system upgrade too, and
+the warning will be triggered normally again at that point.
+
+---
+ locale.c | 4 ++++
+ pod/perllocale.pod | 8 ++++++++
+ 2 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/locale.c b/locale.c
+index f7cb79c..56fa34d 100644
+--- a/locale.c
++++ b/locale.c
+@@ -359,6 +359,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
+ char *p;
+ const bool locwarn = (printwarn > 1 ||
+ (printwarn &&
++
++ /* Debian specific change - see http://bugs.debian.org/508764 */
++ (!PerlEnv_getenv("DPKG_RUNNING_VERSION")) &&
++
+ (!(p = PerlEnv_getenv("PERL_BADLANG")) || atoi(p))));
+
+ if (locwarn) {
+diff --git a/pod/perllocale.pod b/pod/perllocale.pod
+index 3c2b3ab..17c6d40 100644
+--- a/pod/perllocale.pod
++++ b/pod/perllocale.pod
+@@ -844,6 +844,14 @@ B<NOTE>: PERL_BADLANG only gives you a way to hide the warning message.
+ The message tells about some problem in your system's locale support,
+ and you should investigate what the problem is.
+
++=item DPKG_RUNNING_VERSION
++
++On Debian systems, if the DPKG_RUNNING_VERSION environment variable is
++set (to any value), the locale failure warnings will be suppressed just
++like with a zero PERL_BADLANG setting. This is done to avoid floods
++of spurious warnings during system upgrades.
++See L<http://bugs.debian.org/508764>.
++
+ =back
+
+ The following environment variables are not specific to Perl: They are
+--
+tg: (daf8b46..) debian/squelch-locale-warnings (depends on: upstream)
diff -Nru perl-5.10.1/debian/patches/patchlevel perl-5.10.1/debian/patches/patchlevel
--- perl-5.10.1/debian/patches/patchlevel 2010-08-04 18:05:11.000000000 +0300
+++ perl-5.10.1/debian/patches/patchlevel 2010-10-06 09:47:02.000000000 +0300
@@ -1,4 +1,4 @@
-Subject: List packaged patches for 5.10.1-14 in patchlevel.h
+Subject: List packaged patches for 5.10.1-15 in patchlevel.h
Origin: vendor
Bug-Debian: http://bugs.debian.org/567489
@@ -8,7 +8,7 @@
--- perl/patchlevel.bak
+++ perl/patchlevel.h
-@@ -133,0 +134,46 @@
+@@ -133,0 +134,47 @@
+ ,"DEBPKG:debian/arm_thread_stress_timeout - http://bugs.debian.org/501970 Raise the timeout of ext/threads/shared/t/stress.t to accommodate slower build hosts"
+ ,"DEBPKG:debian/cpan_config_path - Set location of CPAN::Config to /etc/perl as /usr may not be writable."
+ ,"DEBPKG:debian/cpan_definstalldirs - Provide a sensible INSTALLDIRS default for modules installed from CPAN."
@@ -54,4 +54,5 @@
+ ,"DEBPKG:fixes/arm-alignment - http://bugs.debian.org/289884 [f1c7503] Prevent gcc from optimizing the alignment test away on armel"
+ ,"DEBPKG:fixes/fcgi-test - Fix a failure in CGI/t/fast.t when FCGI is installed"
+ ,"DEBPKG:fixes/hurd-ccflags - http://bugs.debian.org/587901 Make hints/gnu.sh append to $ccflags rather than overriding them"
-+ ,"DEBPKG:patchlevel - http://bugs.debian.org/567489 List packaged patches for 5.10.1-14 in patchlevel.h"
++ ,"DEBPKG:debian/squelch-locale-warnings - http://bugs.debian.org/508764 Squelch locale warnings in Debian package maintainer scripts"
++ ,"DEBPKG:patchlevel - http://bugs.debian.org/567489 List packaged patches for 5.10.1-15 in patchlevel.h"
diff -Nru perl-5.10.1/debian/patches/series perl-5.10.1/debian/patches/series
--- perl-5.10.1/debian/patches/series 2010-08-04 18:05:11.000000000 +0300
+++ perl-5.10.1/debian/patches/series 2010-10-06 09:47:02.000000000 +0300
@@ -43,4 +43,5 @@
fixes/arm-alignment.diff -p1
fixes/fcgi-test.diff -p1
fixes/hurd-ccflags.diff -p1
+debian/squelch-locale-warnings.diff -p1
patchlevel -p1
Reply to: