Hello community,
here is the log from the commit of package debhelper for openSUSE:Factory checked in at 2013-10-04 15:57:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/debhelper (Old)
and /work/SRC/openSUSE:Factory/.debhelper.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "debhelper"
Changes:
--------
--- /work/SRC/openSUSE:Factory/debhelper/debhelper.changes 2012-10-04 19:34:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.debhelper.new/debhelper.changes 2013-10-04 15:57:16.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Oct 4 02:43:46 UTC 2013 - frank.lichtenheld@sophos.com
+
+- import upstream patch debhelper-findutils.patch from Git
+* Avoid find -perm +mode breakage caused by findutils 4.5.11,
+ by instead using -perm /mode (deb#700200)
+
+-------------------------------------------------------------------
New:
----
debhelper-findutils.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ debhelper.spec ++++++
--- /var/tmp/diff_new_pack.I44uqj/_old 2013-10-04 15:57:17.000000000 +0200
+++ /var/tmp/diff_new_pack.I44uqj/_new 2013-10-04 15:57:17.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package debhelper
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -29,6 +29,8 @@
Patch0: debhelper-no-localized-manpages.patch
# PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages.
Patch1: debhelper-pod2man-no-utf8.patch
+# PATCH-FIX-UPSTREAM fix problems with new findutils
+Patch2: debhelper-findutils.patch
Requires: dpkg
%if 0%{?suse_version}
Requires: perl = %{perl_version}
@@ -49,6 +51,7 @@
%setup -q -n %{name}
%patch0 -p1
+%patch2 -p1
%if 0%{?suse_version} && 0%{?suse_version} < 1130
%patch1 -p1
%endif
++++++ debhelper-findutils.patch ++++++
From: Joey Hess
Date: Sat, 9 Feb 2013 21:38:42 +0000 (-0400)
Subject: Avoid find -perm +mode breakage caused by findutils 4.5.11, by instead using -perm...
X-Git-Tag: 9.20130504~7
X-Git-Url: http://anonscm.debian.org/gitweb/?p=debhelper%2Fdebhelper.git;a=commitdiff_p...
Avoid find -perm +mode breakage caused by findutils 4.5.11, by instead using -perm /mode. Closes: #700200
---
Index: debhelper/Makefile
===================================================================
--- debhelper.orig/Makefile
+++ debhelper/Makefile
@@ -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))
@@ -41,7 +41,7 @@ PERLLIBDIR=$(shell perl -MConfig -e 'pri
POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)"
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 \;
version:
Index: debhelper/dh_shlibdeps
===================================================================
--- debhelper.orig/dh_shlibdeps
+++ debhelper/dh_shlibdeps
@@ -129,7 +129,7 @@ foreach my $package (@{$dh{DOPACKAGES}})
if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
$find_options="! \\( $dh{EXCLUDE_FIND} \\)";
}
- foreach my $file (split(/\n/,`find $tmp -type f \\( -perm +111 -or -name "*.so*" -or -name "*.cmxs" \\) $find_options -print`)) {
+ foreach my $file (split(/\n/,`find $tmp -type f \\( -perm /111 -or -name "*.so*" -or -name "*.cmxs" \\) $find_options -print`)) {
# Prune directories that contain separated debug symbols.
next if $file=~m!^\Q$tmp\E/usr/lib/debug/(lib|lib64|usr|bin|sbin|opt|dev|emul)/!;
# TODO this is slow, optimize. Ie, file can run once on
Index: debhelper/dh_suidregister
===================================================================
--- debhelper.orig/dh_suidregister
+++ debhelper/dh_suidregister
@@ -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/";
++++++ debhelper-pod2man-no-utf8.patch ++++++
--- /var/tmp/diff_new_pack.I44uqj/_old 2013-10-04 15:57:17.000000000 +0200
+++ /var/tmp/diff_new_pack.I44uqj/_new 2013-10-04 15:57:17.000000000 +0200
@@ -10,4 +10,4 @@
+POD2MAN=pod2man -c Debhelper -r "$(VERSION)"
build: version debhelper.7
- find . -maxdepth 1 -type f -perm +100 -name "dh*" \
+ find . -maxdepth 1 -type f -perm /100 -name "dh*" \
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org