r40846 - in /trunk/libxml-xslt-perl/debian: README.source changelog compat control copyright libxml-xslt-perl.docs libxml-xslt-perl.examples patches/ patches/do-not-install-xslt-parser.patch patches/pod-errors.patch patches/series rules

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Mon Jul 27 22:44:11 UTC 2009


Author: ansgar-guest
Date: Mon Jul 27 22:44:04 2009
New Revision: 40846

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=40846
Log:
* Refresh rules for debhelper 7.
* Move debhelper to Build-Depends.
* Use a patch to Makefile.PL to not install xslt-parser instead of removing
  it later in debian/rules
  + new patch do-not-install-xslt-parser.patch
  + add quilt framework and README.source
* Fix POD errors in lib/XML/XSLT.pm
  + new patch pod-errors.patch
* Bump Standards-Version to 3.8.2.
* Add myself to Uploaders.
* debian/control: Omit Priority and Section field from binary package
  definition.

Added:
    trunk/libxml-xslt-perl/debian/README.source
    trunk/libxml-xslt-perl/debian/libxml-xslt-perl.docs
    trunk/libxml-xslt-perl/debian/libxml-xslt-perl.examples
    trunk/libxml-xslt-perl/debian/patches/
    trunk/libxml-xslt-perl/debian/patches/do-not-install-xslt-parser.patch
    trunk/libxml-xslt-perl/debian/patches/pod-errors.patch
    trunk/libxml-xslt-perl/debian/patches/series
Modified:
    trunk/libxml-xslt-perl/debian/changelog
    trunk/libxml-xslt-perl/debian/compat
    trunk/libxml-xslt-perl/debian/control
    trunk/libxml-xslt-perl/debian/copyright
    trunk/libxml-xslt-perl/debian/rules

