r40482 - in /trunk/libdata-sorting-perl/debian: README.source changelog control patches/ patches/fix-uninitialized-value-warning.patch patches/series patches/test-warnings.patch rules

Wed Jul 22 11:47:45 UTC 2009

Author: ansgar-guest
Date: Wed Jul 22 11:47:36 2009
New Revision: 40482

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=40482
Log:
* Fix warnings that showed up in the test suite
  + new patches "fix-uninitialized-value-warning.patch" and
    "test-warnings.patch"
  + Build-dep on perl (>= 5.10) because the patch uses the ~~ operator
  + Add quilt framework and README.source

Added:
    trunk/libdata-sorting-perl/debian/README.source
    trunk/libdata-sorting-perl/debian/patches/
    trunk/libdata-sorting-perl/debian/patches/fix-uninitialized-value-warning.patch
    trunk/libdata-sorting-perl/debian/patches/series
    trunk/libdata-sorting-perl/debian/patches/test-warnings.patch
Modified:
    trunk/libdata-sorting-perl/debian/changelog
    trunk/libdata-sorting-perl/debian/control
    trunk/libdata-sorting-perl/debian/rules

Added: trunk/libdata-sorting-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-sorting-perl/debian/README.source?rev=40482&op=file
==============================================================================

--- trunk/libdata-sorting-perl/debian/README.source (added)
+++ trunk/libdata-sorting-perl/debian/README.source Wed Jul 22 11:47:36 2009
@@ -1,0 +1,6 @@
+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.
+

Modified: trunk/libdata-sorting-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-sorting-perl/debian/changelog?rev=40482&op=diff
==============================================================================
--- trunk/libdata-sorting-perl/debian/changelog (original)
+++ trunk/libdata-sorting-perl/debian/changelog Wed Jul 22 11:47:36 2009
@@ -1,7 +1,4 @@
-libdata-sorting-perl (0.9-3) UNRELEASED; urgency=low
-
-  TODO:
-  the test output looks a bit scary ...
+libdata-sorting-perl (0.9-3) unstable; urgency=low
 
   [ gregor herrmann ]
   * Take over for the Debian Perl Group with maintainer's permission
@@ -30,8 +27,13 @@
   * Add myself to Uploaders.
   * No longer install README (copy of POD documentation).
   * Convert debian/copyright to proposed machine-readable format.
+  * Fix warnings that showed up in the test suite
+    + new patches "fix-uninitialized-value-warning.patch" and
+      "test-warnings.patch"
+    + Build-dep on perl (>= 5.10) because the patch uses the ~~ operator
+    + Add quilt framework and README.source
 
- -- Ansgar Burchardt <ansgar at 43-1.org>  Wed, 22 Jul 2009 02:15:14 +0200
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Wed, 22 Jul 2009 13:40:54 +0200
 
 libdata-sorting-perl (0.9-2) unstable; urgency=low
 

Modified: trunk/libdata-sorting-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-sorting-perl/debian/control?rev=40482&op=diff
==============================================================================
--- trunk/libdata-sorting-perl/debian/control (original)
+++ trunk/libdata-sorting-perl/debian/control Wed Jul 22 11:47:36 2009
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Ansgar Burchardt <ansgar at 43-1.org>
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl (>= 5.6.0-16)
+Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7)
+Build-Depends-Indep: perl (>= 5.10)
 Standards-Version: 3.8.2
 Homepage: http://search.cpan.org/dist/Data-Sorting/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdata-sorting-perl/

