diff --git a/debhelper-no-localized-manpages.patch b/debhelper-9.20150101-no-localized-manpages.patch similarity index 79% rename from debhelper-no-localized-manpages.patch rename to debhelper-9.20150101-no-localized-manpages.patch index 64f0b9f..5f078f4 100644 --- a/debhelper-no-localized-manpages.patch +++ b/debhelper-9.20150101-no-localized-manpages.patch @@ -2,16 +2,21 @@ Index: debhelper/Makefile =================================================================== --- debhelper/Makefile.orig 2011-03-16 09:40:35.806209287 +0100 +++ debhelper/Makefile 2011-03-16 09:40:54.454930738 +0100 -@@ -40,26 +40,9 @@ +@@ -42,32 +42,11 @@ POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)" +-ifneq ($(USE_NLS),no) -# l10n to be built is determined from .po files --LANGS=$(notdir $(basename $(wildcard man/po4a/po/*.po))) -- +-LANGS?=$(notdir $(basename $(wildcard man/po4a/po/*.po))) +-else + LANGS= +-endif + build: version debhelper.7 - find . -maxdepth 1 -type f -perm +100 -name "dh*" \ + find . -maxdepth 1 -type f -perm /100 -name "dh*" \ -exec $(POD2MAN) {} {}.1 \; +-ifneq ($(USE_NLS),no) - po4a --previous -L UTF-8 man/po4a/po4a.cfg - set -e; \ - for lang in $(LANGS); do \ @@ -26,17 +31,20 @@ Index: debhelper/Makefile - $(POD2MAN) --name="debhelper" --section=7 > debhelper.$$lang.7; \ - fi; \ - done +-endif version: printf "package Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';\n1" > \ -@@ -72,10 +55,6 @@ +@@ -80,12 +59,6 @@ clean: rm -f *.1 *.7 Debian/Debhelper/Dh_Version.pm +-ifneq ($(USE_NLS),no) - po4a --previous --rm-translations --rm-backups man/po4a/po4a.cfg +-endif - for lang in $(LANGS); do \ - if [ -e man/$$lang ]; then rmdir man/$$lang; fi; \ - done; install: - install -d $(DESTDIR)/usr/bin \ + install -d $(DESTDIR)$(PREFIX)/bin \ diff --git a/debhelper-findutils.patch b/debhelper-findutils.patch deleted file mode 100644 index b675429..0000000 --- a/debhelper-findutils.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Joey Hess -Date: Sat, 9 Feb 2013 21:38:42 +0000 (-0400) -Subject: Avoid find -perm +mode breakage caused by findutils 4.5.11, by instead using -perm... -X-Git-Tag: 9.20130504~7 -X-Git-Url: http://anonscm.debian.org/gitweb/?p=debhelper%2Fdebhelper.git;a=commitdiff_plain;h=e9fe3cee83cdcc4df978fb1761009dfc124add92;hp=7765a25a48492d2d971c836c8e609422c540d721 - -Avoid find -perm +mode breakage caused by findutils 4.5.11, by instead using -perm /mode. Closes: #700200 ---- - -Index: debhelper/Makefile -=================================================================== ---- debhelper.orig/Makefile -+++ debhelper/Makefile -@@ -1,5 +1,5 @@ - # List of files of dh_* commands. Sorted for debhelper man page. --COMMANDS=$(shell find . -maxdepth 1 -type f -perm +100 -name "dh_*" -printf "%f\n" | sort) -+COMMANDS=$(shell find . -maxdepth 1 -type f -perm /100 -name "dh_*" -printf "%f\n" | sort) - - # Find deprecated commands by looking at their synopsis. - DEPRECATED=$(shell egrep -l '^dh_.* - .*deprecated' $(COMMANDS)) -@@ -41,7 +41,7 @@ PERLLIBDIR=$(shell perl -MConfig -e 'pri - POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)" - - build: version debhelper.7 -- find . -maxdepth 1 -type f -perm +100 -name "dh*" \ -+ find . -maxdepth 1 -type f -perm /100 -name "dh*" \ - -exec $(POD2MAN) {} {}.1 \; - - version: -Index: debhelper/dh_shlibdeps -=================================================================== ---- debhelper.orig/dh_shlibdeps -+++ debhelper/dh_shlibdeps -@@ -129,7 +129,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) - if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') { - $find_options="! \\( $dh{EXCLUDE_FIND} \\)"; - } -- foreach my $file (split(/\n/,`find $tmp -type f \\( -perm +111 -or -name "*.so*" -or -name "*.cmxs" \\) $find_options -print`)) { -+ foreach my $file (split(/\n/,`find $tmp -type f \\( -perm /111 -or -name "*.so*" -or -name "*.cmxs" \\) $find_options -print`)) { - # Prune directories that contain separated debug symbols. - next if $file=~m!^\Q$tmp\E/usr/lib/debug/(lib|lib64|usr|bin|sbin|opt|dev|emul)/!; - # TODO this is slow, optimize. Ie, file can run once on -Index: debhelper/dh_suidregister -=================================================================== ---- debhelper.orig/dh_suidregister -+++ debhelper/dh_suidregister -@@ -53,7 +53,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) - if (! @files && ! $suid) { - # No files specified (and no empty debian/suid file), so - # guess what files to process. -- @files=split(/\n/,`find $tmp -type f -perm +6000`); -+ @files=split(/\n/,`find $tmp -type f -perm /6000`); - - # Strip the debian working directory off of the filenames. - $tostrip="$tmp/"; diff --git a/debhelper.changes b/debhelper.changes index 0d379e3..4b89340 100644 --- a/debhelper.changes +++ b/debhelper.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jan 4 17:24:25 UTC 2015 - p.drouand@gmail.com + +- Update to version 9.20150101 +- Adapt debhelper-no-localized-manpages.patch to upstream changes + > debhelper-20150101-no-localized-manpages.patch +- Remove upstreamed debhelper-findutils.patch + ------------------------------------------------------------------- Fri Oct 4 02:43:46 UTC 2013 - frank.lichtenheld@sophos.com diff --git a/debhelper.spec b/debhelper.spec index 7ea1294..ef60a79 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -1,7 +1,7 @@ # # spec file for package debhelper # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: debhelper -Version: 9.20120830 +Version: 9.20150101 Release: 0 Summary: Helper programs for debian/rules License: GPL-2.0+ @@ -26,11 +26,9 @@ Url: http://kitenet.net/~joey/code/debhelper/ # http://ftp.de.debian.org/debian/pool/main/d/debhelper/ Source0: debhelper_%{version}.tar.gz # PATCH-FIX-UPSTREAM not build translated-manpages. -Patch0: debhelper-no-localized-manpages.patch +Patch0: debhelper-9.20150101-no-localized-manpages.patch # PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages. Patch1: debhelper-pod2man-no-utf8.patch -# PATCH-FIX-UPSTREAM fix problems with new findutils -Patch2: debhelper-findutils.patch Requires: dpkg %if 0%{?suse_version} Requires: perl = %{perl_version} @@ -51,7 +49,6 @@ as part of their build process. %setup -q -n %{name} %patch0 -p1 -%patch2 -p1 %if 0%{?suse_version} && 0%{?suse_version} < 1130 %patch1 -p1 %endif diff --git a/debhelper_9.20120830.tar.gz b/debhelper_9.20120830.tar.gz deleted file mode 100644 index be911fb..0000000 --- a/debhelper_9.20120830.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3798a53fdf2e269bb7b74eb61af43444ceb102610fb0bfb6ba2a057d714363c9 -size 464324 diff --git a/debhelper_9.20150101.tar.gz b/debhelper_9.20150101.tar.gz new file mode 100644 index 0000000..0c63f69 --- /dev/null +++ b/debhelper_9.20150101.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd8d81d71d1bb0ba4b58c517465551231dd60811b98c867e4344bc55ec6a45f2 +size 545089