From 94982d413d6915b4131d093de4f1e19be4abce32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Tue, 1 Aug 2017 12:24:08 +0100
Subject: [PATCH] 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  <release-monitoring@fedoraproject.org> - 10.7.1-1
+- Update to 10.7.1 (#1448667)
+
 * Mon Jul 31 2017 Fedora Release Monitoring  <release-monitoring@fedoraproject.org> - 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 <releng@fedoraproject.org> - 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