Added: trunk/libdata-sorting-perl/debian/patches/fix-uninitialized-value-warning.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-sorting-perl/debian/patches/fix-uninitialized-value-warning.patch?rev=40482&op=file
==============================================================================
--- trunk/libdata-sorting-perl/debian/patches/fix-uninitialized-value-warning.patch (added)
+++ trunk/libdata-sorting-perl/debian/patches/fix-uninitialized-value-warning.patch Wed Jul 22 11:47:36 2009
@@ -1,0 +1,21 @@
+Subject: Fix uninitialized value $flagname warning
+Date: Wed, 22 Jul 2009 13:29:28 +0200
+From: Ansgar Burchardt <ansgar at 43-1.org>
+
+This fixes the warning
+
+   Use of uninitialized value $flagname in string eq at
+   [...]/lib/Data/Sorting.pm line 420.
+
+that showed up in the test suite.
+--- libdata-sorting-perl.orig/Sorting.pm
++++ libdata-sorting-perl/Sorting.pm
+@@ -419,7 +419,7 @@
+     my ( $flagname ) = ( $token =~ /^\-(\w+)$/ );
+     if ( $flagname and $SupportedOptions{$flagname} ) {
+       $state{ $flagname } = shift @arguments;
+-    } elsif ( $flagname eq 'sortkey' ) {
++    } elsif ( defined($flagname) and $flagname eq 'sortkey' ) {
+       push @rules, { @DefaultState, %state, 'sortkey' => shift @arguments };
+     } elsif ( ref($token) eq 'HASH' ) {
+       push @rules, { @DefaultState, %state, %$token };

Added: trunk/libdata-sorting-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-sorting-perl/debian/patches/series?rev=40482&op=file
==============================================================================
--- trunk/libdata-sorting-perl/debian/patches/series (added)
+++ trunk/libdata-sorting-perl/debian/patches/series Wed Jul 22 11:47:36 2009
@@ -1,0 +1,2 @@
+fix-uninitialized-value-warning.patch
+test-warnings.patch

Added: trunk/libdata-sorting-perl/debian/patches/test-warnings.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-sorting-perl/debian/patches/test-warnings.patch?rev=40482&op=file
==============================================================================
--- trunk/libdata-sorting-perl/debian/patches/test-warnings.patch (added)
+++ trunk/libdata-sorting-perl/debian/patches/test-warnings.patch Wed Jul 22 11:47:36 2009
@@ -1,0 +1,37 @@
+Subject: Fix warnings when comparing arrays
+Date: Wed, 22 Jul 2009 13:29:28 +0200
+From: Ansgar Burchardt <ansgar at 43-1.org>
+
+This patch fixes several warnings like
+
+    Argument "Foo12a" isn't numeric in numeric ne (!=)
+    at t/sort_tests.pl line 18.
+
+that showed up in t/misc and t/substrs.
+
+We use Perl 5.10's ~~ operator to compare arrays for equality now.
+--- libdata-sorting-perl.orig/t/sort_tests.pl
++++ libdata-sorting-perl/t/sort_tests.pl
+@@ -1,5 +1,7 @@
+ # t/sort_tests.pl -- utility routines for Data::Sorting test scripts.
+ 
++use 5.010; # we use ~~
++
+ # Inspiried by test.pl from Sort::Naturally by Sean M. Burke
+ 
+ sub shuffle {
+@@ -13,13 +15,7 @@
+   # warn "Checking: " . join( ', ', map "'$_'", @$array ) . "\n";
+   CANDIDATE: foreach my $candidate (@_) {
+     # warn "Against: " . join( ', ', map "'$_'", @$candidate ) . "\n";
+-    next CANDIDATE unless ( $#$array = $#$candidate );
+-    foreach my $idx ( 0 .. $#$array ) {
+-      next CANDIDATE unless ( $array->[$idx] eq $candidate->[$idx] 
+-    or $array->[$idx] != 0 and $array->[$idx] == $candidate->[$idx] );
+-    }
+-    # warn "Matched!";
+-    return 1;
++    return 1 if $array ~~ $candidate;
+   }
+   # warn( "Didn't match!" );
+   return

Modified: trunk/libdata-sorting-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-sorting-perl/debian/rules?rev=40482&op=diff
==============================================================================
--- trunk/libdata-sorting-perl/debian/rules (original)
+++ trunk/libdata-sorting-perl/debian/rules Wed Jul 22 11:47:36 2009
@@ -1,3 +1,3 @@
 #!/usr/bin/make -f
 %:
-	dh $@
+	dh --with quilt $@


