debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge changes from sid up to 3.1.1-3 

svn path=/dists/trunk/linux-tools/; revision=18609
This commit is contained in:
Ben Hutchings 2012-01-24 04:25:53 +00:00
parent 49a19ef593 b209b7c71b
commit aec0e52ff3
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/build/tools/perf/Makefile vendored
View File

@ -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)

14
debian/changelog vendored
View File

@ -17,6 +17,20 @@ linux-tools (3.2~rc4-1~experimental.1) experimental; urgency=low
-- Ben Hutchings <ben@decadent.org.uk> Wed, 07 Dec 2011 01:53:15 +0000
linux-tools (3.1.1-3) unstable; urgency=low
* Fix s390x support.
-- Aurelien Jarno <aurel32@debian.org> Sun, 18 Dec 2011 19:32:12 +0100
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 <ben@decadent.org.uk> Thu, 17 Nov 2011 03:18:03 +0000
linux-tools (3.1.1-1) unstable; urgency=low
* New upstream release

16
debian/rules vendored
View File

@ -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 $<

2
debian/rules.real vendored
View File

@ -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