Accepting request 267197 from home:posophe:branches:system:packagemanager

Update

OBS-URL: https://build.opensuse.org/request/show/267197
OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/debhelper?expand=0&rev=8

debhelper-9.20150101-no-localized-manpages.patch

@@ -2,16 +2,21 @@ Index: debhelper/Makefile
 ===================================================================
 --- debhelper/Makefile.orig	2011-03-16 09:40:35.806209287 +0100
 +++ debhelper/Makefile	2011-03-16 09:40:54.454930738 +0100
-@@ -40,26 +40,9 @@
+@@ -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)))
--
+-LANGS?=$(notdir $(basename $(wildcard man/po4a/po/*.po)))
+-else
+ LANGS=
+-endif
+ 
  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 \;
+-ifneq ($(USE_NLS),no)
 -	po4a --previous -L UTF-8 man/po4a/po4a.cfg 
 -	set -e; \
 -	for lang in $(LANGS); do \
@@ -26,17 +31,20 @@ Index: debhelper/Makefile
 -				$(POD2MAN) --name="debhelper" --section=7 > debhelper.$$lang.7; \
 -		fi; \
 -	done
+-endif
  
  version:
  	printf "package Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';\n1" > \
-@@ -72,10 +55,6 @@
+@@ -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)/usr/bin \
+ 	install -d $(DESTDIR)$(PREFIX)/bin \

debhelper.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Jan  4 17:24:25 UTC 2015 - p.drouand@gmail.com
+
+- Update to version 9.20150101
+- Adapt debhelper-no-localized-manpages.patch to upstream changes
+  > debhelper-20150101-no-localized-manpages.patch
+- Remove upstreamed debhelper-findutils.patch
+
 -------------------------------------------------------------------
 Fri Oct  4 02:43:46 UTC 2013 - frank.lichtenheld@sophos.com
 

debhelper.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package debhelper
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           debhelper
-Version:        9.20120830
+Version:        9.20150101
 Release:        0
 Summary:        Helper programs for debian/rules
 License:        GPL-2.0+
@@ -26,7 +26,7 @@ Url:            http://kitenet.net/~joey/code/debhelper/
 # http://ftp.de.debian.org/debian/pool/main/d/debhelper/
 Source0:        debhelper_%{version}.tar.gz
 # PATCH-FIX-UPSTREAM not build translated-manpages.
-Patch0:         debhelper-no-localized-manpages.patch
+Patch0:         debhelper-9.20150101-no-localized-manpages.patch
 # PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages.
 Patch1:         debhelper-pod2man-no-utf8.patch
 Requires:       dpkg

debhelper_9.20120830.tar.gz

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

debhelper_9.20150101.tar.gz

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