Accepting request 879473 from home:jbaier_cz:branches:system:packagemanager

- Update to version 13.3.4

OBS-URL: https://build.opensuse.org/request/show/879473
OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/debhelper?expand=0&rev=12
This commit is contained in:
Frank Schreiner 2021-03-16 17:25:54 +00:00 committed by Git OBS Bridge
parent de39a9d3e0
commit bdf62cb249
7 changed files with 89 additions and 118 deletions

View File

@ -1,50 +0,0 @@
Index: debhelper/Makefile
===================================================================
--- debhelper/Makefile.orig 2011-03-16 09:40:35.806209287 +0100
+++ debhelper/Makefile 2011-03-16 09:40:54.454930738 +0100
@@ -42,32 +42,11 @@
POD2MAN=pod2man --utf8 -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)))
-else
LANGS=
-endif
build: version debhelper.7
find . -maxdepth 1 -type f -perm /100 -name "dh*" \
-exec $(POD2MAN) {} {}.1 \;
-ifneq ($(USE_NLS),no)
- po4a --previous -L UTF-8 man/po4a/po4a.cfg
- set -e; \
- for lang in $(LANGS); do \
- dir=man/$$lang; \
- for file in $$dir/dh*.pod; do \
- prog=`basename $$file | sed 's/.pod//'`; \
- $(POD2MAN) $$file $$prog.$$lang.1; \
- done; \
- if [ -e $$dir/debhelper.pod ]; then \
- cat $$dir/debhelper.pod | \
- $(MAKEMANLIST) `find $$dir -type f -maxdepth 1 -name "dh_*.pod" | LC_ALL=C sort` | \
- $(POD2MAN) --name="debhelper" --section=7 > debhelper.$$lang.7; \
- fi; \
- done
-endif
version:
printf "package Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';\n1" > \
@@ -80,12 +59,6 @@
clean:
rm -f *.1 *.7 Debian/Debhelper/Dh_Version.pm
-ifneq ($(USE_NLS),no)
- po4a --previous --rm-translations --rm-backups man/po4a/po4a.cfg
-endif
- for lang in $(LANGS); do \
- if [ -e man/$$lang ]; then rmdir man/$$lang; fi; \
- done;
install:
install -d $(DESTDIR)$(PREFIX)/bin \

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:16aba75e3dfeb5d88e8577a6f73084628ea7853a9b01d32151b7f35c2d69949b
size 1060818

View File

@ -0,0 +1,30 @@
--- debhelper-debian-10.10.9.orig/Makefile 2017-11-19 12:06:36.000000000 +0100
+++ debhelper-debian-10.10.9/Makefile 2021-03-16 15:28:10.188324493 +0100
@@ -56,14 +56,8 @@
POD2MAN_FLAGS=--utf8 -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)))
-LANG_TARGETS = $(foreach L,$(LANGS),translated-$(L)-stamp)
-else
LANGS=
LANG_TARGETS =
-endif
build: $(LANG_TARGETS) version debhelper.7 debhelper-obsolete-compat.7 $(MANPAGES)
@@ -110,12 +104,6 @@
clean:
rm -f *-stamp *.1 *.7 lib/Debian/Debhelper/Dh_Version.pm
-ifneq ($(USE_NLS),no)
- $(PO4A) --previous --rm-translations --rm-backups man/po4a/po4a.cfg
-endif
- for lang in $(LANGS); do \
- if [ -e man/$$lang ]; then rmdir man/$$lang; fi; \
- done;
install:
install -d $(DESTDIR)$(PREFIX)/bin \

View File

