From b26b7ec848378b2de6781143d10d446018f20cca Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Fri, 30 Aug 2013 11:46:32 +0000
Subject: [PATCH] Prepare to release linux-tools (3.10-4) for the perl 5.18
 transition

usbip: Fix package version override to be binNMU-safe, ready for the
next time

svn path=/dists/sid/linux-tools/; revision=20533
---
 debian/changelog  | 7 +++++++
 debian/rules.real | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9afbd1aa6..4c1d74ec6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-tools (3.10-4) unstable; urgency=low
+
+  * Sourceful upload for the perl 5.18 transition
+  * usbip: Fix package version override to be binNMU-safe
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Fri, 30 Aug 2013 12:44:56 +0100
+
 linux-tools (3.10-3) unstable; urgency=low
 
   * linux-kbuild: Fix no-modules case in modpost wrapper (Closes: #719129)
diff --git a/debian/rules.real b/debian/rules.real
index beb766bcb..8b2730e8e 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -4,6 +4,10 @@ include debian/rules.defs
 
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
+# VERSION_DEBIAN is the package source version; VERSION_DEBIAN_FULL
+# includes any binNMU part.
+VERSION_DEBIAN_FULL := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
+
 binary-arch: install-kbuild install-usbip
 ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
   binary-arch: install-tools
@@ -74,7 +78,7 @@ install-usbip: $(STAMPS_DIR)/build
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	test -n "$(VERSION)" -a -n "$(VERSION_DEBIAN)"
-	dh_gencontrol -- -v$(VERSION)+$(VERSION_DEBIAN)
+	test -n "$(VERSION)" -a -n "$(VERSION_DEBIAN_FULL)"
+	dh_gencontrol -- -v$(VERSION)+$(VERSION_DEBIAN_FULL)
 	dh_md5sums
 	dh_builddeb