Update debhelper to 10.2.5 (#1293111)

epel9
Sérgio M. Basto 8 years ago
parent 6cbb879a57
commit ae450b7a7b

1
.gitignore vendored

@ -5,3 +5,4 @@
/debhelper_9.20150101.tar.gz /debhelper_9.20150101.tar.gz
/debhelper_9.20150507.tar.xz /debhelper_9.20150507.tar.xz
/debhelper_9.20150628.tar.xz /debhelper_9.20150628.tar.xz
/debhelper_10.2.5.tar.xz

@ -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.

@ -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");
}

@ -7,8 +7,8 @@
} }
Name: debhelper Name: debhelper
Version: 9.20150628 Version: 10.2.5
Release: 4%{?dist} Release: 1%{?dist}
Summary: Helper programs for Debian rules Summary: Helper programs for Debian rules
Group: Development/Tools Group: Development/Tools
@ -16,11 +16,15 @@ License: GPLv2+
URL: http://kitenet.net/~joey/code/debhelper/ URL: http://kitenet.net/~joey/code/debhelper/
Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.xz 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 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 BuildArch: noarch
BuildRequires: bash BuildRequires: bash
BuildRequires: coreutils BuildRequires: coreutils
BuildRequires: dpkg-dev BuildRequires: man-db
BuildRequires: fakeroot
BuildRequires: dpkg-dev >= 1.18.0
BuildRequires: findutils BuildRequires: findutils
BuildRequires: grep BuildRequires: grep
BuildRequires: make BuildRequires: make
@ -54,7 +58,7 @@ BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod)
Requires: binutils Requires: binutils
Requires: dpkg-dev Requires: dpkg-dev >= 1.18.0
Requires: html2text Requires: html2text
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: perl(Dpkg::BuildProfiles) Requires: perl(Dpkg::BuildProfiles)
@ -71,6 +75,8 @@ packages use debhelper as part of their build process.
%prep %prep
%setup -q -n %{name} %setup -q -n %{name}
%patch0 -p1 -b .no-utf8-to-pod2man %patch0 -p1 -b .no-utf8-to-pod2man
%patch1 -p1 -b .no-transitional-package
%patch2 -p1 -b .dh_installman
%build %build
make %{?_smp_mflags} build make %{?_smp_mflags} build
@ -80,14 +86,14 @@ make %{?_smp_mflags} build
# Use debhelper to install (man-pages of) debhelper... # 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: # Add man-pages to a .lang file:
# We cannot use "find_lang --with-man" because it only handle # We cannot use "find_lang --with-man" because it only handle
# single man-page -- we have many # single man-page -- we have many
rm -f debhelper-mans.lang 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 for level in 1 7; do
# Append to .lang file # Append to .lang file
# Replace buildroot with the lang prefix, append '*' (for gzip, etc.) # Replace buildroot with the lang prefix, append '*' (for gzip, etc.)
@ -116,6 +122,13 @@ make test
%{perl_vendorlib}/* %{perl_vendorlib}/*
%changelog %changelog
* Sat Feb 04 2017 Sérgio Basto <sergio@serjux.com> - 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 <jplesnik@redhat.com> - 9.20150628-4 * Tue May 17 2016 Jitka Plesnikova <jplesnik@redhat.com> - 9.20150628-4
- Perl 5.24 rebuild - Perl 5.24 rebuild

@ -1 +1 @@
2f4153c555a9cd624fb2e4b7adab216b debhelper_9.20150628.tar.xz SHA512 (debhelper_10.2.5.tar.xz) = 67a6a548bd9482c8f25d429bd4bdbe7581326926c4b4d280b34c78a487fc8c0b6c26ed05aac3d2855b748a6542ecc167e37ea333e50e9bb1e3ee27a7d91c84d3

Loading…
Cancel
Save