Added: trunk/libxml-xslt-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xslt-perl/debian/README.source?rev=40846&op=file
==============================================================================
--- trunk/libxml-xslt-perl/debian/README.source (added)
+++ trunk/libxml-xslt-perl/debian/README.source Mon Jul 27 22:44:04 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/libxml-xslt-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xslt-perl/debian/changelog?rev=40846&op=diff
==============================================================================
--- trunk/libxml-xslt-perl/debian/changelog (original)
+++ trunk/libxml-xslt-perl/debian/changelog Mon Jul 27 22:44:04 2009
@@ -1,15 +1,10 @@
-libxml-xslt-perl (0.48-3) UNRELEASED; urgency=low
+libxml-xslt-perl (0.48-3) unstable; urgency=low
 
   [ gregor herrmann ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
     field (source stanza); Homepage field (source stanza).
   * Set Maintainer to Debian Perl Group.
   * Use dist-based URL in debian/watch.
-  * debian/rules: delete /usr/lib/perl5 only if it exists.
-  * Revert undocumented changes to xslt-parser (installed as an example) and
-    Makefile.PL (remove /usr/bin in debian/rules instead).
-  * Delete debian/libxml-xslt-perl.*, let debian/rules do the job.
-  * Refresh debian/rules, no functional changes.
   * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
     (source stanza).
   * debian/control: Added: ${misc:Depends} to Depends: field.
@@ -17,7 +12,21 @@
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Sat, 01 Dec 2007 18:55:48 +0100
+  [ Ansgar Burchardt ]
+  * Refresh rules for debhelper 7.
+  * Move debhelper to Build-Depends.
+  * Use a patch to Makefile.PL to not install xslt-parser instead of removing
+    it later in debian/rules
+    + new patch do-not-install-xslt-parser.patch
+    + add quilt framework and README.source
+  * Fix POD errors in lib/XML/XSLT.pm
+    + new patch pod-errors.patch
+  * Bump Standards-Version to 3.8.2.
+  * Add myself to Uploaders.
+  * debian/control: Omit Priority and Section field from binary package
+    definition.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Tue, 28 Jul 2009 00:38:10 +0200
 
 libxml-xslt-perl (0.48-2) unstable; urgency=low
 

Modified: trunk/libxml-xslt-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xslt-perl/debian/compat?rev=40846&op=diff
==============================================================================
--- trunk/libxml-xslt-perl/debian/compat (original)
+++ trunk/libxml-xslt-perl/debian/compat Mon Jul 27 22:44:04 2009
@@ -1,1 +1,1 @@
-4
+7

Modified: trunk/libxml-xslt-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xslt-perl/debian/control?rev=40846&op=diff
==============================================================================
--- trunk/libxml-xslt-perl/debian/control (original)
+++ trunk/libxml-xslt-perl/debian/control Mon Jul 27 22:44:04 2009
@@ -2,20 +2,19 @@
 Section: perl
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Jay Bonci <jaybonci at debian.org>
-Standards-Version: 3.6.1.0
+Uploaders: Jay Bonci <jaybonci at debian.org>,
+ Ansgar Burchardt <ansgar at 43-1.org>
+Standards-Version: 3.8.2
 Homepage: http://search.cpan.org/dist/XML-XSLT/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libxml-xslt-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libxml-xslt-perl/
-Build-Depends-Indep: debhelper (>= 4.1), perl, libhtml-clean-perl, libtest-simple-perl, liburi-perl, libwww-perl, libxml-dom-perl
+Build-Depends: debhelper (>= 7), quilt (>= 0.46-7)
+Build-Depends-Indep: perl (>= 5.6.0-16), libhtml-clean-perl, libtest-simple-perl, liburi-perl, libwww-perl, libxml-dom-perl
 
 Package: libxml-xslt-perl
-Section: perl
-Priority: optional
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, libhtml-clean-perl, liburi-perl, libwww-perl, libxml-dom-perl
 Description: Perl module for processing XSLT
- This module parses XSL Transformational sheets.  For a description of
- the XSLT, see http://www.w3.org/TR/xslt.  Currently, it uses
- XML::Parser and XML::DOM, but an effort is being made to use
- XML::XPath.
+ The XML::XSLT module parses XSL Transformational sheets.  For a description
+ of the XSLT, see http://www.w3.org/TR/xslt.  Currently, it uses XML::Parser
+ and XML::DOM, but an effort is being made to use XML::XPath.

Modified: trunk/libxml-xslt-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xslt-perl/debian/copyright?rev=40846&op=diff
==============================================================================
--- trunk/libxml-xslt-perl/debian/copyright (original)
+++ trunk/libxml-xslt-perl/debian/copyright Mon Jul 27 22:44:04 2009
@@ -1,30 +1,33 @@
-This package was debianized by Ardo van Rangelrooij <ardo at debian.org>
-on Fri, Jul 21, 2000, 7:42:50 +0200.
+Format-Specification:
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Jonathan Stowe
+Upstream-Source: http://search.cpan.org/dist/XML-XSLT/
+Upstream-Name: XML-XSLT
 
-It was downloaded from the Comprehensive Perl Archive Network (CPAN).
-Visit <http://www.cpan.org/> to find a CPAN site near you.
+Files: *
+Copyright:
+ © 1999, Geert Josten & Egon Willighagen
+ © 2001, Mark A. Hershberger
+License-Alias: Perl
+License: Artistic | GPL-1+
 
-Upstream Authors: Geert Josten <gjosten at sci.kun.nl>,
-                  Egon Willighagen <egonw at sci.kun.nl>,
-		  Mark A. Hershberger <mah at everybody.org>,
-		  Bron Gondwana <perlcode at brong.net>
+Files: debian/*
+Copyright:
+ © 2000-2003, Ardo van Rangelrooij <ardo at debian.org>
+ © 2004,      Jay Bonci <jaybonci at debian.org>
+ © 2009,      Ansgar Burchardt <ansgar at 43-1.org>
+License: Artistic | GPL-1+
 
-Copyright:
+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'
 
-Copyright (c) 1999 Geert Josten & Egon Willighagen.
-Copyright (c) 2001 Mark A. Hershberger
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of either:
-
-	a) the GNU General Public License as published by the Free
-	Software Foundation; either version 1, or (at your option) any
-	later version, or
-
-	b) the "Artistic License"
-
-	See:
-
-	/usr/share/common-licenses/Artistic
-	/usr/share/common-licenses/GPL
-
-	For more information regarding these licensing options
+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/libxml-xslt-perl/debian/libxml-xslt-perl.docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xslt-perl/debian/libxml-xslt-perl.docs?rev=40846&op=file
==============================================================================
--- trunk/libxml-xslt-perl/debian/libxml-xslt-perl.docs (added)
+++ trunk/libxml-xslt-perl/debian/libxml-xslt-perl.docs Mon Jul 27 22:44:04 2009
@@ -1,0 +1,1 @@
+README

Added: trunk/libxml-xslt-perl/debian/libxml-xslt-perl.examples
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xslt-perl/debian/libxml-xslt-perl.examples?rev=40846&op=file
==============================================================================
--- trunk/libxml-xslt-perl/debian/libxml-xslt-perl.examples (added)
+++ trunk/libxml-xslt-perl/debian/libxml-xslt-perl.examples Mon Jul 27 22:44:04 2009
@@ -1,0 +1,2 @@
+examples/*
+xslt-parser

Added: trunk/libxml-xslt-perl/debian/patches/do-not-install-xslt-parser.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xslt-perl/debian/patches/do-not-install-xslt-parser.patch?rev=40846&op=file
==============================================================================
--- trunk/libxml-xslt-perl/debian/patches/do-not-install-xslt-parser.patch (added)
+++ trunk/libxml-xslt-perl/debian/patches/do-not-install-xslt-parser.patch Mon Jul 27 22:44:04 2009
@@ -1,0 +1,17 @@
+From: Ansgar Burchardt <ansgar at 43-1.org>
+Subject: Do not install xslt-parser
+Date: Tue, 28 Jul 2009 00:16:33 +0200
+Forwarded: not-needed
+
+Debian ships xslt-parser only as an example in /usr/share/doc/libxml-xslt-perl,
+so do not install the script in /usr/bin.
+--- libxml-xslt-perl.orig/Makefile.PL
++++ libxml-xslt-perl/Makefile.PL
+@@ -13,6 +13,6 @@
+               PREREQ_PM     => { XML::Parser => '2.23',
+ 				                     XML::DOM    => '1.25',
+                                  Test::More  => '0.33' },
+-	      EXE_FILES      => ['xslt-parser'],
++#	      EXE_FILES      => ['xslt-parser'],
+              );
+ 

Added: trunk/libxml-xslt-perl/debian/patches/pod-errors.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xslt-perl/debian/patches/pod-errors.patch?rev=40846&op=file
==============================================================================
--- trunk/libxml-xslt-perl/debian/patches/pod-errors.patch (added)
+++ trunk/libxml-xslt-perl/debian/patches/pod-errors.patch Mon Jul 27 22:44:04 2009
@@ -1,0 +1,41 @@
+From: Ansgar Burchardt <ansgar at 43-1.org>
+Date: Tue, 28 Jul 2009 00:36:30 +0200
+Subject: Fix POD errors
+
+Move documentation for xsl_output_method method to the right place.  This fixes
+the following POD errors in lib/XML/XSLT.pm:
+
+   Around line 880:
+   ’=item’ outside of any ’=over’
+
+   Around line 3581:
+   You forgot a ’=back’ before ’=head1’
+
+--- libxml-xslt-perl.orig/lib/XML/XSLT.pm
++++ libxml-xslt-perl/lib/XML/XSLT.pm
+@@ -877,13 +877,6 @@
+     }
+ }
+ 
+-=item xsl_output_method
+-
+-Get or set the <xsl:output method= attribute.  Valid arguments are 'html',
+-'text' and 'xml'
+-
+-=cut
+-
+ sub xsl_output_method
+ {
+     my ( $self, $method) = @_;
+@@ -3739,6 +3732,11 @@
+ 
+ =back
+ 
++=item xsl_output_method
++
++Get or set the <xsl:output method= attribute.  Valid arguments are 'html',
++'text' and 'xml'
++
+ =item toString
+ 
+ Returns the result of transforming the XML with the stylesheet as a

Added: trunk/libxml-xslt-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xslt-perl/debian/patches/series?rev=40846&op=file
==============================================================================
--- trunk/libxml-xslt-perl/debian/patches/series (added)
+++ trunk/libxml-xslt-perl/debian/patches/series Mon Jul 27 22:44:04 2009
@@ -1,0 +1,2 @@
+do-not-install-xslt-parser.patch
+pod-errors.patch

Modified: trunk/libxml-xslt-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xslt-perl/debian/rules?rev=40846&op=diff
==============================================================================
--- trunk/libxml-xslt-perl/debian/rules (original)
+++ trunk/libxml-xslt-perl/debian/rules Mon Jul 27 22:44:04 2009
@@ -1,66 +1,3 @@
 #!/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.
-
-# 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
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE)
-	$(MAKE) test
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean build-stamp install-stamp
-	[ ! -f Makefile ] || $(MAKE) realclean
-
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
-	# xslt-parser as an example is enough
-	[ ! -d $(TMP)/usr/bin ] || $(RM) -rv $(TMP)/usr/bin
-	[ ! -d $(TMP)/usr/share/man/man1 ] || $(RM) -rv $(TMP)/usr/share/man/man1
-
-	[ ! -d $(TMP)/usr/lib/perl5 ] || \
-		rmdir --ignore-fail-on-non-empty --parents --verbose \
-		$(TMP)/usr/lib/perl5
-	touch $@
-
-binary-arch:
-# We have nothing to do here for an architecture-independent package
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installexamples examples/* xslt-parser
-	dh_installdocs README
-	dh_installchangelogs ChangeLog
-	dh_perl
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+	dh --with quilt $@




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