r22038 - in /trunk/libxml-xql-perl: bin/xql.pl debian/changelog debian/control debian/libxml-xql-perl.docs debian/libxml-xql-perl.examples debian/patches/ debian/patches/hashbang.patch debian/patches/series debian/rules

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Sat Jun 21 13:13:12 UTC 2008


Author: gregoa
Date: Sat Jun 21 13:13:11 2008
New Revision: 22038

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22038
Log:
  via debian/control and remove /usr/bin via debian/rules.
* Split out changes to xql.pl into a patch; add quilt framework.
* Refresh debian/rules, no functional changes.
* Remove debian/libxml-xql-perl.*, let debian/rules do the work.

Added:
    trunk/libxml-xql-perl/debian/patches/
    trunk/libxml-xql-perl/debian/patches/hashbang.patch
    trunk/libxml-xql-perl/debian/patches/series
Removed:
    trunk/libxml-xql-perl/debian/libxml-xql-perl.docs
    trunk/libxml-xql-perl/debian/libxml-xql-perl.examples
Modified:
    trunk/libxml-xql-perl/bin/xql.pl
    trunk/libxml-xql-perl/debian/changelog
    trunk/libxml-xql-perl/debian/control
    trunk/libxml-xql-perl/debian/rules

Modified: trunk/libxml-xql-perl/bin/xql.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xql-perl/bin/xql.pl?rev=22038&op=diff
==============================================================================
--- trunk/libxml-xql-perl/bin/xql.pl (original)
+++ trunk/libxml-xql-perl/bin/xql.pl Sat Jun 21 13:13:11 2008
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/home1/enno/bin/perl -Ilib
 
 ############################################################################
 # Copyright (c) 1998 Enno Derksen

Modified: trunk/libxml-xql-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xql-perl/debian/changelog?rev=22038&op=diff
==============================================================================
--- trunk/libxml-xql-perl/debian/changelog (original)
+++ trunk/libxml-xql-perl/debian/changelog Sat Jun 21 13:13:11 2008
@@ -6,7 +6,10 @@
   * Use dist-based URL in debian/watch.
   * debian/rules: delete /usr/lib/perl5 only if it exists.
   * Remove changes to upstream Makefile.PL; we handle dependencies ourselves
-    via debian/control.
+    via debian/control and remove /usr/bin via debian/rules.
+  * Split out changes to xql.pl into a patch; add quilt framework.
+  * Refresh debian/rules, no functional changes.
+  * Remove debian/libxml-xql-perl.*, let debian/rules do the work.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Sat, 01 Dec 2007 18:55:48 +0100
 

Modified: trunk/libxml-xql-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xql-perl/debian/control?rev=22038&op=diff
==============================================================================
--- trunk/libxml-xql-perl/debian/control (original)
+++ trunk/libxml-xql-perl/debian/control Sat Jun 21 13:13:11 2008
@@ -7,7 +7,8 @@
 Homepage: http://search.cpan.org/dist/XML-XQL/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libxml-xql-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xql-perl/
-Build-Depends-Indep: debhelper (>= 4.1), perl, libdate-manip-perl (>= 5.33), libparse-yapp-perl, libxml-dom-perl (>= 1.29), libxml-regexp-perl (>= 0.03)
+Build-Depends: debhelper (>= 4.1), quilt (>= 0.40)
+Build-Depends-Indep: perl, libdate-manip-perl (>= 5.33), libparse-yapp-perl, libxml-dom-perl (>= 1.29), libxml-regexp-perl (>= 0.03)
 
 Package: libxml-xql-perl
 Section: perl

Added: trunk/libxml-xql-perl/debian/patches/hashbang.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xql-perl/debian/patches/hashbang.patch?rev=22038&op=file
==============================================================================
--- trunk/libxml-xql-perl/debian/patches/hashbang.patch (added)
+++ trunk/libxml-xql-perl/debian/patches/hashbang.patch Sat Jun 21 13:13:11 2008
@@ -1,0 +1,8 @@
+--- libxml-xql-perl.orig/bin/xql.pl
++++ libxml-xql-perl/bin/xql.pl
+@@ -1,4 +1,4 @@
+-#!/home1/enno/bin/perl -Ilib
++#!/usr/bin/perl -w
+ 
+ ############################################################################
+ # Copyright (c) 1998 Enno Derksen

Added: trunk/libxml-xql-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xql-perl/debian/patches/series?rev=22038&op=file
==============================================================================
--- trunk/libxml-xql-perl/debian/patches/series (added)
+++ trunk/libxml-xql-perl/debian/patches/series Sat Jun 21 13:13:11 2008
@@ -1,0 +1,1 @@
+hashbang.patch

Modified: trunk/libxml-xql-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xql-perl/debian/rules?rev=22038&op=diff
==============================================================================
--- trunk/libxml-xql-perl/debian/rules (original)
+++ trunk/libxml-xql-perl/debian/rules Sat Jun 21 13:13:11 2008
@@ -1,54 +1,65 @@
 #!/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
 
-	-$(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/bin ] || \
+		$(RM) -rv $(TMP)/usr/bin
+	[ ! -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_installexamples
-	dh_installman
+	dh_installexamples samples/* bin/*
+	dh_installdocs README
 	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