From f63e0cc7980f0e03b6e2f8fb42fcfa28a826e514 Mon Sep 17 00:00:00 2001 From: Oron Peled Date: Mon, 20 May 2013 22:41:04 +0300 Subject: [PATCH] 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