@ -1,13 +1,11 @@
Index: debhelper/Makefile
===================================================================
--- debhelper.orig/Makefile
+++ debhelper/Makefile
@@ -38,7 +38,7 @@ VERSION=$(shell expr "`dpkg-parsechangel
--- debhelper-debian-10.10.9.orig/Makefile 2017-11-19 12:06:36.000000000 +0100
+++ debhelper-debian-10.10.9/Makefile 2021-03-16 15:18:03.115557862 +0100
@@ -54,7 +54,7 @@
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)"
-POD2MAN_FLAGS=--utf8 -c Debhelper -r "$(VERSION)"
+POD2MAN_FLAGS=-c Debhelper -r "$(VERSION)"
build: version debhelper.7
find . -maxdepth 1 -type f -perm +100 -name "dh*" \
ifneq ($(USE_NLS),no)
# l10n to be built is determined from .po files

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 16 14:41:10 UTC 2021 - Jan Baier <jbaier@suse.com>
- Update to version 13.3.4
-------------------------------------------------------------------
Sun Jul 24 16:42:15 UTC 2016 - p.drouand@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package debhelper
#
# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,29 +12,30 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: debhelper
Version: 9.20160709
Version: 13.3.4
Release: 0
Summary: Helper programs for debian/rules
License: GPL-2.0+
License: GPL-2.0-or-later
Group: Development/Tools/Building
Url: http://kitenet.net/~joey/code/debhelper/
Source0: http://ftp.de.debian.org/debian/pool/main/d/debhelper/%{name}_%{version}.tar.xz
URL: https://salsa.debian.org/debian/debhelper
Source0: https://salsa.debian.org/debian/debhelper/-/archive/debian/%{version}/%{name}-debian-%{version}.tar.gz
# PATCH-FIX-UPSTREAM not build translated-manpages.
Patch0: debhelper-9.20150101-no-localized-manpages.patch
Patch0: debhelper-no-localized-manpages.patch
# PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages.
Patch1: debhelper-pod2man-no-utf8.patch
Requires: dh-autoreconf > 10
Requires: dpkg
Requires: strip-nondeterminism
Provides: deb:%{_bindir}/dh_install
BuildArch: noarch
%if 0%{?suse_version}
Requires: perl = %{perl_version}
%endif
Provides: deb:%{_bindir}/dh_install
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
A collection of programs that can be used in a debian/rules file to
@ -45,7 +46,7 @@ menu system, debconf, doc-base, etc. Most debian packages use debhelper
as part of their build process.
%prep
%setup -q -n %{name}
%setup -q -n %{name}-debian-%{version}
%patch0 -p1
%if 0%{?suse_version} && 0%{?suse_version} < 1130
@ -53,33 +54,20 @@ as part of their build process.
%endif
%build
make %{?_smp_mflags} VERSION='%{version}'
%make_build VERSION='%{version}'
%install
# autoscripts
install -d -m 755 %{buildroot}%{_datadir}/debhelper/autoscripts
install -m 644 autoscripts/* %{buildroot}%{_datadir}/debhelper/autoscripts
# perl modules:
install -d -m 755 %{buildroot}%{perl_vendorlib}/Debian/Debhelper
install -d -m 755 %{buildroot}%{perl_vendorlib}/Debian/Debhelper/Sequence
install -d -m 755 %{buildroot}%{perl_vendorlib}/Debian/Debhelper/Buildsystem
install -m 644 Debian/Debhelper/Buildsystem/*.pm %{buildroot}%{perl_vendorlib}/Debian/Debhelper/Buildsystem
install -m 644 Debian/Debhelper/Sequence/*.pm %{buildroot}%{perl_vendorlib}/Debian/Debhelper/Sequence
install -m 644 Debian/Debhelper/*.pm %{buildroot}%{perl_vendorlib}/Debian/Debhelper
%make_install
# man pages:
install -d -m 755 %{buildroot}%{_mandir}/man1
install -d -m 755 %{buildroot}%{_mandir}/man7
install -m 644 *.1 %{buildroot}%{_mandir}/man1
install -m 644 debhelper.7 %{buildroot}%{_mandir}/man7
# binaries:
install -d -m 755 %{buildroot}%{_bindir}
install -m 755 dh_*[^1-9] %{buildroot}%{_bindir}
install -m 755 dh %{buildroot}%{_bindir}
%files
%defattr(-,root,root)
%doc doc/* examples/* debian/changelog debian/copyright
%doc %{_mandir}/man*/*
%{_mandir}/man*/*
%{_bindir}/*
%{_datadir}/debhelper
%{perl_vendorlib}/Debian

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c53f6c833a8edd427e98307690c00dcd252360ea2a649196facf16a39e4dd4e2
size 343084