r16826 - in /trunk/libfile-find-rule-perl: debian/changelog debian/control debian/patches/ debian/patches/sequential_slashes.patch debian/patches/series debian/rules lib/File/Find/Rule.pm
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Sat Mar 8 01:08:57 UTC 2008
Author: gregoa-guest
Date: Sat Mar 8 01:08:56 2008
New Revision: 16826
URL: http://svn.debian.org/wsvn/?sc=1&rev=16826
Log:
* debian/rules: update based on dh-make-perl's templates.
* Split out the patch for #329377 into sequential_slashes.patch; add quilt
framework.
Added:
trunk/libfile-find-rule-perl/debian/patches/
trunk/libfile-find-rule-perl/debian/patches/sequential_slashes.patch
trunk/libfile-find-rule-perl/debian/patches/series
Modified:
trunk/libfile-find-rule-perl/debian/changelog
trunk/libfile-find-rule-perl/debian/control
trunk/libfile-find-rule-perl/debian/rules
trunk/libfile-find-rule-perl/lib/File/Find/Rule.pm
Modified: trunk/libfile-find-rule-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libfile-find-rule-perl/debian/changelog?rev=16826&op=diff
==============================================================================
--- trunk/libfile-find-rule-perl/debian/changelog (original)
+++ trunk/libfile-find-rule-perl/debian/changelog Sat Mar 8 01:08:56 2008
@@ -4,14 +4,17 @@
field (source stanza); Homepage field (source stanza). Removed: XS-
Vcs-Svn fields.
* debian/rules: delete /usr/lib/perl5 only if it exists (closes: #467789).
+ * debian/rules: update based on dh-make-perl's templates.
* debian/watch: use dist-based URL.
* Set Standards-Version to 3.7.3 (no changes).
* Add /me to Uploaders.
* debian/copyright: use author-agnostic download URL.
* Remove debian/docs and don't install README any more (text version of
the POD documentation).
+ * Split out the patch for #329377 into sequential_slashes.patch; add quilt
+ framework.
- -- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 08 Mar 2008 01:59:23 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 08 Mar 2008 02:07:55 +0100
libfile-find-rule-perl (0.30-2) unstable; urgency=low
Modified: trunk/libfile-find-rule-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libfile-find-rule-perl/debian/control?rev=16826&op=diff
==============================================================================
--- trunk/libfile-find-rule-perl/debian/control (original)
+++ trunk/libfile-find-rule-perl/debian/control Sat Mar 8 01:08:56 2008
@@ -4,7 +4,7 @@
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jonas Genannt <jonas.genannt at capi2name.de>, Niko Tyni <ntyni at iki.fi>,
Gunnar Wolf <gwolf at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), quilt
Build-Depends-Indep: perl (>= 5.6.0-16), perl-modules, libtext-glob-perl, libnumber-compare-perl
Standards-Version: 3.7.3
Homepage: http://search.cpan.org/dist/File-Find-Rule/
Added: trunk/libfile-find-rule-perl/debian/patches/sequential_slashes.patch
URL: http://svn.debian.org/wsvn/trunk/libfile-find-rule-perl/debian/patches/sequential_slashes.patch?rev=16826&op=file
==============================================================================
--- trunk/libfile-find-rule-perl/debian/patches/sequential_slashes.patch (added)
+++ trunk/libfile-find-rule-perl/debian/patches/sequential_slashes.patch Sat Mar 8 01:08:56 2008
@@ -1,0 +1,10 @@
+--- libfile-find-rule-perl.orig/lib/File/Find/Rule.pm
++++ libfile-find-rule-perl/lib/File/Find/Rule.pm
+@@ -541,6 +541,7 @@
+ my $topdir;
+ my $code = 'sub {
+ (my $path = $File::Find::name) =~ s#^(?:\./+)+##;
++ $path = "." if ($path eq ""); # See Debian bug #329377
+ my @args = ($_, $File::Find::dir, $path);
+ my $maxdepth = $self->{maxdepth};
+ my $mindepth = $self->{mindepth};
Added: trunk/libfile-find-rule-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libfile-find-rule-perl/debian/patches/series?rev=16826&op=file
==============================================================================
--- trunk/libfile-find-rule-perl/debian/patches/series (added)
+++ trunk/libfile-find-rule-perl/debian/patches/series Sat Mar 8 01:08:56 2008
@@ -1,0 +1,1 @@
+sequential_slashes.patch
Modified: trunk/libfile-find-rule-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libfile-find-rule-perl/debian/rules?rev=16826&op=diff
==============================================================================
--- trunk/libfile-find-rule-perl/debian/rules (original)
+++ trunk/libfile-find-rule-perl/debian/rules Sat Mar 8 01:08:56 2008
@@ -1,53 +1,72 @@
#!/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
-PERL ?= /usr/bin/perl
-package = libfile-find-rule-perl
+include /usr/share/quilt/quilt.make
+
+# 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=$(shell dh_listpackages)
+
+ifndef PERL
+PERL = /usr/bin/perl
+endif
+
+TMP =$(CURDIR)/debian/$(PACKAGE)
build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
$(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
+ $(MAKE) test
- touch build-stamp
+ touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
+ dh_clean build-stamp install-stamp
[ ! -f Makefile ] || $(MAKE) realclean
- dh_clean
-
-install: build
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
- $(MAKE) test
- $(MAKE) install DESTDIR=$(CURDIR)/debian/$(package)
- [ ! -d debian/$(package)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose debian/$(package)/usr/lib/perl5
+
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -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_installdocs
dh_installchangelogs Changes
- dh_installdocs
- dh_link
+ dh_perl
dh_compress
dh_fixperms
- dh_perl
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
-binary-arch: build install
+source diff:
+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
Modified: trunk/libfile-find-rule-perl/lib/File/Find/Rule.pm
URL: http://svn.debian.org/wsvn/trunk/libfile-find-rule-perl/lib/File/Find/Rule.pm?rev=16826&op=diff
==============================================================================
--- trunk/libfile-find-rule-perl/lib/File/Find/Rule.pm (original)
+++ trunk/libfile-find-rule-perl/lib/File/Find/Rule.pm Sat Mar 8 01:08:56 2008
@@ -541,7 +541,6 @@
my $topdir;
my $code = 'sub {
(my $path = $File::Find::name) =~ s#^(?:\./+)+##;
- $path = "." if ($path eq ""); # See Debian bug #329377
my @args = ($_, $File::Find::dir, $path);
my $maxdepth = $self->{maxdepth};
my $mindepth = $self->{mindepth};
More information about the Pkg-perl-cvs-commits
mailing list