From f63e0cc7980f0e03b6e2f8fb42fcfa28a826e514 Mon Sep 17 00:00:00 2001 From: Oron Peled Date: Mon, 20 May 2013 22:41:04 +0300 Subject: [PATCH 01/52] Initial import (#961141) --- .gitignore | 1 + debhelper-7.4.20-no-utf8-to-pod2man.patch | 12 +++ debhelper-find-perm.patch | 31 ++++++ debhelper-fr.po.patch | 12 +++ debhelper.spec | 126 ++++++++++++++++++++++ sources | 1 + 6 files changed, 183 insertions(+) create mode 100644 debhelper-7.4.20-no-utf8-to-pod2man.patch create mode 100644 debhelper-find-perm.patch create mode 100644 debhelper-fr.po.patch create mode 100644 debhelper.spec diff --git a/.gitignore b/.gitignore index e69de29..de5a92c 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/debhelper_9.20120909.tar.gz diff --git a/debhelper-7.4.20-no-utf8-to-pod2man.patch b/debhelper-7.4.20-no-utf8-to-pod2man.patch new file mode 100644 index 0000000..1739a29 --- /dev/null +++ b/debhelper-7.4.20-no-utf8-to-pod2man.patch @@ -0,0 +1,12 @@ +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 @@ + + PERLLIBDIR=$(shell perl -MConfig -e 'print $$Config{vendorlib}')/Debian/Debhelper + +-POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)" ++POD2MAN=pod2man -c Debhelper -r "$(VERSION)" + + # 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 new file mode 100644 index 0000000..64aa104 --- /dev/null +++ b/debhelper-find-perm.patch @@ -0,0 +1,31 @@ +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 new file mode 100644 index 0000000..fc6de9a --- /dev/null +++ b/debhelper-fr.po.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 0000000..1b76c4c --- /dev/null +++ b/debhelper.spec @@ -0,0 +1,126 @@ +# we don't want to either provide or require anything from _docdir, per policy +# https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering +%{?filter_setup: +%filter_provides_in %{_docdir} +%filter_requires_in %{_docdir} +%filter_setup +} + +Name: debhelper +Version: 9.20120909 +Release: 1%{?dist} +Summary: Helper programs for Debian rules + +Group: Development/Tools +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 +BuildRequires: man-db +BuildRequires: dpkg-dev +# For 'make test' +BuildRequires: perl(Test::Harness) +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Pod) + +Requires: binutils +Requires: dpkg-perl +Requires: html2text +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: po-debconf + +%description +A collection of programs that can be used in a Debian rules file +to automate common tasks related to building Debian packages. +Programs are included to install various files into your package, +compress files, fix file permissions, integrate your package with +the Debian menu system, debconf, doc-base, etc. Most Debian +packages use debhelper as part of their build process. + +%prep +%setup -q -n %{name} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build +make %{?_smp_mflags} build + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + +# Use debhelper to install (man-pages of) debhelper... + +./run dh_installman -P %{buildroot} + +# 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; do + for level in 1 7; do + # Append to .lang file + # Replace buildroot with the lang prefix, append '*' (for gzip, etc.) + find %{buildroot}%{_mandir}/$lang/man$level -type f -o -type l | sed " + s:^%{buildroot}:%%lang($lang) : + s:\$:*: + " >> debhelper-mans.lang + done +done + + +%check +make test + +%clean +rm -rf %{buildroot} + +%files -f debhelper-mans.lang +%defattr(-,root,root,-) +%doc examples/ doc/ +%{_mandir}/man1/* +%{_mandir}/man7/* +%{_bindir}/dh* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/autoscripts +%dir %{perl_vendorlib}/Debian +%{perl_vendorlib}/Debian/Debhelper + +%changelog +* Fri May 10 2013 Oron Peled - 9.20120909-1 +- Update to latest Debian/wheezy version +- Fix find_lang for man-pages +- Added 'de' to language list + +* Thu Mar 29 2012 Oron Peled - 9.20120322-3 +- Fix testing BR -- perl(Test::...) +- Now make test works as intended + +* Wed Mar 28 2012 Oron Peled - 9.20120322-2 +- Avoid auto-requires under _docdir +- Prepare for make test (but don't fail yet, as we miss perl-Test-More) + +* Mon Mar 26 2012 Jeroen van Meeuwen - 9.20120322 +- New version + +* Wed Sep 29 2010 Jeroen van Meeuwen - 7.4.20-4 +- Fix locale + +* Fri Aug 13 2010 Jeroen van Meeuwen - 7.4.20-3 +- Fix description + +* Thu May 13 2010 Jeroen van Meeuwen - 7.4.20-2 +- Include es/fr man pages +- Update to newer version from Debian Sid +- Fix package requirements + +* Tue May 11 2010 Jeroen van Meeuwen - 7.0.15-1 +- First package diff --git a/sources b/sources index e69de29..93510aa 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +42bbf0ef9d1fc38b3548b2ab58556e37 debhelper_9.20120909.tar.gz From b0346e427844df6597e7d73d0f083012cf95a48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 18 Jul 2013 12:39:01 +0200 Subject: [PATCH 02/52] Perl 5.18 rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 1b76c4c..8eaa076 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20120909 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -95,6 +95,9 @@ rm -rf %{buildroot} %{perl_vendorlib}/Debian/Debhelper %changelog +* Thu Jul 18 2013 Petr Pisar - 9.20120909-2 +- Perl 5.18 rebuild + * Fri May 10 2013 Oron Peled - 9.20120909-1 - Update to latest Debian/wheezy version - Fix find_lang for man-pages From 435c2b2c982c744b71057c4ad91dd823ebc3efea Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 01:54:26 -0500 Subject: [PATCH 03/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 8eaa076..bc047db 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20120909 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -95,6 +95,9 @@ rm -rf %{buildroot} %{perl_vendorlib}/Debian/Debhelper %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 9.20120909-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Jul 18 2013 Petr Pisar - 9.20120909-2 - Perl 5.18 rebuild 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 04/52] 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 From cfcdb917f90f7bc7d24917d3fc0f5b0accba2bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Basto?= Date: Wed, 19 Feb 2014 22:24:44 +0000 Subject: [PATCH 05/52] Fix %{perl_vendorlib} directory ownership --- debhelper.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debhelper.spec b/debhelper.spec index ca728af..35eed3c 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20131227 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -82,10 +82,12 @@ make test %{_bindir}/dh* %dir %{_datadir}/%{name} %{_datadir}/%{name}/autoscripts -%dir %{perl_vendorlib}/Debian -%{perl_vendorlib}/Debian/Debhelper +%{perl_vendorlib}/* %changelog +* Wed Feb 19 2014 Sérgio Basto - 9.20131227-2 +- Fix %%{perl_vendorlib} directory ownership + * 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. From b346a51afc16bd50286f4f6334d7899b71b4609a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 02:03:21 -0500 Subject: [PATCH 06/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 35eed3c..92ffaf0 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20131227 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -85,6 +85,9 @@ make test %{perl_vendorlib}/* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 9.20131227-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Feb 19 2014 Sérgio Basto - 9.20131227-2 - Fix %%{perl_vendorlib} directory ownership From dd3852da0aeb0881743055d79437ceaf234cd5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Basto?= Date: Wed, 11 Jun 2014 01:58:23 +0100 Subject: [PATCH 07/52] Update 9.20140228 --- .gitignore | 1 + debhelper.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bf58159..96d4952 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /debhelper_9.20120909.tar.gz /debhelper_9.20131227.tar.gz +/debhelper_9.20140228.tar.gz diff --git a/debhelper.spec b/debhelper.spec index 92ffaf0..3b8fbb9 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,8 +7,8 @@ } Name: debhelper -Version: 9.20131227 -Release: 3%{?dist} +Version: 9.20140228 +Release: 1%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -85,6 +85,9 @@ make test %{perl_vendorlib}/* %changelog +* Wed Jun 11 2014 Sérgio Basto - 9.20140228-1 +- Update 9.20140228 + * Sat Jun 07 2014 Fedora Release Engineering - 9.20131227-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index bfbb463..557cc83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d048826a3a6c831f03a8292398d9d329 debhelper_9.20131227.tar.gz +40946706785d914567f91fa36d78848a debhelper_9.20140228.tar.gz From 4fd834e0bfe4bde79329e3b7f5ba4e76eda32c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Basto?= Date: Mon, 28 Jul 2014 04:49:02 +0100 Subject: [PATCH 08/52] Update to 9.20140613 --- .gitignore | 1 + debhelper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 96d4952..8b41c99 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /debhelper_9.20120909.tar.gz /debhelper_9.20131227.tar.gz /debhelper_9.20140228.tar.gz +/debhelper_9.20140613.tar.gz diff --git a/debhelper.spec b/debhelper.spec index 3b8fbb9..f5fa5f3 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,7 +7,7 @@ } Name: debhelper -Version: 9.20140228 +Version: 9.20140613 Release: 1%{?dist} Summary: Helper programs for Debian rules @@ -85,6 +85,9 @@ make test %{perl_vendorlib}/* %changelog +* Mon Jul 28 2014 Sérgio Basto - 9.20140613-1 +- Update to 9.20140613 + * Wed Jun 11 2014 Sérgio Basto - 9.20140228-1 - Update 9.20140228 diff --git a/sources b/sources index 557cc83..aad1461 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40946706785d914567f91fa36d78848a debhelper_9.20140228.tar.gz +ea399f867dbcaf87d6f6007ffe35234f debhelper_9.20140613.tar.gz From d0dda766d8330bc5aa4a38f98bf58ee376965d43 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 27 Aug 2014 18:20:02 +0200 Subject: [PATCH 09/52] Perl 5.20 rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index f5fa5f3..e94c1ee 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20140613 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -85,6 +85,9 @@ make test %{perl_vendorlib}/* %changelog +* Wed Aug 27 2014 Jitka Plesnikova - 9.20140613-2 +- Perl 5.20 rebuild + * Mon Jul 28 2014 Sérgio Basto - 9.20140613-1 - Update to 9.20140613 From 4a0c7f5f9b63be0dc34661e0b900f995bcc19998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Sep 2014 13:09:29 +0200 Subject: [PATCH 10/52] Rebuild against perl 5.20 --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index e94c1ee..f3f57aa 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20140613 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -85,6 +85,9 @@ make test %{perl_vendorlib}/* %changelog +* Wed Sep 17 2014 Petr Pisar - 9.20140613-3 +- Rebuild against perl 5.20 + * Wed Aug 27 2014 Jitka Plesnikova - 9.20140613-2 - Perl 5.20 rebuild From 7546d0c6d0a34620026ee78ff582f8c4939c279e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 7 Nov 2014 10:28:26 +0100 Subject: [PATCH 11/52] Build-require perl-podlators for pod2man tool --- debhelper.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index f3f57aa..9dd3578 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20140613 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -21,6 +21,7 @@ BuildArch: noarch BuildRequires: po4a BuildRequires: man-db BuildRequires: dpkg-dev +BuildRequires: perl-podlators # For 'make test' BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) @@ -85,6 +86,9 @@ make test %{perl_vendorlib}/* %changelog +* Fri Nov 07 2014 Petr Pisar - 9.20140613-4 +- Build-require perl-podlators for pod2man tool (bug #1161450) + * Wed Sep 17 2014 Petr Pisar - 9.20140613-3 - Rebuild against perl 5.20 From 82c67034f69394e44b6e2c5f14811e2f457233a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Basto?= Date: Fri, 24 Apr 2015 19:10:47 +0100 Subject: [PATCH 12/52] Update to 9.20140613 --- .gitignore | 1 + debhelper.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8b41c99..986b210 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /debhelper_9.20131227.tar.gz /debhelper_9.20140228.tar.gz /debhelper_9.20140613.tar.gz +/debhelper_9.20150101.tar.gz diff --git a/debhelper.spec b/debhelper.spec index 9dd3578..b0fbcbf 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,8 +7,8 @@ } Name: debhelper -Version: 9.20140613 -Release: 4%{?dist} +Version: 9.20150101 +Release: 1%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -80,12 +80,17 @@ make test %doc examples/ doc/ %{_mandir}/man1/* %{_mandir}/man7/* +%{_mandir}/*/man1/dh* +%{_mandir}/*/man7/debhelper* %{_bindir}/dh* %dir %{_datadir}/%{name} %{_datadir}/%{name}/autoscripts %{perl_vendorlib}/* %changelog +* Fri Apr 24 2015 Sérgio Basto - 9.20150101-1 +- Update to 9.20150101 + * Fri Nov 07 2014 Petr Pisar - 9.20140613-4 - Build-require perl-podlators for pod2man tool (bug #1161450) diff --git a/sources b/sources index aad1461..caab6bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea399f867dbcaf87d6f6007ffe35234f debhelper_9.20140613.tar.gz +10e53fc2d752bddc5bb66bfeaba7582e debhelper_9.20150101.tar.gz From 96ef008f03069806d57c0d590fbaadf3297d2079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Basto?= Date: Sat, 25 Apr 2015 17:09:51 +0100 Subject: [PATCH 13/52] Fix, properly, pt man pages. - Added dpkg-architecture comands to debug test failures on arm builders. --- debhelper.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/debhelper.spec b/debhelper.spec index b0fbcbf..17ee18c 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20150101 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -60,7 +60,7 @@ make %{?_smp_mflags} build # single man-page -- we have many rm -f debhelper-mans.lang -for lang in de es fr; do +for lang in de es fr pt; do for level in 1 7; do # Append to .lang file # Replace buildroot with the lang prefix, append '*' (for gzip, etc.) @@ -73,6 +73,8 @@ done %check +dpkg-architecture -qDEB_BUILD_GNU_TYPE +dpkg-architecture -qDEB_HOST_GNU_TYPE make test @@ -80,14 +82,16 @@ make test %doc examples/ doc/ %{_mandir}/man1/* %{_mandir}/man7/* -%{_mandir}/*/man1/dh* -%{_mandir}/*/man7/debhelper* %{_bindir}/dh* %dir %{_datadir}/%{name} %{_datadir}/%{name}/autoscripts %{perl_vendorlib}/* %changelog +* Sat Apr 25 2015 Sérgio Basto - 9.20150101-2 +- Fix, properly, pt man pages. +- Added dpkg-architecture comands to debug test failures on arm builders. + * Fri Apr 24 2015 Sérgio Basto - 9.20150101-1 - Update to 9.20150101 From 4a34f4b4cbe971eede1a3fc244caf0f5aa5308a7 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 5 Jun 2015 13:01:41 +0200 Subject: [PATCH 14/52] Perl 5.22 rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 17ee18c..0d66f70 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20150101 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -88,6 +88,9 @@ make test %{perl_vendorlib}/* %changelog +* Fri Jun 05 2015 Jitka Plesnikova - 9.20150101-3 +- Perl 5.22 rebuild + * Sat Apr 25 2015 Sérgio Basto - 9.20150101-2 - Fix, properly, pt man pages. - Added dpkg-architecture comands to debug test failures on arm builders. From 52de7277e12a2d8e86e262af0568ffc3a9ebfedd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 03:50:19 +0000 Subject: [PATCH 15/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 0d66f70..fc9e2c9 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20150101 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -88,6 +88,9 @@ make test %{perl_vendorlib}/* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 9.20150101-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Jun 05 2015 Jitka Plesnikova - 9.20150101-3 - Perl 5.22 rebuild From c0d5c0cab6bcfd6ec92040e4103e80b7e09b2573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 20 Jun 2015 04:31:25 +0100 Subject: [PATCH 16/52] Update to 9.20150507 --- .gitignore | 1 + debhelper.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 986b210..22e597b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /debhelper_9.20140228.tar.gz /debhelper_9.20140613.tar.gz /debhelper_9.20150101.tar.gz +/debhelper_9.20150507.tar.xz diff --git a/debhelper.spec b/debhelper.spec index fc9e2c9..1ced1e5 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,14 +7,14 @@ } Name: debhelper -Version: 9.20150101 -Release: 4%{?dist} +Version: 9.20150507 +Release: 1%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools License: GPLv2+ URL: http://kitenet.net/~joey/code/debhelper/ -Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.gz +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 BuildArch: noarch @@ -73,6 +73,7 @@ done %check +#debug dpkg-architecture -qDEB_BUILD_GNU_TYPE dpkg-architecture -qDEB_HOST_GNU_TYPE make test @@ -88,6 +89,9 @@ make test %{perl_vendorlib}/* %changelog +* Sat Jun 20 2015 Sérgio Basto - 9.20150507-1 +- Update to 9.20150507 + * Wed Jun 17 2015 Fedora Release Engineering - 9.20150101-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index caab6bc..2a70440 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10e53fc2d752bddc5bb66bfeaba7582e debhelper_9.20150101.tar.gz +dc9582314727cc75278c5fa0f751cb25 debhelper_9.20150507.tar.xz From 86d5dd1eb782ecd0c1034ad4b27152bac368fd8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 13 Jul 2015 23:04:48 +0100 Subject: [PATCH 17/52] Debhelper requires dpkg-dev (#1242630) and dpkg-dev requires dpkg-perl --- debhelper.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debhelper.spec b/debhelper.spec index 1ced1e5..531f1d2 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20150507 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -28,7 +28,7 @@ BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) Requires: binutils -Requires: dpkg-perl +Requires: dpkg-dev Requires: html2text Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: po-debconf @@ -89,6 +89,9 @@ make test %{perl_vendorlib}/* %changelog +* Mon Jul 13 2015 Sérgio Basto - 9.20150507-2 +- Debhelper requires dpkg-dev (#1242630) and dpkg-dev requires dpkg-perl + * Sat Jun 20 2015 Sérgio Basto - 9.20150507-1 - Update to 9.20150507 From 9b9deaa4f9c7b8fa1703d5a03f4a8da71c2fef7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 13 Jul 2015 23:42:35 +0100 Subject: [PATCH 18/52] Update to 9.20150628 --- debhelper.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debhelper.spec b/debhelper.spec index 531f1d2..02898e7 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,8 +7,8 @@ } Name: debhelper -Version: 9.20150507 -Release: 2%{?dist} +Version: 9.20150628 +Release: 1%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -89,6 +89,9 @@ make test %{perl_vendorlib}/* %changelog +* Mon Jul 13 2015 Sérgio Basto - 9.20150628-1 +- Update to 9.20150628 + * Mon Jul 13 2015 Sérgio Basto - 9.20150507-2 - Debhelper requires dpkg-dev (#1242630) and dpkg-dev requires dpkg-perl From f19f3ee48552e7e16747e50eb6db10448a49daac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 13 Jul 2015 23:48:24 +0100 Subject: [PATCH 19/52] Uploaded new sources debhelper_9.20150628.tar.xz --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 22e597b..e9e2323 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /debhelper_9.20140613.tar.gz /debhelper_9.20150101.tar.gz /debhelper_9.20150507.tar.xz +/debhelper_9.20150628.tar.xz diff --git a/sources b/sources index 2a70440..c20662f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc9582314727cc75278c5fa0f751cb25 debhelper_9.20150507.tar.xz +2f4153c555a9cd624fb2e4b7adab216b debhelper_9.20150628.tar.xz From d820dda63d4c9b0c53b089d197e4089bda5032bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 22 Oct 2015 10:53:29 +0200 Subject: [PATCH 20/52] Specify all dependencies --- debhelper.spec | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/debhelper.spec b/debhelper.spec index 02898e7..3a19259 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20150628 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -18,19 +18,45 @@ Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{ve Patch0: debhelper-7.4.20-no-utf8-to-pod2man.patch BuildArch: noarch -BuildRequires: po4a -BuildRequires: man-db +BuildRequires: bash +BuildRequires: coreutils BuildRequires: dpkg-dev +BuildRequires: findutils +BuildRequires: grep +BuildRequires: make +BuildRequires: perl BuildRequires: perl-podlators -# For 'make test' +BuildRequires: perl(Config) +BuildRequires: perl(File::Find) +BuildRequires: perl(strict) +BuildRequires: po4a +BuildRequires: sed +# Run-time: +BuildRequires: perl(base) +BuildRequires: perl(constant) +BuildRequires: perl(Cwd) +# Dpkg::BuildProfiles not used at tests +BuildRequires: perl(Exporter) +BuildRequires: perl(File::Spec) +BuildRequires: perl(File::stat) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(vars) +BuildRequires: perl(warnings) +# Tests: +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Temp) +BuildRequires: perl(IPC::Open2) +BuildRequires: perl(Test) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) +# Optional tests: BuildRequires: perl(Test::Pod) Requires: binutils Requires: dpkg-dev Requires: html2text Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(Dpkg::BuildProfiles) Requires: po-debconf %description @@ -89,6 +115,9 @@ make test %{perl_vendorlib}/* %changelog +* Thu Oct 22 2015 Petr Pisar - 9.20150628-2 +- Specify all dependencies (bug #1272893) + * Mon Jul 13 2015 Sérgio Basto - 9.20150628-1 - Update to 9.20150628 From 2d37ad233e78eafd226261c21dec750c0d99dbd3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 18:33:11 +0000 Subject: [PATCH 21/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 3a19259..60993e0 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20150628 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -115,6 +115,9 @@ make test %{perl_vendorlib}/* %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 9.20150628-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Oct 22 2015 Petr Pisar - 9.20150628-2 - Specify all dependencies (bug #1272893) From e0cae7bf7ad695b7ab596759df00e30f9b531127 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 17 May 2016 03:29:45 +0200 Subject: [PATCH 22/52] Perl 5.24 rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 60993e0..f203f8a 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 9.20150628 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -115,6 +115,9 @@ make test %{perl_vendorlib}/* %changelog +* Tue May 17 2016 Jitka Plesnikova - 9.20150628-4 +- Perl 5.24 rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 9.20150628-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 6cbb879a57a8b7e5928b1d93e1c0de81aa8bebf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:11:50 +0200 Subject: [PATCH 23/52] Mandatory Perl build-requires added --- debhelper.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/debhelper.spec b/debhelper.spec index f203f8a..d4b1a6e 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -25,6 +25,7 @@ BuildRequires: findutils BuildRequires: grep BuildRequires: make BuildRequires: perl +BuildRequires: perl-generators BuildRequires: perl-podlators BuildRequires: perl(Config) BuildRequires: perl(File::Find) 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 24/52] 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 From ff5035798c5a9f14653347a9682f363c87ba73d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 08:15:02 +0000 Subject: [PATCH 25/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 6829add..1fbf6e2 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 10.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -122,6 +122,9 @@ make test %{perl_vendorlib}/* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 10.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * 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 From b0d06e37c57ecded773c75c3ed6ddf699f85a37b Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 4 Jun 2017 18:05:04 +0200 Subject: [PATCH 26/52] Perl 5.26 rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 1fbf6e2..30cb3d5 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 10.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -122,6 +122,9 @@ make test %{perl_vendorlib}/* %changelog +* Sun Jun 04 2017 Jitka Plesnikova - 10.2.5-3 +- Perl 5.26 rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 10.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 4df1259592a7ac699825a58f72cb62d03cd24bd8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 7 Jul 2017 12:15:14 +0200 Subject: [PATCH 27/52] Rebuild due to bug in RPM (RHBZ #1468476) Signed-off-by: Igor Gnatenko --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 30cb3d5..64de80b 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 10.2.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -122,6 +122,9 @@ make test %{perl_vendorlib}/* %changelog +* Fri Jul 07 2017 Igor Gnatenko - 10.2.5-4 +- Rebuild due to bug in RPM (RHBZ #1468476) + * Sun Jun 04 2017 Jitka Plesnikova - 10.2.5-3 - Perl 5.26 rebuild From b494c0b31460a6009192da0421cbfa935591bcb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 12 Jul 2017 15:15:58 +0200 Subject: [PATCH 28/52] perl dependency renamed to perl-interpreter --- debhelper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 64de80b..9917289 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -28,7 +28,7 @@ BuildRequires: dpkg-dev >= 1.18.0 BuildRequires: findutils BuildRequires: grep BuildRequires: make -BuildRequires: perl +BuildRequires: perl-interpreter BuildRequires: perl-generators BuildRequires: perl-podlators BuildRequires: perl(Config) From 55691b6a533bedb5d47cfb171790cca57283dd14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 06:03:27 +0000 Subject: [PATCH 29/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 9917289..b286c1c 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 10.2.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -122,6 +122,9 @@ make test %{perl_vendorlib}/* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 10.2.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jul 07 2017 Igor Gnatenko - 10.2.5-4 - Rebuild due to bug in RPM (RHBZ #1468476) From 05fba0740d9946218fded0fccd0755cf26d723e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 31 Jul 2017 02:30:25 +0100 Subject: [PATCH 30/52] Update to 10.7 (#1448667) Drop patch0 pod2man, now, already have --utf8 Drop patch2 , upstream wrote to me that is fixed. --- .gitignore | 1 + debhelper.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b391034..ae37fc8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /debhelper_9.20150507.tar.xz /debhelper_9.20150628.tar.xz /debhelper_10.2.5.tar.xz +/debhelper_10.7.tar.xz diff --git a/debhelper.spec b/debhelper.spec index b286c1c..1cf696b 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,15 +7,14 @@ } Name: debhelper -Version: 10.2.5 -Release: 5%{?dist} +Version: 10.7 +Release: 1%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools 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 @@ -74,9 +73,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 +#patch2 -p1 -b .dh_installman %build make %{?_smp_mflags} build @@ -122,6 +120,11 @@ make test %{perl_vendorlib}/* %changelog +* Mon Jul 31 2017 Fedora Release Monitoring - 10.7-1 +- Update to 10.7 (#1448667) +- Drop patch0 pod2man, now, already have --utf8 +- Drop patch2 , upstream wrote to me that is fixed. + * Wed Jul 26 2017 Fedora Release Engineering - 10.2.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 34d9b31..a094537 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (debhelper_10.2.5.tar.xz) = 67a6a548bd9482c8f25d429bd4bdbe7581326926c4b4d280b34c78a487fc8c0b6c26ed05aac3d2855b748a6542ecc167e37ea333e50e9bb1e3ee27a7d91c84d3 +SHA512 (debhelper_10.7.tar.xz) = 131f91c629eb72075d035e2becb5586e7aaa7a9447a0c817d3b4e5015e04659d3174012c000dc72e28fb940e5caec2e319bdabd52eaf5f7558458cd84ef9fd9a From 94982d413d6915b4131d093de4f1e19be4abce32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 1 Aug 2017 12:24:08 +0100 Subject: [PATCH 31/52] Update to 10.7.1 (#1448667) --- .gitignore | 1 + debhelper-10.2.5-revert-partial-580bc09d41.patch | 15 --------------- debhelper.spec | 11 +++++++---- sources | 2 +- 4 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 debhelper-10.2.5-revert-partial-580bc09d41.patch diff --git a/.gitignore b/.gitignore index ae37fc8..9850381 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /debhelper_9.20150628.tar.xz /debhelper_10.2.5.tar.xz /debhelper_10.7.tar.xz +/debhelper_10.7.1.tar.xz diff --git a/debhelper-10.2.5-revert-partial-580bc09d41.patch b/debhelper-10.2.5-revert-partial-580bc09d41.patch deleted file mode 100644 index 9c3baa2..0000000 --- a/debhelper-10.2.5-revert-partial-580bc09d41.patch +++ /dev/null @@ -1,15 +0,0 @@ -# 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 1cf696b..f4ca9b7 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,7 +7,7 @@ } Name: debhelper -Version: 10.7 +Version: 10.7.1 Release: 1%{?dist} Summary: Helper programs for Debian rules @@ -16,7 +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.xz Patch1: debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch -Patch2: debhelper-10.2.5-revert-partial-580bc09d41.patch BuildArch: noarch BuildRequires: bash @@ -74,7 +73,6 @@ packages use debhelper as part of their build process. %prep %setup -q -n %{name} %patch1 -p1 -b .no-transitional-package -#patch2 -p1 -b .dh_installman %build make %{?_smp_mflags} build @@ -120,10 +118,15 @@ make test %{perl_vendorlib}/* %changelog +* Tue Aug 01 2017 Fedora Release Monitoring - 10.7.1-1 +- Update to 10.7.1 (#1448667) + * Mon Jul 31 2017 Fedora Release Monitoring - 10.7-1 - Update to 10.7 (#1448667) - Drop patch0 pod2man, now, already have --utf8 -- Drop patch2 , upstream wrote to me that is fixed. +- Drop patch2 , upstream wrote to me that is fixed + https://github.com/Debian/debhelper/commit/580bc09d41ddc8542515f50d40ff8c8477711d3d#commitcomment-22972851 + (I have fixed it now for unrelated reasons) * Wed Jul 26 2017 Fedora Release Engineering - 10.2.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index a094537..2d14860 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (debhelper_10.7.tar.xz) = 131f91c629eb72075d035e2becb5586e7aaa7a9447a0c817d3b4e5015e04659d3174012c000dc72e28fb940e5caec2e319bdabd52eaf5f7558458cd84ef9fd9a +SHA512 (debhelper_10.7.1.tar.xz) = b201b57990e8eed2f08799a3e61229d40d912b5f79028d629cb3b2f0ba891d792cf6e7f168720ef15596d71dbd19a6c98707055095e4e71f5e2a503409a865a0 From ab2535bb3ede45a402c505afe7d22927df22eb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 4 Aug 2017 14:14:17 +0100 Subject: [PATCH 32/52] Update to 10.7.2 (#1477385) --- .gitignore | 1 + debhelper.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9850381..06a7bb4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /debhelper_10.2.5.tar.xz /debhelper_10.7.tar.xz /debhelper_10.7.1.tar.xz +/debhelper_10.7.2.tar.xz diff --git a/debhelper.spec b/debhelper.spec index f4ca9b7..f344338 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,7 +7,7 @@ } Name: debhelper -Version: 10.7.1 +Version: 10.7.2 Release: 1%{?dist} Summary: Helper programs for Debian rules @@ -105,6 +105,7 @@ done #debug dpkg-architecture -qDEB_BUILD_GNU_TYPE dpkg-architecture -qDEB_HOST_GNU_TYPE +cc -dumpmachine make test @@ -118,6 +119,9 @@ make test %{perl_vendorlib}/* %changelog +* Wed Aug 02 2017 Fedora Release Monitoring - 10.7.2-1 +- Update to 10.7.2 (#1477385) + * Tue Aug 01 2017 Fedora Release Monitoring - 10.7.1-1 - Update to 10.7.1 (#1448667) diff --git a/sources b/sources index 2d14860..453c433 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (debhelper_10.7.1.tar.xz) = b201b57990e8eed2f08799a3e61229d40d912b5f79028d629cb3b2f0ba891d792cf6e7f168720ef15596d71dbd19a6c98707055095e4e71f5e2a503409a865a0 +SHA512 (debhelper_10.7.2.tar.xz) = 9e45c91a8909f10dde814486585aea57407be39127371d891d3f6cab5579331741f2ccea7627b270debf2a77d982f089e9345788683382048d3aa4544fa5a21a From 9075d817601ceb6b23ea19d22f1e159c23345e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 6 Aug 2017 03:45:54 +0100 Subject: [PATCH 33/52] debhelper-7.4.20-no-utf8-to-pod2man.patch not used anymore --- debhelper-7.4.20-no-utf8-to-pod2man.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 debhelper-7.4.20-no-utf8-to-pod2man.patch diff --git a/debhelper-7.4.20-no-utf8-to-pod2man.patch b/debhelper-7.4.20-no-utf8-to-pod2man.patch deleted file mode 100644 index c51bc9b..0000000 --- a/debhelper-7.4.20-no-utf8-to-pod2man.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - - 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 From 21ccfa1af16a69cdd5ba2f366dcb4445f302a50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 11 Sep 2017 02:30:55 +0100 Subject: [PATCH 34/52] Update to 10.8 (#1490078) --- .gitignore | 1 + debhelper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 06a7bb4..ee8174d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /debhelper_10.7.tar.xz /debhelper_10.7.1.tar.xz /debhelper_10.7.2.tar.xz +/debhelper_10.8.tar.xz diff --git a/debhelper.spec b/debhelper.spec index f344338..8a3ddfc 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,7 +7,7 @@ } Name: debhelper -Version: 10.7.2 +Version: 10.8 Release: 1%{?dist} Summary: Helper programs for Debian rules @@ -119,6 +119,9 @@ make test %{perl_vendorlib}/* %changelog +* Sun Sep 10 2017 Fedora Release Monitoring - 10.8-1 +- Update to 10.8 (#1490078) + * Wed Aug 02 2017 Fedora Release Monitoring - 10.7.2-1 - Update to 10.7.2 (#1477385) diff --git a/sources b/sources index 453c433..331a65e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (debhelper_10.7.2.tar.xz) = 9e45c91a8909f10dde814486585aea57407be39127371d891d3f6cab5579331741f2ccea7627b270debf2a77d982f089e9345788683382048d3aa4544fa5a21a +SHA512 (debhelper_10.8.tar.xz) = c867eaedcd6a31befd8bfe6b91d7aee68f0f210baacde4e709c66b86ffa8479e4f635270f9cdfff19cc9aea3c41c645679a47af4eed15308c2808df9b818ea86 From 3c6a7caa4764fcc81dd5340b5aee71dcac23bf75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 20 Sep 2017 03:52:00 +0100 Subject: [PATCH 35/52] Update to 10.9 (#1493320) --- .gitignore | 1 + ....5-ignore-dh-systemd-transitional-package.patch | 7 +++---- debhelper.spec | 14 +++++++++----- sources | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ee8174d..67440ca 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /debhelper_10.7.1.tar.xz /debhelper_10.7.2.tar.xz /debhelper_10.8.tar.xz +/debhelper_10.9.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 index c59cba7..3ab1827 100644 --- a/debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch +++ b/debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch @@ -1,12 +1,11 @@ ---- 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/ +--- ./debian/control.orig 2017-09-20 03:48:49.007278637 +0100 ++++ ./debian/control 2017-09-20 03:50:21.376241177 +0100 +@@ -38,11 +38,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), diff --git a/debhelper.spec b/debhelper.spec index 8a3ddfc..c74bf91 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,7 +7,7 @@ } Name: debhelper -Version: 10.8 +Version: 10.9 Release: 1%{?dist} Summary: Helper programs for Debian rules @@ -71,6 +71,11 @@ the Debian menu system, debconf, doc-base, etc. Most Debian packages use debhelper as part of their build process. %prep +#debug +dpkg-architecture -qDEB_BUILD_GNU_TYPE +dpkg-architecture -qDEB_HOST_GNU_TYPE +cc -dumpmachine + %setup -q -n %{name} %patch1 -p1 -b .no-transitional-package @@ -102,10 +107,6 @@ done %check -#debug -dpkg-architecture -qDEB_BUILD_GNU_TYPE -dpkg-architecture -qDEB_HOST_GNU_TYPE -cc -dumpmachine make test @@ -119,6 +120,9 @@ make test %{perl_vendorlib}/* %changelog +* Wed Sep 20 2017 Fedora Release Monitoring - 10.9-1 +- Update to 10.9 (#1493320) + * Sun Sep 10 2017 Fedora Release Monitoring - 10.8-1 - Update to 10.8 (#1490078) diff --git a/sources b/sources index 331a65e..ac7112a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (debhelper_10.8.tar.xz) = c867eaedcd6a31befd8bfe6b91d7aee68f0f210baacde4e709c66b86ffa8479e4f635270f9cdfff19cc9aea3c41c645679a47af4eed15308c2808df9b818ea86 +SHA512 (debhelper_10.9.tar.xz) = 0efec68a6a01530e57f220593e66ff9f527aa57deb1df025728a52754e32ea6a4f5d57e9c8fb4fb2eb0c584cd9951dd69a92aeaf0c274806c17473ef9926ac61 From 8a3bac57813b33b0b1c39bf17b45d11adfd90a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 1 Oct 2017 18:12:46 +0100 Subject: [PATCH 36/52] Print also dpkg --print-architecture to debug FTBFS in armv7 and ppc64le --- debhelper.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index c74bf91..bf9632b 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 10.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -74,6 +74,7 @@ packages use debhelper as part of their build process. #debug dpkg-architecture -qDEB_BUILD_GNU_TYPE dpkg-architecture -qDEB_HOST_GNU_TYPE +dpkg --print-architecture cc -dumpmachine %setup -q -n %{name} @@ -120,6 +121,9 @@ make test %{perl_vendorlib}/* %changelog +* Sun Oct 01 2017 Sérgio Basto - 10.9-2 +- Print also dpkg --print-architecture to debug FTBFS in armv7 and ppc64le + * Wed Sep 20 2017 Fedora Release Monitoring - 10.9-1 - Update to 10.9 (#1493320) From 0cbc91001ea7bf1c498612a351827e5e3978aebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 7 Jan 2018 23:50:43 +0000 Subject: [PATCH 37/52] Update to 11.1 Add no_layout_deb.patch --- .gitignore | 1 + debhelper.spec | 12 +++++++++--- no_layout_deb.patch | 12 ++++++++++++ sources | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 no_layout_deb.patch diff --git a/.gitignore b/.gitignore index 67440ca..e81d73a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /debhelper_10.7.2.tar.xz /debhelper_10.8.tar.xz /debhelper_10.9.tar.xz +/debhelper_11.1.tar.xz diff --git a/debhelper.spec b/debhelper.spec index bf9632b..918e924 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,8 +7,8 @@ } Name: debhelper -Version: 10.9 -Release: 2%{?dist} +Version: 11.1 +Release: 1%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -16,6 +16,7 @@ License: GPLv2+ URL: http://kitenet.net/~joey/code/debhelper/ Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.xz Patch1: debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch +Patch2: no_layout_deb.patch BuildArch: noarch BuildRequires: bash @@ -79,9 +80,10 @@ cc -dumpmachine %setup -q -n %{name} %patch1 -p1 -b .no-transitional-package +%patch2 -p1 -b .no-debian-layout %build -make %{?_smp_mflags} build +%make_build build %install %make_install @@ -121,6 +123,10 @@ make test %{perl_vendorlib}/* %changelog +* Sun Jan 07 2018 Sérgio Basto - 11.1-1 +- Update to 11.1 +- Add no_layout_deb.patch + * Sun Oct 01 2017 Sérgio Basto - 10.9-2 - Print also dpkg --print-architecture to debug FTBFS in armv7 and ppc64le diff --git a/no_layout_deb.patch b/no_layout_deb.patch new file mode 100644 index 0000000..956984a --- /dev/null +++ b/no_layout_deb.patch @@ -0,0 +1,12 @@ +Fedora setuptools don't have option --install-layout=deb +--- ./lib/Debian/Debhelper/Buildsystem/python_distutils.pm.orig 2017-12-02 08:46:03.000000000 +0000 ++++ ./lib/Debian/Debhelper/Buildsystem/python_distutils.pm 2018-01-07 23:43:53.492047778 +0000 +@@ -166,7 +166,7 @@ sub setup_py { + and $python_default =~ /^python2\.[2345]$/) + or $python =~ /^python2\.[2345](?:-dbg)?$/ )) { + $this->doit_in_sourcedir($python, "setup.py", +- $act, @_, "--install-layout=deb"); ++ $act, @_); + } + else { + $this->doit_in_sourcedir($python, "setup.py", diff --git a/sources b/sources index ac7112a..fcac0d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (debhelper_10.9.tar.xz) = 0efec68a6a01530e57f220593e66ff9f527aa57deb1df025728a52754e32ea6a4f5d57e9c8fb4fb2eb0c584cd9951dd69a92aeaf0c274806c17473ef9926ac61 +SHA512 (debhelper_11.1.tar.xz) = e837046615b8fec235ad769df8e89451423057f53b704e7220c3f55fbe9ee071782e6d0e072d3b9ff8175ebede0aad702c66f4b8cc8143be309f090b377f4594 From 5f780be2220eaefb79b941f511d6f44b10eb0c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 8 Jan 2018 00:29:33 +0000 Subject: [PATCH 38/52] Update to 11.1.1 --- .gitignore | 1 + debhelper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e81d73a..96e7221 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /debhelper_10.8.tar.xz /debhelper_10.9.tar.xz /debhelper_11.1.tar.xz +/debhelper_11.1.1.tar.xz diff --git a/debhelper.spec b/debhelper.spec index 918e924..33f8b49 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,7 +7,7 @@ } Name: debhelper -Version: 11.1 +Version: 11.1.1 Release: 1%{?dist} Summary: Helper programs for Debian rules @@ -123,6 +123,9 @@ make test %{perl_vendorlib}/* %changelog +* Mon Jan 08 2018 Sérgio Basto - 11.1.1-1 +- Update to 11.1.1 + * Sun Jan 07 2018 Sérgio Basto - 11.1-1 - Update to 11.1 - Add no_layout_deb.patch diff --git a/sources b/sources index fcac0d5..61cb018 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (debhelper_11.1.tar.xz) = e837046615b8fec235ad769df8e89451423057f53b704e7220c3f55fbe9ee071782e6d0e072d3b9ff8175ebede0aad702c66f4b8cc8143be309f090b377f4594 +SHA512 (debhelper_11.1.1.tar.xz) = 8aab4f1f2f0bd2689d3ea258528016736bad745de61fa7f54e945d8ca6f42b6f8f60e6f4815176f27327c9d295d8039a89fa5e09a688f89515eae7355e87311a From 3fb2da2fc885490b6fc2ee3912086c4d0d773811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 9 Jan 2018 02:44:15 +0000 Subject: [PATCH 39/52] Update to 11.1.2 (#1532223) --- .gitignore | 1 + debhelper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 96e7221..48e8e8b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /debhelper_10.9.tar.xz /debhelper_11.1.tar.xz /debhelper_11.1.1.tar.xz +/debhelper_11.1.2.tar.xz diff --git a/debhelper.spec b/debhelper.spec index 33f8b49..acbf05d 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,7 +7,7 @@ } Name: debhelper -Version: 11.1.1 +Version: 11.1.2 Release: 1%{?dist} Summary: Helper programs for Debian rules @@ -123,6 +123,9 @@ make test %{perl_vendorlib}/* %changelog +* Tue Jan 09 2018 Sérgio Basto - 11.1.2-1 +- Update to 11.1.2 (#1532223) + * Mon Jan 08 2018 Sérgio Basto - 11.1.1-1 - Update to 11.1.1 diff --git a/sources b/sources index 61cb018..60019c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (debhelper_11.1.1.tar.xz) = 8aab4f1f2f0bd2689d3ea258528016736bad745de61fa7f54e945d8ca6f42b6f8f60e6f4815176f27327c9d295d8039a89fa5e09a688f89515eae7355e87311a +SHA512 (debhelper_11.1.2.tar.xz) = 26cd04eef4cb634b1424b7d08bcc61fdae9b18a96753680658ed412e51c9124b33295e79f3aabbb40579a9d4bb059b526428b97c151d9f34ae93b615b64291bb From e331a34dd38f209442576a7d1b3371a87b9abfaa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 06:30:42 +0000 Subject: [PATCH 40/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index acbf05d..3081a3d 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 11.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -123,6 +123,9 @@ make test %{perl_vendorlib}/* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 11.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 09 2018 Sérgio Basto - 11.1.2-1 - Update to 11.1.2 (#1532223) From 744875724d51805798935856186ecc031fffad82 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 29 Jun 2018 22:01:15 +0200 Subject: [PATCH 41/52] Perl 5.28 rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 3081a3d..12373f0 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 11.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -123,6 +123,9 @@ make test %{perl_vendorlib}/* %changelog +* Fri Jun 29 2018 Jitka Plesnikova - 11.1.2-3 +- Perl 5.28 rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 11.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 3e782c8cf1057978de666c293b5a916f5620aae8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:40:44 +0000 Subject: [PATCH 42/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 12373f0..53f68a4 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 11.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -123,6 +123,9 @@ make test %{perl_vendorlib}/* %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 11.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 29 2018 Jitka Plesnikova - 11.1.2-3 - Perl 5.28 rebuild From 7f8822437c5a59b5b2ea98c75fbeef42a031e278 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 24 Jul 2018 16:11:13 +0200 Subject: [PATCH 43/52] Add missing BuildRequires on gcc /var/tmp/rpm-tmp.RVG0iy: line 34: cc: command not found References: https://bugzilla.redhat.com/show_bug.cgi?id=1603759 Signed-off-by: Igor Gnatenko --- debhelper.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/debhelper.spec b/debhelper.spec index 53f68a4..2a30af6 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -19,6 +19,7 @@ Patch1: debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch Patch2: no_layout_deb.patch BuildArch: noarch +BuildRequires: gcc BuildRequires: bash BuildRequires: coreutils BuildRequires: man-db From d3a57aada95415d8c17c156672235387e19a7a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 21 Sep 2018 15:33:38 +0100 Subject: [PATCH 44/52] Update to 11.4 (#1536769) --- .gitignore | 1 + debhelper.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 48e8e8b..9b5f149 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /debhelper_11.1.tar.xz /debhelper_11.1.1.tar.xz /debhelper_11.1.2.tar.xz +/debhelper_11.4.tar.xz diff --git a/debhelper.spec b/debhelper.spec index 2a30af6..7df95a2 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,8 +7,8 @@ } Name: debhelper -Version: 11.1.2 -Release: 4%{?dist} +Version: 11.4 +Release: 1%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -124,6 +124,9 @@ make test %{perl_vendorlib}/* %changelog +* Fri Sep 21 2018 Sérgio Basto - 11.4-1 +- Update to 11.4 (#1536769) + * Thu Jul 12 2018 Fedora Release Engineering - 11.1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 60019c4..21b8a1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (debhelper_11.1.2.tar.xz) = 26cd04eef4cb634b1424b7d08bcc61fdae9b18a96753680658ed412e51c9124b33295e79f3aabbb40579a9d4bb059b526428b97c151d9f34ae93b615b64291bb +SHA512 (debhelper_11.4.tar.xz) = 6a6c6ea7cb394381288db8f872ae40de9456a22bf535ae0bc15097b47c41cda799952ffdbbcf6f56d0c3aaa9520a4f3f531106b1a53b329e53a13f8eb70ab1c9 From f64b7a35c660221977b841516b9b9d6729ef10d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 22 Sep 2018 22:29:26 +0100 Subject: [PATCH 45/52] Update to 11.4 (#1536769) --- debhelper-skip_archtest.patch | 25 +++++++++++++++++++++++++ debhelper.spec | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 debhelper-skip_archtest.patch diff --git a/debhelper-skip_archtest.patch b/debhelper-skip_archtest.patch new file mode 100644 index 0000000..5f2c198 --- /dev/null +++ b/debhelper-skip_archtest.patch @@ -0,0 +1,25 @@ +https://lists.debian.org/debian-dpkg/2017/07/msg00040.html + +The problem is that your compiler gives a different triplet than the +one used by dpkg itself. + +--- ./t/buildsystems/04-dh_auto_do_autoconf.t.orig 2018-09-21 19:49:13.357781723 +0100 ++++ ./t/buildsystems/04-dh_auto_do_autoconf.t 2018-09-21 20:03:14.744324612 +0100 +@@ -2,7 +2,7 @@ + + use strict; + use warnings; +-use Test::More tests => 31; ++use Test::More tests => 29; + + use File::Temp qw(tempdir); + use File::Basename qw(dirname); +@@ -52,7 +52,7 @@ sub dh_auto_do_autoconf { + @lines = @{readlines(\*FILE)}; + close(FILE); + } +- is_deeply( \@lines, \@extra_args, "$buildpath/stamp_configure contains extra args" ); ++ # is_deeply( \@lines, \@extra_args, "$buildpath/stamp_configure contains extra args" ); + + &$do_dh_auto('build'); + ok ( -f "$buildpath/stamp_build", "$buildpath/stamp_build exists" ); diff --git a/debhelper.spec b/debhelper.spec index 7df95a2..e202398 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -17,6 +17,7 @@ URL: http://kitenet.net/~joey/code/debhelper/ Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.xz Patch1: debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch Patch2: no_layout_deb.patch +Patch3: debhelper-skip_archtest.patch BuildArch: noarch BuildRequires: gcc @@ -82,6 +83,7 @@ cc -dumpmachine %setup -q -n %{name} %patch1 -p1 -b .no-transitional-package %patch2 -p1 -b .no-debian-layout +%patch3 -p1 -b .skip-arm-fail-test %build %make_build build From 662fbe7a10e3b0dd5fe27cf12b09508935a5cfa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 22 Sep 2018 22:36:25 +0100 Subject: [PATCH 46/52] Skip failing test on arm, workaround (#1134914) --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index e202398..402a177 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 11.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Helper programs for Debian rules Group: Development/Tools @@ -126,6 +126,9 @@ make test %{perl_vendorlib}/* %changelog +* Sat Sep 22 2018 Sérgio Basto - 11.4-2 +- Skip failing test on arm, workaround (#1134914) + * Fri Sep 21 2018 Sérgio Basto - 11.4-1 - Update to 11.4 (#1536769) From 671add0f54ab3155a0abe93020dd67c32472e57f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:41 +0100 Subject: [PATCH 47/52] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- debhelper.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 402a177..69474d7 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -11,7 +11,6 @@ Version: 11.4 Release: 2%{?dist} Summary: Helper programs for Debian rules -Group: Development/Tools License: GPLv2+ URL: http://kitenet.net/~joey/code/debhelper/ Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.xz From 21c10dd126cfdb6c8c138e6e0a2c3cc0ccfcb7b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 16:55:59 +0000 Subject: [PATCH 48/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 69474d7..fd42c6c 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 11.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Helper programs for Debian rules License: GPLv2+ @@ -125,6 +125,9 @@ make test %{perl_vendorlib}/* %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 11.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Sep 22 2018 Sérgio Basto - 11.4-2 - Skip failing test on arm, workaround (#1134914) From 1fdacaeda5eab3ddf2aa8ad1ca9a9206c87ee366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 1 Feb 2019 14:46:12 +0000 Subject: [PATCH 49/52] Some improves from upstream You may also need to override override_dh_strip_nondeterminism by adding the following lines to debian/rules: override_dh_strip_nondeterminism: Until we have dh_strip_nondeterminism in Fedora. --- debhelper.spec | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/debhelper.spec b/debhelper.spec index fd42c6c..88d2c84 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -9,7 +9,7 @@ Name: debhelper Version: 11.4 Release: 3%{?dist} -Summary: Helper programs for Debian rules +Summary: Helper programs for debian/rules License: GPLv2+ URL: http://kitenet.net/~joey/code/debhelper/ @@ -58,19 +58,36 @@ BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) Requires: binutils -Requires: dpkg-dev >= 1.18.0 +Requires: dh-autoreconf >= 17 +Requires: dpkg >= 1.18.0 +Requires: dpkg-dev >= 1.18.2 +Requires: dpkg-perl >= 1.17.14 Requires: html2text Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Dpkg::BuildProfiles) Requires: po-debconf +#Suggests: dh-make +#Provides: dh-sequence-dwz, +# dh-sequence-installinitramfs, +# dh-sequence-systemd, +#Provides: dh-systemd +#Depends: autotools-dev, +# dh-strip-nondeterminism (>= 0.028~), +# dwz, +# file (>= 3.23), +# man-db, +# ${misc:Depends}, +# ${perl:Depends} +# cmake (<< 3.9~), +# meson (<< 0.40.0~), %description -A collection of programs that can be used in a Debian rules file -to automate common tasks related to building Debian packages. -Programs are included to install various files into your package, -compress files, fix file permissions, integrate your package with -the Debian menu system, debconf, doc-base, etc. Most Debian -packages use debhelper as part of their build process. +A collection of programs that can be used in a debian/rules file to +automate common tasks related to building Debian packages. Programs +are included to install various files into your package, compress +files, fix file permissions, integrate your package with the Debian +menu system, debconf, doc-base, etc. Most Debian packages use debhelper +as part of their build process. %prep #debug From d3ba0ba4e10b888f88fc559778d0f872958756b3 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 2 Jun 2019 07:56:50 +0200 Subject: [PATCH 50/52] Perl 5.30 rebuild --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index 88d2c84..bc5fbf6 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 11.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Helper programs for debian/rules License: GPLv2+ @@ -142,6 +142,9 @@ make test %{perl_vendorlib}/* %changelog +* Sun Jun 02 2019 Jitka Plesnikova - 11.4-4 +- Perl 5.30 rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 11.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From e5ba58f58e18f9c5f50eee7161dc712bf22afa52 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 21:41:01 +0000 Subject: [PATCH 51/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- debhelper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debhelper.spec b/debhelper.spec index bc5fbf6..85c32de 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -8,7 +8,7 @@ Name: debhelper Version: 11.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Helper programs for debian/rules License: GPLv2+ @@ -142,6 +142,9 @@ make test %{perl_vendorlib}/* %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 11.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Jun 02 2019 Jitka Plesnikova - 11.4-4 - Perl 5.30 rebuild From 0f0cf9d2a7c515827f28ca4670161a7d61969fd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 8 Oct 2019 06:23:55 +0100 Subject: [PATCH 52/52] Update to 12.6.1 --- .gitignore | 1 + ....2.5-ignore-dh-systemd-transitional-package.patch | 10 +++++----- debhelper.spec | 12 ++++++++---- sources | 2 +- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 9b5f149..10db616 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /debhelper_11.1.1.tar.xz /debhelper_11.1.2.tar.xz /debhelper_11.4.tar.xz +/debhelper_12.6.1.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 index 3ab1827..f5389bf 100644 --- a/debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch +++ b/debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch @@ -1,8 +1,8 @@ ---- ./debian/control.orig 2017-09-20 03:48:49.007278637 +0100 -+++ ./debian/control 2017-09-20 03:50:21.376241177 +0100 -@@ -38,11 +38,3 @@ Description: helper programs for debian/ - menu system, debconf, doc-base, etc. Most Debian packages use debhelper - as part of their build process. +--- ./debian/control.orig 2019-09-08 06:59:36.000000000 +0100 ++++ ./debian/control 2019-10-08 04:27:49.286080400 +0100 +@@ -76,11 +76,3 @@ Description: debhelper perl modules + . + This package provides the perl modules used by the scripts in debhelper. -Package: dh-systemd -Section: oldlibs diff --git a/debhelper.spec b/debhelper.spec index 85c32de..fed7f6f 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -7,8 +7,8 @@ } Name: debhelper -Version: 11.4 -Release: 5%{?dist} +Version: 12.6.1 +Release: 1%{?dist} Summary: Helper programs for debian/rules License: GPLv2+ @@ -56,6 +56,7 @@ BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) # Optional tests: BuildRequires: perl(Test::Pod) +BuildRequires: perl-autodie Requires: binutils Requires: dh-autoreconf >= 17 @@ -108,8 +109,8 @@ cc -dumpmachine %make_install # Use debhelper to install (man-pages of) debhelper... - -./run dh_installman -P %{buildroot} --verbose + +./run dh_installman -P %{buildroot} --verbose -p debhelper # Add man-pages to a .lang file: # We cannot use "find_lang --with-man" because it only handle @@ -142,6 +143,9 @@ make test %{perl_vendorlib}/* %changelog +* Tue Oct 08 2019 Sérgio Basto - 12.6.1-1 +- Update to 12.6.1 + * Wed Jul 24 2019 Fedora Release Engineering - 11.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 21b8a1b..2638bba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (debhelper_11.4.tar.xz) = 6a6c6ea7cb394381288db8f872ae40de9456a22bf535ae0bc15097b47c41cda799952ffdbbcf6f56d0c3aaa9520a4f3f531106b1a53b329e53a13f8eb70ab1c9 +SHA512 (debhelper_12.6.1.tar.xz) = 83f816abb522b13a98cfdc9dd2ad68c2f23a0d45b4acc55a2ce098066db2c83b52c47f2cc999da467634276a558d84960017247f0d23628fe4a35bd5ba0a2b88