From ae450b7a7b479053067d5853eedad5719cbe5811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 4 Feb 2017 04:19:12 +0000 Subject: [PATCH] Update debhelper to 10.2.5 (#1293111) --- .gitignore | 1 + ...nore-dh-systemd-transitional-package.patch | 15 +++++++++++ ...per-10.2.5-revert-partial-580bc09d41.patch | 15 +++++++++++ debhelper.spec | 25 ++++++++++++++----- sources | 2 +- 5 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch create mode 100644 debhelper-10.2.5-revert-partial-580bc09d41.patch diff --git a/.gitignore b/.gitignore index e9e2323..b391034 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /debhelper_9.20150101.tar.gz /debhelper_9.20150507.tar.xz /debhelper_9.20150628.tar.xz +/debhelper_10.2.5.tar.xz diff --git a/debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch b/debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch new file mode 100644 index 0000000..c59cba7 --- /dev/null +++ b/debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch @@ -0,0 +1,15 @@ +--- debhelper-10.2.5/debian/control.orig 2017-02-04 06:29:34.501753822 +0000 ++++ debhelper-10.2.5/debian/control 2017-02-04 06:29:45.059862010 +0000 +@@ -37,12 +37,3 @@ Description: helper programs for debian/ + menu system, debconf, doc-base, etc. Most Debian packages use debhelper + as part of their build process. + +-Package: dh-systemd +-Section: oldlibs +-Priority: extra +-Architecture: all +-Multi-Arch: foreign +-Depends: debhelper (>= 9.20160709), +- ${misc:Depends}, +-Description: debhelper add-on to handle systemd unit files - transitional package +- This package is for transitional purposes and can be removed safely. diff --git a/debhelper-10.2.5-revert-partial-580bc09d41.patch b/debhelper-10.2.5-revert-partial-580bc09d41.patch new file mode 100644 index 0000000..9c3baa2 --- /dev/null +++ b/debhelper-10.2.5-revert-partial-580bc09d41.patch @@ -0,0 +1,15 @@ +# dh_installman use man --recode UTF-8 +# but reset_perm_and_owner throw an error, I had report upstream +# https://github.com/Debian/debhelper/commit/580bc09d41ddc8542515f50d40ff8c8477711d3d + +--- ./dh_installman.orig 2017-02-05 05:01:58.333615856 +0000 ++++ ./dh_installman 2017-02-05 05:02:55.318236337 +0000 +@@ -210,7 +210,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) + complex_doit "man --recode UTF-8 ./\Q$orig\E > \Q$tmp\E"; + # recode uncompresses compressed pages + doit "rm", "-f", $orig if s/\.(gz|Z)$//; +- reset_perm_and_owner('0755', $tmp); ++ doit "chmod", 644, $tmp; + doit "mv", "-f", $tmp, $_; + }, "$tmp/$dir"); + } diff --git a/debhelper.spec b/debhelper.spec index d4b1a6e..6829add 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,8 +7,8 @@ } Name: debhelper -Version: 9.20150628 -Release: 4%{?dist} +Version: 10.2.5 +Release: 1%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -16,11 +16,15 @@ License: GPLv2+ URL: http://kitenet.net/~joey/code/debhelper/ Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.xz Patch0: debhelper-7.4.20-no-utf8-to-pod2man.patch +Patch1: debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch +Patch2: debhelper-10.2.5-revert-partial-580bc09d41.patch BuildArch: noarch BuildRequires: bash BuildRequires: coreutils -BuildRequires: dpkg-dev +BuildRequires: man-db +BuildRequires: fakeroot +BuildRequires: dpkg-dev >= 1.18.0 BuildRequires: findutils BuildRequires: grep BuildRequires: make @@ -54,7 +58,7 @@ BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) Requires: binutils -Requires: dpkg-dev +Requires: dpkg-dev >= 1.18.0 Requires: html2text Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Dpkg::BuildProfiles) @@ -71,6 +75,8 @@ packages use debhelper as part of their build process. %prep %setup -q -n %{name} %patch0 -p1 -b .no-utf8-to-pod2man +%patch1 -p1 -b .no-transitional-package +%patch2 -p1 -b .dh_installman %build make %{?_smp_mflags} build @@ -80,14 +86,14 @@ make %{?_smp_mflags} build # Use debhelper to install (man-pages of) debhelper... -./run dh_installman -P %{buildroot} +./run dh_installman -P %{buildroot} --verbose # Add man-pages to a .lang file: # We cannot use "find_lang --with-man" because it only handle # single man-page -- we have many rm -f debhelper-mans.lang -for lang in de es fr pt; do +for lang in de es fr pt ja; do for level in 1 7; do # Append to .lang file # Replace buildroot with the lang prefix, append '*' (for gzip, etc.) @@ -116,6 +122,13 @@ make test %{perl_vendorlib}/* %changelog +* Sat Feb 04 2017 Sérgio Basto - 10.2.5-1 +- Update debhelper to 10.2.5 (#1293111) +- Add debhelper-10.2.5-revert-partial-580bc09d41.patch to fix build +- Add debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch to fix build +- Add BuildRequires man-db and fakeroot +- Force use dpkg-dev > 1.18 it is one advise of upstream + * Tue May 17 2016 Jitka Plesnikova - 9.20150628-4 - Perl 5.24 rebuild diff --git a/sources b/sources index c20662f..34d9b31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f4153c555a9cd624fb2e4b7adab216b debhelper_9.20150628.tar.xz +SHA512 (debhelper_10.2.5.tar.xz) = 67a6a548bd9482c8f25d429bd4bdbe7581326926c4b4d280b34c78a487fc8c0b6c26ed05aac3d2855b748a6542ecc167e37ea333e50e9bb1e3ee27a7d91c84d3