r20904 - in /trunk/libxml-um-perl: UM.pm debian/changelog debian/compat debian/control debian/patches/ debian/patches/path.patch debian/patches/series debian/rules

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Tue Jun 10 18:14:21 UTC 2008


Author: gregoa
Date: Tue Jun 10 18:14:21 2008
New Revision: 20904

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20904
Log:
* Set Standards-Version to 3.7.3 (no changes).
* Set debhelper compatibility level to 5.
* Refresh debian/rules, no functional changes.
* Split the fix for #402585 out into a patch; add quilt framework.

Added:
    trunk/libxml-um-perl/debian/patches/
    trunk/libxml-um-perl/debian/patches/path.patch
    trunk/libxml-um-perl/debian/patches/series
Modified:
    trunk/libxml-um-perl/UM.pm
    trunk/libxml-um-perl/debian/changelog
    trunk/libxml-um-perl/debian/compat
    trunk/libxml-um-perl/debian/control
    trunk/libxml-um-perl/debian/rules

Modified: trunk/libxml-um-perl/UM.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-um-perl/UM.pm?rev=20904&op=diff
==============================================================================
--- trunk/libxml-um-perl/UM.pm (original)
+++ trunk/libxml-um-perl/UM.pm Tue Jun 10 18:14:21 2008
@@ -24,7 +24,7 @@
 # The directory that contains the .xml files that come with XML::Encoding.
 # Include the terminating '\' or '/' !!
 #
-$ENCDIR = "/usr/share/libxml-encoding-perl/";
+$ENCDIR = "/home1/enno/perlModules/XML-Encoding-1.01/maps/";
 #$ENCDIR = "c:\\src\\perl\\xml\\XML-Encoding-1.01\\maps\\";
 
 #

Modified: trunk/libxml-um-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-um-perl/debian/changelog?rev=20904&op=diff
==============================================================================
--- trunk/libxml-um-perl/debian/changelog (original)
+++ trunk/libxml-um-perl/debian/changelog Tue Jun 10 18:14:21 2008
@@ -5,6 +5,10 @@
   * Set Maintainer to Debian Perl Group.
   * Use dist-based URL in debian/watch.
   * debian/rules: delete /usr/lib/perl5 only if it exists.
+  * Set Standards-Version to 3.7.3 (no changes).
+  * Set debhelper compatibility level to 5.
+  * Refresh debian/rules, no functional changes.
+  * Split the fix for #402585 out into a patch; add quilt framework.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Sat, 01 Dec 2007 18:55:46 +0100
 

Modified: trunk/libxml-um-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-um-perl/debian/compat?rev=20904&op=diff
==============================================================================
--- trunk/libxml-um-perl/debian/compat (original)
+++ trunk/libxml-um-perl/debian/compat Tue Jun 10 18:14:21 2008
@@ -1,1 +1,1 @@
-4
+5

Modified: trunk/libxml-um-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-um-perl/debian/control?rev=20904&op=diff
==============================================================================
--- trunk/libxml-um-perl/debian/control (original)
+++ trunk/libxml-um-perl/debian/control Tue Jun 10 18:14:21 2008
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jay Bonci <jaybonci at debian.org>
-Standards-Version: 3.7.2.2
+Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/XML-UM/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libxml-um-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-um-perl/
-Build-Depends: debhelper (>= 4.1)
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
 Build-Depends-Indep: perl (>= 5.6.0-16), libxml-encoding-perl
 
 Package: libxml-um-perl

Added: trunk/libxml-um-perl/debian/patches/path.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-um-perl/debian/patches/path.patch?rev=20904&op=file
==============================================================================
--- trunk/libxml-um-perl/debian/patches/path.patch (added)
+++ trunk/libxml-um-perl/debian/patches/path.patch Tue Jun 10 18:14:21 2008
@@ -1,0 +1,15 @@
+Author: Jay Bonci <jaybonci at debian.org>
+Descriptin: Fixes bad hardcoded path
+Bug: #402585
+
+--- libxml-um-perl-0.01.orig/UM.pm
++++ libxml-um-perl-0.01/UM.pm
+@@ -24,7 +24,7 @@
+ # The directory that contains the .xml files that come with XML::Encoding.
+ # Include the terminating '\' or '/' !!
+ #
+-$ENCDIR = "/home1/enno/perlModules/XML-Encoding-1.01/maps/";
++$ENCDIR = "/usr/share/libxml-encoding-perl/";
+ #$ENCDIR = "c:\\src\\perl\\xml\\XML-Encoding-1.01\\maps\\";
+ 
+ #

Added: trunk/libxml-um-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-um-perl/debian/patches/series?rev=20904&op=file
==============================================================================
--- trunk/libxml-um-perl/debian/patches/series (added)
+++ trunk/libxml-um-perl/debian/patches/series Tue Jun 10 18:14:21 2008
@@ -1,0 +1,1 @@
+path.patch

Modified: trunk/libxml-um-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-um-perl/debian/rules?rev=20904&op=diff
==============================================================================
--- trunk/libxml-um-perl/debian/rules (original)
+++ trunk/libxml-um-perl/debian/rules Tue Jun 10 18:14:21 2008
@@ -1,53 +1,62 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# 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
 
-# This is the debhelper compatibility version to use.
-# export DH_COMPAT=4
+# 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
 
-PACKAGE=`pwd | sed -e "s/.*\/\\(.*\\)-.*/\\1/"`
+include /usr/share/quilt/quilt.make
 
+PERL   ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
-build:
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	# Add here commands to compile the package.
-	perl Makefile.PL verbose INSTALLDIRS=vendor
-clean:
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
+	$(MAKE)
+	$(MAKE) test
+	touch $@
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
+	dh_clean build-stamp install-stamp
+	[ ! -f Makefile ] || $(MAKE) realclean
 
-	[ ! -f Makefile ] || $(MAKE) clean
-	rm -f Makefile.old
-	dh_clean
-
-install:
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -d $(TMP)/usr/lib/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/lib/perl5
+	touch $@
 
-	$(MAKE) PREFIX=$(CURDIR)/debian/$(PACKAGE)/usr OPTIMIZE="-O2 -g -Wall" test install
-	[ ! -d $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5
+binary-arch:
+# We have nothing to do here for an architecture-independent package
 
-binary-arch:;
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
-	dh_installman
 	dh_installchangelogs Changes
-	dh_link
-	dh_strip
+	dh_perl
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_perl
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install




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