r36187 - in /trunk/libsyntax-highlight-engine-simple-perl: debian/README.source debian/changelog debian/control debian/patches/bug-rt43353.patch debian/rules lib/Syntax/Highlight/Engine/Simple.pm

Fri May 22 23:53:53 UTC 2009

Author: jawnsy-guest
Date: Fri May 22 23:53:48 2009
New Revision: 36187

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=36187
Log:
Fixed a bunch of things per gregoa's suggestions in d/changelog. Changelog cleaned up for things done; only action item left is to figure out what is meant by "mention the bug in the quilt header"

Modified:
    trunk/libsyntax-highlight-engine-simple-perl/debian/README.source
    trunk/libsyntax-highlight-engine-simple-perl/debian/changelog
    trunk/libsyntax-highlight-engine-simple-perl/debian/control
    trunk/libsyntax-highlight-engine-simple-perl/debian/patches/bug-rt43353.patch
    trunk/libsyntax-highlight-engine-simple-perl/debian/rules
    trunk/libsyntax-highlight-engine-simple-perl/lib/Syntax/Highlight/Engine/Simple.pm

Modified: trunk/libsyntax-highlight-engine-simple-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsyntax-highlight-engine-simple-perl/debian/README.source?rev=36187&op=diff
==============================================================================

--- trunk/libsyntax-highlight-engine-simple-perl/debian/README.source (original)
+++ trunk/libsyntax-highlight-engine-simple-perl/debian/README.source Fri May 22 23:53:48 2009
@@ -53,4 +53,3 @@
 This file was written by Jonathan Yu <frequency at cpan.org> based largely on
 an e-mail by Russ Allbery <rra at debian.org> to the debian-devel-announce list,
 which is archived at: http://lwn.net/Articles/280471/
-

Modified: trunk/libsyntax-highlight-engine-simple-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsyntax-highlight-engine-simple-perl/debian/changelog?rev=36187&op=diff
==============================================================================
--- trunk/libsyntax-highlight-engine-simple-perl/debian/changelog (original)
+++ trunk/libsyntax-highlight-engine-simple-perl/debian/changelog Fri May 22 23:53:48 2009
@@ -1,36 +1,8 @@
 libsyntax-highlight-engine-simple-perl (0.08-1) UNRELEASED; urgency=low
 
-  TODO (nothing tragic, but still ...):
-  * debian/changelog: one line ("Initial Release (Closes: #515105)") is enough
-    for a new package since there are no changes against a previous package
   * debian/patches/bug-rt43353.patch:
     - mentioning the bug in the header would be nice
-    - refreshing with the .quiltrc settings from
-      http://pkg-perl.alioth.debian.org/howto/quilt.html would make the patch
-      easier to read
-    - refreshing would also fix "Hunk #1 succeeded at 354 with fuzz 1."
-  * debian/rules: since we depend on quilt 0.46-7 anyway the whole file
-    might be condensed into the "modern way" from
-    http://pkg-perl.alioth.debian.org/howto/quilt.html#3_2_the_modern_way
-    (would need a higher debhelper dependency)
-  * debian/README.source: our standard short version would be enough (just as
-    a side note)
-  * debian/changelog mentions debhelper 7.2.10, debian/control has >= 7
       
-
-  [ Jonathan Yu ]
-  * Added boilerplate README.source
-  * Fixed Perl::Critic complaint via quilt. Bug still exists upstream.
-  * Required debhelper 7.2.10 because both Build.PL and Makefile.PL exist
-  * Fixed dependencies-
-     libversion-perl => perl-modules (>= 5.10) | libversion-perl
-    Same for libmodule-build-perl
-  * Changed to boilerplate copyright statement for Artistic/GPL
-  * Switched to a lazier debian/rules file
-
-  [ David Bremner ]
-
-  * Bump dependency on quilt for dh_quilt_patch
   * Initial Release (Closes: #515105)
 
  -- David Bremner <bremner at unb.ca>  Tue, 19 May 2009 08:49:36 -0300

Modified: trunk/libsyntax-highlight-engine-simple-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsyntax-highlight-engine-simple-perl/debian/control?rev=36187&op=diff
==============================================================================
--- trunk/libsyntax-highlight-engine-simple-perl/debian/control (original)
+++ trunk/libsyntax-highlight-engine-simple-perl/debian/control Fri May 22 23:53:48 2009
@@ -1,7 +1,7 @@
 Source: libsyntax-highlight-engine-simple-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7), quilt (>= 0.46-7),
+Build-Depends: debhelper (>= 7.2.10), quilt (>= 0.46-7),
   perl-modules (>= 5.10) | libmodule-build-perl
 Build-Depends-Indep: perl (>= 5.6.10-12), libuniversal-require-perl,
   perl-modules (>= 5.10) | libversion-perl, libtest-perl-critic-perl,

Modified: trunk/libsyntax-highlight-engine-simple-perl/debian/patches/bug-rt43353.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsyntax-highlight-engine-simple-perl/debian/patches/bug-rt43353.patch?rev=36187&op=diff
==============================================================================
--- trunk/libsyntax-highlight-engine-simple-perl/debian/patches/bug-rt43353.patch (original)
+++ trunk/libsyntax-highlight-engine-simple-perl/debian/patches/bug-rt43353.patch Fri May 22 23:53:48 2009
@@ -5,10 +5,9 @@
  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.
-Index: libsyntax-highlight-engine-simple-perl/lib/Syntax/Highlight/Engine/Simple.pm
-===================================================================
---- libsyntax-highlight-engine-simple-perl.orig/lib/Syntax/Highlight/Engine/Simple.pm	2009-05-18 21:55:50.000000000 -0400
-+++ libsyntax-highlight-engine-simple-perl/lib/Syntax/Highlight/Engine/Simple.pm	2009-05-19 00:20:27.000000000 -0400
+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]]
          );
@@ -25,3 +24,5 @@
 +
 +    return @out_array;
  }
+ 
+ ### ----------------------------------------------------------------------------

Modified: trunk/libsyntax-highlight-engine-simple-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsyntax-highlight-engine-simple-perl/debian/rules?rev=36187&op=diff
==============================================================================
--- trunk/libsyntax-highlight-engine-simple-perl/debian/rules (original)
+++ trunk/libsyntax-highlight-engine-simple-perl/debian/rules Fri May 22 23:53:48 2009
@@ -1,27 +1,4 @@
 #!/usr/bin/make -f
 
-
-build: build-stamp
-build-stamp:
-	dh_quilt_patch
-	dh build
-	touch $@
-
-clean:
-	dh_quilt_unpatch
-	dh $@
-
-install: install-stamp
-install-stamp: build-stamp
-	dh install
-	touch $@
-
-binary-arch:
-
-binary-indep: install
-	dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
-
+%:
+	dh --with quilt $@

Modified: trunk/libsyntax-highlight-engine-simple-perl/lib/Syntax/Highlight/Engine/Simple.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsyntax-highlight-engine-simple-perl/lib/Syntax/Highlight/Engine/Simple.pm?rev=36187&op=diff
==============================================================================
--- trunk/libsyntax-highlight-engine-simple-perl/lib/Syntax/Highlight/Engine/Simple.pm (original)
+++ trunk/libsyntax-highlight-engine-simple-perl/lib/Syntax/Highlight/Engine/Simple.pm Fri May 22 23:53:48 2009
@@ -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;
 }
 
 ### ----------------------------------------------------------------------------


