r35733 - in /trunk/libsyntax-highlight-engine-simple-perl: debian/README.source debian/changelog debian/control debian/copyright debian/patches/ debian/patches/bug-rt43353.patch debian/patches/series debian/rules lib/Syntax/Highlight/Engine/Simple.pm
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Tue May 19 00:48:10 UTC 2009
Author: jawnsy-guest
Date: Tue May 19 00:48:03 2009
New Revision: 35733
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=35733
Log:
* 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
dch -r too.
Added:
trunk/libsyntax-highlight-engine-simple-perl/debian/README.source
trunk/libsyntax-highlight-engine-simple-perl/debian/patches/
trunk/libsyntax-highlight-engine-simple-perl/debian/patches/bug-rt43353.patch
trunk/libsyntax-highlight-engine-simple-perl/debian/patches/series
Modified:
trunk/libsyntax-highlight-engine-simple-perl/debian/changelog
trunk/libsyntax-highlight-engine-simple-perl/debian/control
trunk/libsyntax-highlight-engine-simple-perl/debian/copyright
trunk/libsyntax-highlight-engine-simple-perl/debian/rules
trunk/libsyntax-highlight-engine-simple-perl/lib/Syntax/Highlight/Engine/Simple.pm
Added: 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=35733&op=file
==============================================================================
--- trunk/libsyntax-highlight-engine-simple-perl/debian/README.source (added)
+++ trunk/libsyntax-highlight-engine-simple-perl/debian/README.source Tue May 19 00:48:03 2009
@@ -1,0 +1,56 @@
+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.
+
+In order to get the fully patched source after unpacking, change to the root
+level of the package and run:
+
+ $ quilt push -a
+
+The last patch listed in debian/patches/series will become the current patch.
+
+To add some more changes, run the above command (quilt push -a). Remember to
+set QUILT_PATCHES=debian/patches, either as an environment variable or as a
+parameter in ~/.quiltrc. Then, create a new patch by typing:
+
+ $ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.
+
+Then, for every file that will be modified by this patch, run:
+
+ $ quilt add <file>
+
+before editing those files. You must tell quilt what files will be part of
+the patch with 'quilt add' before making changes. If you don't do this, then
+you will likely break quilt. After editing the files, make sure you run:
+
+ $ quilt refresh
+
+to save your changes in debian/patches.
+
+Alternately, if you already have an external patch and you just want to add
+it to the build system, run quilt push -a and then:
+
+ $ quilt import -P <patch> /path/to/patch
+ $ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to use
+in debian/patches. The last quilt push -a will apply the patch to make sure it
+works properly.
+
+To remove an existing patch from those that will be run, use:
+
+ $ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running this
+command.
+
+If there are any other issues, consult the perldoc for quilt. It is also
+accessible online at http://pkg-perl.alioth.debian.org/howto/quilt.html
+
+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=35733&op=diff
==============================================================================
--- trunk/libsyntax-highlight-engine-simple-perl/debian/changelog (original)
+++ trunk/libsyntax-highlight-engine-simple-perl/debian/changelog Tue May 19 00:48:03 2009
@@ -1,8 +1,17 @@
-libsyntax-highlight-engine-simple-perl (0.08-1) UNRELEASED; urgency=low
+libsyntax-highlight-engine-simple-perl (0.08-1) unstable; urgency=low
- TODO: fix/mask Test::Perl::Critic complaint
- Reported upstream as RT#43353 - bremner at unb.ca
-
+ [ 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 ]
+
* Initial Release (Closes: #515105)
- -- David Bremner <bremner at unb.ca> Thu, 12 Feb 2009 17:21:20 -0400
+ -- Jonathan Yu <frequency at cpan.org> Mon, 18 May 2009 20:45:32 -0400
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=35733&op=diff
==============================================================================
--- trunk/libsyntax-highlight-engine-simple-perl/debian/control (original)
+++ trunk/libsyntax-highlight-engine-simple-perl/debian/control Tue May 19 00:48:03 2009
@@ -1,12 +1,14 @@
Source: libsyntax-highlight-engine-simple-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5), libmodule-build-perl
-Build-Depends-Indep: perl (>= 5.6.10-12), libuniversal-require-perl, libversion-perl,
- libtest-perl-critic-perl, libtest-pod-perl, libtest-pod-coverage-perl
+Build-Depends: debhelper (>= 7), quilt (>= 0.40),
+ 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,
+ libtest-pod-perl, libtest-pod-coverage-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: David Bremner <bremner at unb.ca>
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://search.cpan.org/dist/Syntax-Highlight-Engine-Simple/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libsyntax-highlight-engine-simple-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libsyntax-highlight-engine-simple-perl/
@@ -15,14 +17,14 @@
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends}, libuniversal-require-perl
Recommends: libsyntax-highlight-engine-simple-languages-perl
-Description: framework for generating syntax highlighted HTML from source code
- Syntax::Highlight::Engine::Simple provides an easy way to create
- syntax highlighting modules for various languages. It generates HTML
- by marking up the input string with span tags according the given
- rules. The appearence of e.g. keywords is then easily controllable
- via CSS. Highlighting rules are defined by regular expressions,
- typically in a subclass. Compared to similar perl modules, this
- module is simple, fast, and does not require any external
- dependencies.
-
-
+Description: Perl framework to generate syntax highlighted code
+ Syntax::Highlight::Engine::Simple provides an easy way to create syntax
+ highlighting modules for various languages. It generates HTML by marking up
+ the input string with "span" tags according the given rules.
+ .
+ New rules can be added using regular expressions, typically in a subclass,
+ allowing this framework to be extended for new languages. It is a simple
+ module, designed to be fast and does not require any external dependencies.
+ .
+ The appearance of keywords or other tokens is easily changed using defined
+ Cascading Style Sheets (CSS) properties.
Modified: trunk/libsyntax-highlight-engine-simple-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsyntax-highlight-engine-simple-perl/debian/copyright?rev=35733&op=diff
==============================================================================
--- trunk/libsyntax-highlight-engine-simple-perl/debian/copyright (original)
+++ trunk/libsyntax-highlight-engine-simple-perl/debian/copyright Tue May 19 00:48:03 2009
@@ -1,20 +1,28 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=437
-Upstream-Maintainer: Sugama Keita <sugama at jamadam.com>
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Sugama Keita <sugama at jamadam.com>
Upstream-Source: http://search.cpan.org/dist/Syntax-Highlight-Engine-Simple/
+Upstream-Name: Syntax-Highlight-Engine-Simple
Files: *
-Copyright: © 2008, Sugama Keita
+Copyright: 2008, Sugama Keita<sugama at jamadam.com>
License: GPL-1+ | Artistic
- This library is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
- .
- Perl is distributed under your choice of the GNU General Public License or
- the Artistic License. On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in `/usr/share/common-licenses/GPL'
- and the Artistic Licence in `/usr/share/common-licenses/Artistic'.
Files: debian/*
-Copyright: © 2009, David Bremner <bremner at unb.ca>
+Copyright: 2009, David Bremner <bremner at unb.ca>
License: GPL-1+ | Artistic
- It is assumed that all contributors put their work under the same license
- as the module itself.
+
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
+
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
+
Added: 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=35733&op=file
==============================================================================
--- trunk/libsyntax-highlight-engine-simple-perl/debian/patches/bug-rt43353.patch (added)
+++ trunk/libsyntax-highlight-engine-simple-perl/debian/patches/bug-rt43353.patch Tue May 19 00:48:03 2009
@@ -1,0 +1,22 @@
+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 20:20:54.000000000 -0400
++++ libsyntax-highlight-engine-simple-perl/lib/Syntax/Highlight/Engine/Simple.pm 2009-05-18 20:44:27.000000000 -0400
+@@ -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;
+ }
+
+ ### ----------------------------------------------------------------------------
Added: trunk/libsyntax-highlight-engine-simple-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsyntax-highlight-engine-simple-perl/debian/patches/series?rev=35733&op=file
==============================================================================
--- trunk/libsyntax-highlight-engine-simple-perl/debian/patches/series (added)
+++ trunk/libsyntax-highlight-engine-simple-perl/debian/patches/series Tue May 19 00:48:03 2009
@@ -1,0 +1,1 @@
+bug-rt43353.patch
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=35733&op=diff
==============================================================================
--- trunk/libsyntax-highlight-engine-simple-perl/debian/rules (original)
+++ trunk/libsyntax-highlight-engine-simple-perl/debian/rules Tue May 19 00:48:03 2009
@@ -1,63 +1,24 @@
#!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
-#
-# It was later modified by Jason Kohles <email at jasonkohles.com>
-# http://www.jasonkohles.com/ to support Module::Build installed modules
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# If set to a true value then MakeMaker's prompt function will
-# always return the default without waiting for user input.
-export PERL_MM_USE_DEFAULT=1
-
-PERL ?= /usr/bin/perl
-PACKAGE = $(shell dh_listpackages)
-TMP = $(CURDIR)/debian/$(PACKAGE)
build: build-stamp
build-stamp:
- dh_testdir
- # Add commands to compile the package here
- $(PERL) Build.PL installdirs=vendor
- $(PERL) Build
- $(PERL) Build test
+ dh build
touch $@
clean:
- dh_testdir
- dh_testroot
- dh_clean build-stamp install-stamp
- # Add commands to clean up after the build process here
- [ ! -f Build ] || $(PERL) Build --allow_mb_mismatch 1 distclean
+ dh $@
install: install-stamp
install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- # Add commands to install the package into $(TMP) here
- $(PERL) Build install destdir=$(TMP) create_packlist=0
+ dh install
touch $@
binary-arch:
-# We have nothing to do here for an architecture-independent package
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs README
- dh_installchangelogs Changes
- dh_perl
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+binary-indep: install
+ dh $@
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary: binary-arch binary-indep
+
+.PHONY: binary binary-arch binary-indep install clean build
+
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=35733&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 Tue May 19 00:48:03 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;
}
### ----------------------------------------------------------------------------
More information about the Pkg-perl-cvs-commits
mailing list