[SCM] Debian packaging of libsyntax-highlight-engine-simple-perl branch, master, updated. e053c1cfd7bb835c10622716201fe58434207d38

Florian Schlichting fschlich at zedat.fu-berlin.de
Fri Aug 19 13:58:08 UTC 2011


The following commit has been merged in the master branch:
commit 35026142ff9dc13815c68eadd9fa6e81573c8084
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Fri Aug 19 13:47:15 2011 +0000

    drop bug-rt43353.patch included upstream

diff --git a/debian/changelog b/debian/changelog
index b6847ed..71c4a81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libsyntax-highlight-engine-simple-perl (0.09-1) UNRELEASED; urgency=low
   [ Florian Schlichting ]
   * Imported Upstream version 0.09
   * Update Standards-Version to 3.9.2
+  * Drop bug-rt43353.patch included upstream.
 
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
diff --git a/debian/patches/bug-rt43353.patch b/debian/patches/bug-rt43353.patch
deleted file mode 100644
index 9a5fe21..0000000
--- a/debian/patches/bug-rt43353.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Jonathan Yu <frequency at cpan.org>
-Debian-Specific: no
-Description: Move code around so that the return value will depend
- appropriately on the calling context; sort may return different things
- depending on its calling context, so we have to copy its results to an
- array and return that array - which might be coerced into something else
- depending on wantarray.
-Fixes: https://rt.cpan.org/Public/Bug/Display.html?id=43353
---- a/lib/Syntax/Highlight/Engine/Simple.pm
-+++ b/lib/Syntax/Highlight/Engine/Simple.pm
-@@ -354,13 +354,15 @@
-             [$$map_ref[$i]->[1]]
-         );
-     }
--    
--    return
-+
-+    @out_array =
-         sort {
-             $$a[0] <=> $$b[0]
-             #or
-             #(defined $$a[1]) <=> (defined $$b[1])
-         } @out_array;
-+
-+    return @out_array;
- }
- 
- ### ----------------------------------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 241c35c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-bug-rt43353.patch

-- 
Debian packaging of libsyntax-highlight-engine-simple-perl



More information about the Pkg-perl-cvs-commits mailing list