To avoid cluttering up the BTS while still complying with full NMU
procedures, I'm attaching the full patch for 3.04-1.3 here.

-- 
Gunnar Wolf - [EMAIL PROTECTED] - (+52-55)5623-0154 / 1451-2244
PGP key 1024D/8BB527AF 2001-10-23
Fingerprint: 0C79 D2D1 2C4E 9CE4 5973  F800 D80E F35A 8BB5 27AF
Only in libpod-webserver-perl-3.04: blib
Only in libpod-webserver-perl-3.04: build-stamp
diff -u -r libpod-webserver-perl-3.04.yours/debian/changelog libpod-webserver-perl-3.04/debian/changelog
--- libpod-webserver-perl-3.04.yours/debian/changelog	2008-05-28 10:47:28.000000000 -0500
+++ libpod-webserver-perl-3.04/debian/changelog	2008-05-28 11:15:27.000000000 -0500
@@ -1,3 +1,14 @@
+libpod-webserver-perl (3.04-1.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove /usr/lib/perl5 only if it exists (needed to avoid FTBFS after
+    Perl 5.10 transition) (Closes: #483388)
+  * Fixed test that failed after Perl 5.10 transition (Closes: #467279)
+  * Fixed versioned build-dependencies which are satisfied by Perl 5.10
+    (Closes: #481959)
+
+ -- Gunnar Wolf <[EMAIL PROTECTED]>  Wed, 28 May 2008 11:15:06 -0500
+
 libpod-webserver-perl (3.04-1.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u -r libpod-webserver-perl-3.04.yours/debian/control libpod-webserver-perl-3.04/debian/control
--- libpod-webserver-perl-3.04.yours/debian/control	2008-05-28 10:47:28.000000000 -0500
+++ libpod-webserver-perl-3.04/debian/control	2008-05-28 11:10:19.000000000 -0500
@@ -1,7 +1,7 @@
 Source: libpod-webserver-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5.0.0), libpod-simple-perl (>= 3.04-1)
+Build-Depends: debhelper (>= 5.0.0), perl-modules (>= 5.10.0) | libpod-simple-perl (>= 3.04-1)
 Build-Depends-Indep: perl (>= 5.8.8-6.1)
 Maintainer: Alejandro Garrido Mota <[EMAIL PROTECTED]>
 Standards-Version: 3.7.3
Only in libpod-webserver-perl-3.04/debian: files
Only in libpod-webserver-perl-3.04/debian: libpod-webserver-perl
Only in libpod-webserver-perl-3.04/debian: libpod-webserver-perl.debhelper.log
Only in libpod-webserver-perl-3.04/debian: libpod-webserver-perl.substvars
diff -u -r libpod-webserver-perl-3.04.yours/debian/rules libpod-webserver-perl-3.04/debian/rules
--- libpod-webserver-perl-3.04.yours/debian/rules	2008-05-28 10:47:28.000000000 -0500
+++ libpod-webserver-perl-3.04/debian/rules	2008-05-28 10:58:31.000000000 -0500
@@ -51,9 +51,11 @@
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 
 	# As this is a architecture independent package, we are not
-	# supposed to install stuff to /usr/lib. MakeMaker creates
-	# the dirs, we delete them from the deb:
-	rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5
+	# supposed to install stuff to /usr/lib. MakeMaker (on Perl <= 5.8.x)
+	# creates the dirs, we delete them from the deb:
+	 ! -d $(TMP)/usr/lib/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/lib/perl5
 
 	touch install-stamp
 
Only in libpod-webserver-perl-3.04: install-stamp
Only in libpod-webserver-perl-3.04: Makefile
Only in libpod-webserver-perl-3.04: no_apply.t
Only in libpod-webserver-perl-3.04: pm_to_blib
diff -u -r libpod-webserver-perl-3.04.yours/t/01_about_verbose.t libpod-webserver-perl-3.04/t/01_about_verbose.t
--- libpod-webserver-perl-3.04.yours/t/01_about_verbose.t	2006-06-02 22:10:45.000000000 -0500
+++ libpod-webserver-perl-3.04/t/01_about_verbose.t	2008-05-28 10:45:36.000000000 -0500
@@ -43,8 +43,8 @@
     if(defined ${$this . '::VERSION'} ) {
       $v{$this} = ${$this . '::VERSION'}
     } elsif(
-       defined *{$this . '::ISA'} or defined &{$this . '::import'}
-       or ($this ne '' and grep defined *{$_}{'CODE'}, values %{$this . "::"})
+	eval{defined *{$this . '::ISA'}} or eval{defined &{$this . '::import'}}
+	or ($this ne '' and eval{grep defined *{$_}{'CODE'}, values %{$this . "::"}})
        # If it has an ISA, an import, or any subs...
     ) {
       # It's a class/module with no version.
Only in libpod-webserver-perl-3.04.yours/t: 03_daemon.t

Attachment: signature.asc
Description: Digital signature

Reply via email to