r20907 - in /trunk/libtext-diff-perl: debian/changelog debian/control debian/patches/ debian/patches/series debian/patches/testfix.patch debian/rules t/general.t
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Tue Jun 10 18:17:59 UTC 2008
Author: gregoa
Date: Tue Jun 10 18:17:58 2008
New Revision: 20907
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20907
Log:
* Split out changes to test suite into a patch; add quilt framework.
* Refresh debian/rules, no functional changes.
Added:
trunk/libtext-diff-perl/debian/patches/
trunk/libtext-diff-perl/debian/patches/series
trunk/libtext-diff-perl/debian/patches/testfix.patch
Modified:
trunk/libtext-diff-perl/debian/changelog
trunk/libtext-diff-perl/debian/control
trunk/libtext-diff-perl/debian/rules
trunk/libtext-diff-perl/t/general.t
Modified: trunk/libtext-diff-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/debian/changelog?rev=20907&op=diff
==============================================================================
--- trunk/libtext-diff-perl/debian/changelog (original)
+++ trunk/libtext-diff-perl/debian/changelog Tue Jun 10 18:17:58 2008
@@ -1,3 +1,10 @@
+libtext-diff-perl (0.35-4) UNRELEASED; urgency=low
+
+ * Split out changes to test suite into a patch; add quilt framework.
+ * Refresh debian/rules, no functional changes.
+
+ -- gregor herrmann <gregoa at debian.org> Sun, 08 Jun 2008 19:04:58 +0200
+
libtext-diff-perl (0.35-3) unstable; urgency=low
[ gregor herrmann ]
Modified: trunk/libtext-diff-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/debian/control?rev=20907&op=diff
==============================================================================
--- trunk/libtext-diff-perl/debian/control (original)
+++ trunk/libtext-diff-perl/debian/control Tue Jun 10 18:17:58 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jay Bonci <jaybonci at debian.org>, Gunnar Wolf <gwolf at debian.org>
-Build-Depends: debhelper (>> 6)
+Build-Depends: debhelper (>> 6), quilt (>= 0.40)
Build-Depends-Indep: perl (>= 5.8), libalgorithm-diff-perl
Standards-Version: 3.7.3
Homepage: http://search.cpan.org/dist/Text-Diff/
Added: trunk/libtext-diff-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/debian/patches/series?rev=20907&op=file
==============================================================================
--- trunk/libtext-diff-perl/debian/patches/series (added)
+++ trunk/libtext-diff-perl/debian/patches/series Tue Jun 10 18:17:58 2008
@@ -1,0 +1,1 @@
+testfix.patch
Added: trunk/libtext-diff-perl/debian/patches/testfix.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/debian/patches/testfix.patch?rev=20907&op=file
==============================================================================
--- trunk/libtext-diff-perl/debian/patches/testfix.patch (added)
+++ trunk/libtext-diff-perl/debian/patches/testfix.patch Tue Jun 10 18:17:58 2008
@@ -1,0 +1,13 @@
+--- libtext-diff-perl-0.35.orig/t/general.t
++++ libtext-diff-perl-0.35/t/general.t
+@@ -126,8 +126,8 @@
+ warn "# diff options: $diff_opts\n" ;
+ warn "# my options: $Diff_opts\n" ;
+ ## Merge the outputs using A::D
+- my @E = split /^/g, $expect ;
+- my @G = split /^/g, $output ;
++ my @E = split /^/, $expect ;
++ my @G = split /^/, $output ;
+ my $w = length "Expected" ;
+ for ( @E, @G ) {
+ s/\n/\\n/g ;
Modified: trunk/libtext-diff-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/debian/rules?rev=20907&op=diff
==============================================================================
--- trunk/libtext-diff-perl/debian/rules (original)
+++ trunk/libtext-diff-perl/debian/rules Tue Jun 10 18:17:58 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/"`
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
+include /usr/share/quilt/quilt.make
-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) distclean
- 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
Modified: trunk/libtext-diff-perl/t/general.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/t/general.t?rev=20907&op=diff
==============================================================================
--- trunk/libtext-diff-perl/t/general.t (original)
+++ trunk/libtext-diff-perl/t/general.t Tue Jun 10 18:17:58 2008
@@ -126,8 +126,8 @@
warn "# diff options: $diff_opts\n" ;
warn "# my options: $Diff_opts\n" ;
## Merge the outputs using A::D
- my @E = split /^/, $expect ;
- my @G = split /^/, $output ;
+ my @E = split /^/g, $expect ;
+ my @G = split /^/g, $output ;
my $w = length "Expected" ;
for ( @E, @G ) {
s/\n/\\n/g ;
More information about the Pkg-perl-cvs-commits
mailing list