r46097 - in /trunk/libdata-sorting-perl/debian: changelog control patches/test-warnings.patch

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Mon Oct 19 19:12:27 2009
New Revision: 46097

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46097
Log:
test-warnings.patch: use Array::Compare instead of the smart match
operator "~~", which has changed its behaviour in Perl 5.10.1
(closes: #546236); build depend on libarray-compare-perl.

Modified:
    trunk/libdata-sorting-perl/debian/changelog
    trunk/libdata-sorting-perl/debian/control
    trunk/libdata-sorting-perl/debian/patches/test-warnings.patch

Modified: trunk/libdata-sorting-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-sorting-perl/debian/changelog?rev=46097&op=diff
==============================================================================
--- trunk/libdata-sorting-perl/debian/changelog (original)
+++ trunk/libdata-sorting-perl/debian/changelog Mon Oct 19 19:12:27 2009
@@ -1,3 +1,11 @@
+libdata-sorting-perl (0.9-4) UNRELEASED; urgency=low
+
+  * test-warnings.patch: use Array::Compare instead of the smart match
+    operator "~~", which has changed its behaviour in Perl 5.10.1
+    (closes: #546236); build depend on libarray-compare-perl.
+
+ -- gregor herrmann <gregoa at debian.org>  Mon, 19 Oct 2009 21:08:13 +0200
+
 libdata-sorting-perl (0.9-3) unstable; urgency=low
 
   [ gregor herrmann ]

Modified: trunk/libdata-sorting-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-sorting-perl/debian/control?rev=46097&op=diff
==============================================================================
--- trunk/libdata-sorting-perl/debian/control (original)
+++ trunk/libdata-sorting-perl/debian/control Mon Oct 19 19:12:27 2009
@@ -3,7 +3,7 @@
 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.0.8), quilt (>= 0.46-7)
+Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7), libarray-compare-perl
 Build-Depends-Indep: perl (>= 5.10)
 Standards-Version: 3.8.2
 Homepage: http://search.cpan.org/dist/Data-Sorting/

Modified: 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=46097&op=diff
==============================================================================
--- trunk/libdata-sorting-perl/debian/patches/test-warnings.patch (original)
+++ trunk/libdata-sorting-perl/debian/patches/test-warnings.patch Mon Oct 19 19:12:27 2009
@@ -11,17 +11,31 @@
 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
+
+Take 2:
+
+Author: gregor herrmann <gregoa at debian.org>
+Description: we now use Array::Compare, since the ~~ operator has changed in
+ 5.10.1. From perldelta:
+
+    It is now a run-time error to use the smart match operator "~~" with an
+    object that has no overload defined for it. (This way "~~" will not break
+    encapsulation by matching against the object's internal representation as a
+    reference.)
+
+Bugs-Debian: #546236
+
+--- a/t/sort_tests.pl
++++ b/t/sort_tests.pl
 @@ -1,5 +1,7 @@
  # t/sort_tests.pl -- utility routines for Data::Sorting test scripts.
  
-+use 5.010; # we use ~~
++use Array::Compare;
 +
  # Inspiried by test.pl from Sort::Naturally by Sean M. Burke
  
  sub shuffle {
-@@ -13,13 +15,7 @@
+@@ -13,13 +15,8 @@
    # warn "Checking: " . join( ', ', map "'$_'", @$array ) . "\n";
    CANDIDATE: foreach my $candidate (@_) {
      # warn "Against: " . join( ', ', map "'$_'", @$candidate ) . "\n";
@@ -32,7 +46,8 @@
 -    }
 -    # warn "Matched!";
 -    return 1;
-+    return 1 if $array ~~ $candidate;
++    my $comp = Array::Compare->new;
++    return 1 if $comp->compare( $array, $candidate );
    }
    # warn( "Didn't match!" );
    return