From 679a4bb14f7a238c57bdff3d19c8109f18451569 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 17 Nov 2011 03:17:16 +0000 Subject: [PATCH 1/4] Change the check for stale debian/control to tolerate binNMUs (Closes: #649005) svn path=/dists/sid/linux-tools/; revision=18290 --- debian/changelog | 7 +++++++ debian/rules | 16 +++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index f2522d92991f..c2a85d4b97cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux-tools (3.1.1-2) UNRELEASED; urgency=low + + * Change the check for stale debian/control to tolerate binNMUs + (Closes: #649005) + + -- Ben Hutchings Thu, 17 Nov 2011 03:07:31 +0000 + linux-tools (3.1.1-1) unstable; urgency=low * New upstream release diff --git a/debian/rules b/debian/rules index d201eff61f4d..28304f75f211 100755 --- a/debian/rules +++ b/debian/rules @@ -55,13 +55,15 @@ binary: binary-indep binary-arch CONTROL_FILES = debian/changelog $(wildcard debian/templates/control.*) debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES) - +if [ -f debian/control.md5sum ]; then \ - if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \ - $(MAKE) -f debian/rules debian/control-real; \ - fi \ - else \ - $(MAKE) -f debian/rules debian/control-real; \ - fi +ifeq ($(wildcard debian/control.md5sum),) + $(MAKE) -f debian/rules debian/control-real +else ifeq ($(VERSION_DEBIAN_BINNMU),) + md5sum --check debian/control.md5sum --status || \ + $(MAKE) -f debian/rules debian/control-real +else + grep -v debian/changelog debian/control.md5sum | md5sum --check - --status || \ + $(MAKE) -f debian/rules debian/control-real +endif debian/control-real: debian/bin/gencontrol.py $(CONTROL_FILES) chmod +x $< From 7a1642ecbf1683c44e60aff0cf26f6fe3c428cf8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 17 Nov 2011 03:36:14 +0000 Subject: [PATCH 2/4] Prepare to release inux-tools (3.1.1-2). To be rebuilt with perl 5.14 (Closes: #649006) svn path=/dists/sid/linux-tools/; revision=18291 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c2a85d4b97cd..51ddd856fa98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -linux-tools (3.1.1-2) UNRELEASED; urgency=low +linux-tools (3.1.1-2) unstable; urgency=low * Change the check for stale debian/control to tolerate binNMUs (Closes: #649005) + * Rebuild with perl 5.14 (Closes: #649006) - -- Ben Hutchings Thu, 17 Nov 2011 03:07:31 +0000 + -- Ben Hutchings Thu, 17 Nov 2011 03:18:03 +0000 linux-tools (3.1.1-1) unstable; urgency=low From 788702d28f4bbc92e2e7357eed217d5a07c82eb7 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 19 Nov 2011 18:55:14 +0000 Subject: [PATCH 3/4] * Fix s390x support. svn path=/dists/sid/linux-tools/; revision=18297 --- debian/build/tools/perf/Makefile | 2 +- debian/changelog | 6 ++++++ debian/rules.real | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile index f46a154c4c1c..ec91e9b921e0 100644 --- a/debian/build/tools/perf/Makefile +++ b/debian/build/tools/perf/Makefile @@ -17,7 +17,7 @@ else ifeq ($(DEB_HOST_ARCH_CPU),powerpc64) else ifeq ($(DEB_HOST_ARCH_CPU),s390) KERNEL_ARCH_PERF = s390 else ifeq ($(DEB_HOST_ARCH_CPU),s390x) - KERNEL_ARCH_PERF = s390x + KERNEL_ARCH_PERF = s390 else ifeq ($(DEB_HOST_ARCH_CPU),sh4) KERNEL_ARCH_PERF = sh else ifeq ($(DEB_HOST_ARCH_CPU),sparc) diff --git a/debian/changelog b/debian/changelog index 51ddd856fa98..eb640b2b0bce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux-tools (3.1.1-3) UNRELEASED; urgency=low + + * Fix s390x support. + + -- Aurelien Jarno Fri, 18 Nov 2011 17:26:51 +0100 + linux-tools (3.1.1-2) unstable; urgency=low * Change the check for stale debian/control to tolerate binNMUs diff --git a/debian/rules.real b/debian/rules.real index 45eb8f390df2..17eec6acb844 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -5,7 +5,7 @@ include debian/rules.defs DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) binary-arch: install-kbuild -ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 sh4 sparc sparc64,$(DEB_BUILD_ARCH)),) +ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),) binary-arch: install-tools endif From b209b7c71b28b16e67344cd7d9ddf8d32c2b5cc9 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sun, 18 Dec 2011 20:34:37 +0000 Subject: [PATCH 4/4] Prepare to release linux-tools (3.1.1-3). svn path=/dists/sid/linux-tools/; revision=18396 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index eb640b2b0bce..13c9cc846d3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -linux-tools (3.1.1-3) UNRELEASED; urgency=low +linux-tools (3.1.1-3) unstable; urgency=low * Fix s390x support. - -- Aurelien Jarno Fri, 18 Nov 2011 17:26:51 +0100 + -- Aurelien Jarno Sun, 18 Dec 2011 19:32:12 +0100 linux-tools (3.1.1-2) unstable; urgency=low