From b1ac832d421f0ac050eaefef9859b33192be9426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Basto?= Date: Mon, 10 Feb 2014 19:33:24 +0000 Subject: [PATCH] Update to 9.20131227, most of the work by Sandro Mani - Drop debhelper-find-perm.patch, fixed upstream. - Drop debhelper-fr.po.patch, fixed upstream. --- .gitignore | 1 + debhelper-7.4.20-no-utf8-to-pod2man.patch | 11 ++++---- debhelper-find-perm.patch | 31 ----------------------- debhelper-fr.po.patch | 12 --------- debhelper.spec | 22 +++++++--------- sources | 2 +- 6 files changed, 16 insertions(+), 63 deletions(-) delete mode 100644 debhelper-find-perm.patch delete mode 100644 debhelper-fr.po.patch diff --git a/.gitignore b/.gitignore index de5a92c..bf58159 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /debhelper_9.20120909.tar.gz +/debhelper_9.20131227.tar.gz diff --git a/debhelper-7.4.20-no-utf8-to-pod2man.patch b/debhelper-7.4.20-no-utf8-to-pod2man.patch index 1739a29..c51bc9b 100644 --- a/debhelper-7.4.20-no-utf8-to-pod2man.patch +++ b/debhelper-7.4.20-no-utf8-to-pod2man.patch @@ -1,12 +1,11 @@ -diff -ur debhelper.orig/Makefile debhelper.0-no-utf8-to-pod2man/Makefile ---- debhelper.orig/Makefile 2010-04-07 03:52:10.000000000 +0200 -+++ debhelper.0-no-utf8-to-pod2man/Makefile 2010-05-13 18:49:51.141294947 +0200 -@@ -32,7 +32,7 @@ +--- debhelper/Makefile.orig 2014-02-10 15:28:46.026223272 +0000 ++++ debhelper/Makefile 2014-02-10 17:24:44.795637157 +0000 +@@ -40,7 +40,7 @@ PERLLIBDIR=$(shell perl -MConfig -e 'pri - PERLLIBDIR=$(shell perl -MConfig -e 'print $$Config{vendorlib}')/Debian/Debhelper + PREFIX=/usr -POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)" +POD2MAN=pod2man -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))) diff --git a/debhelper-find-perm.patch b/debhelper-find-perm.patch deleted file mode 100644 index 64aa104..0000000 --- a/debhelper-find-perm.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up ./dh_suidregister.orig ./dh_suidregister ---- ./dh_suidregister.orig 2013-05-14 06:00:14.170057295 -0400 -+++ ./dh_suidregister 2013-05-14 06:00:25.236037285 -0400 -@@ -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 -up ./Makefile.orig ./Makefile ---- ./Makefile.orig 2013-05-14 05:59:05.747127850 -0400 -+++ ./Makefile 2013-05-14 05:59:17.529103009 -0400 -@@ -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)) -@@ -44,7 +44,7 @@ POD2MAN=pod2man -c Debhelper -r "$(VERSI - LANGS=$(notdir $(basename $(wildcard man/po4a/po/*.po))) - - 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 \; - po4a --previous -L UTF-8 man/po4a/po4a.cfg - set -e; \ diff --git a/debhelper-fr.po.patch b/debhelper-fr.po.patch deleted file mode 100644 index fc6de9a..0000000 --- a/debhelper-fr.po.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./man/po4a/po/fr.po.orig ./man/po4a/po/fr.po ---- ./man/po4a/po/fr.po.orig 2013-05-14 06:18:05.617992294 -0400 -+++ ./man/po4a/po/fr.po 2013-05-14 06:18:31.872993902 -0400 -@@ -6022,7 +6022,7 @@ msgstr "" - "répertoires à la recherche de fichiers portant un nom ressemblant à ceux " - "utilisés pour les pages de manuel. Nota : Seuls les vrais répertoires sont " - "scrutés, les liens symboliques sont ignorés. dh_installmanpages utilise " --"L pour vérifier si les fichiers sont dans un format correct, puis " -+"L pour vérifier si les fichiers sont dans un format correct, puis " - "se base sur l'extension du fichier pour l'installer dans le bon répertoire." - - # type: textblock diff --git a/debhelper.spec b/debhelper.spec index bc047db..ca728af 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,8 +7,8 @@ } Name: debhelper -Version: 9.20120909 -Release: 3%{?dist} +Version: 9.20131227 +Release: 1%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -16,9 +16,6 @@ License: GPLv2+ URL: http://kitenet.net/~joey/code/debhelper/ Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.gz Patch0: debhelper-7.4.20-no-utf8-to-pod2man.patch -Patch1: debhelper-find-perm.patch -Patch2: debhelper-fr.po.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: po4a @@ -45,16 +42,13 @@ packages use debhelper as part of their build process. %prep %setup -q -n %{name} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch0 -p1 -b .no-utf8-to-pod2man %build make %{?_smp_mflags} build %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%make_install # Use debhelper to install (man-pages of) debhelper... @@ -80,11 +74,8 @@ done %check make test -%clean -rm -rf %{buildroot} %files -f debhelper-mans.lang -%defattr(-,root,root,-) %doc examples/ doc/ %{_mandir}/man1/* %{_mandir}/man7/* @@ -95,6 +86,11 @@ rm -rf %{buildroot} %{perl_vendorlib}/Debian/Debhelper %changelog +* Mon Feb 10 2014 Sérgio Basto - 9.20131227-1 +- Update to 9.20131227, most of the work by Sandro Mani +- Drop debhelper-find-perm.patch, fixed upstream. +- Drop debhelper-fr.po.patch, fixed upstream. + * Sat Aug 03 2013 Fedora Release Engineering - 9.20120909-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 93510aa..bfbb463 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -42bbf0ef9d1fc38b3548b2ab58556e37 debhelper_9.20120909.tar.gz +d048826a3a6c831f03a8292398d9d329 debhelper_9.20131227.tar.gz