diff options
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 22 |
3 files changed, 27 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 4e98b72..11f622c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +strace (4.5.20-1) unstable; urgency=low + + [ Frederik Schüler ] + * New upstream version. + * Update standards-version to 3.8.4. + * debian/rules: allow parallel building. + * debian/rules: comment out verbose build, only needed for debugging. + * debian/rules: clean up clean: target, dh_clean does most of the work + already. + * debian/rules: use *-stamp instead of stamp-*, so dh_clean can tidy + up for us. + + -- Frederik Schüler <fs@debian.org> Tue, 13 Apr 2010 13:02:57 +0200 + strace (4.5.19-2) unstable; urgency=low * Add sparc64 to the architectures list, closes: #560062 diff --git a/debian/control b/debian/control index 54e1fed..b22b1a3 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Frederik Schüler <fs@debian.org> Section: utils Priority: optional Build-Depends: libc6-dev (>= 2.2.2) [!alpha !ia64], libc6.1-dev (>= 2.2.2) [alpha ia64], gcc-multilib [i386 powerpc s390 sparc], debhelper (>= 7.0.0) -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/strace/ Package: strace diff --git a/debian/rules b/debian/rules index 62903fd..8e66ae9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #! /usr/bin/make -f -export DH_VERBOSE=1 +#export DH_VERBOSE=1 CFLAGS = -Wall -g @@ -10,6 +10,11 @@ else CFLAGS += -O2 endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) @@ -19,7 +24,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH)=%, $(arch64_map))) HOST64 = $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \ $(filter $(DEB_HOST_ARCH)=%, $(arch64_map))))-linux-gnu CC64 = gcc -m64 - extra_build_targets += stamp-build64 + extra_build_targets += build64-stamp endif ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) @@ -28,9 +33,9 @@ else CONFIG_OPTS = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) endif -all build: stamp-build $(extra_build_targets) +all build: build-stamp $(extra_build_targets) -stamp-%: %/Makefile +%-stamp: %/Makefile $(MAKE) -C $* touch $@ @@ -45,21 +50,18 @@ build64/Makefile: clean: dh_testdir dh_testroot - dh_prep + rm -rf build build64 strace64.1 dh_clean - rm -rf debian/strace debian/strace-udeb debian/substvars debian/files debian/files~ - rm -rf build64 stamp-build64 strace64.1 - rm -rf build stamp-build binary: binary-indep binary-arch binary-indep: binary-arch: build - test -f stamp-build || make $(MFLAGS) -f debian/rules build + test -f build-stamp || make $(MFLAGS) -f debian/rules build # prepare 64bit executable and manpage, if it has been built - test -f stamp-build64 && ( mv build64/strace build64/strace64 ; \ + test -f build64-stamp && ( mv build64/strace build64/strace64 ; \ cp strace.1 strace64.1 ) || true dh_testdir -s |