Hi! the debian part looks great, please add the patch attached and we can release :-)
best regards Frederik Schüler On Tuesday 13 April 2010 10:20:58 Dmitry V. Levin wrote: > On Mon, Apr 12, 2010 at 11:22:59PM -0700, Roland McGrath wrote: > > > Yes, it would be nice, but that change isn't quite obvious, and I have > > > only two days left. So, I'd rather postpone the change. > > > > Ok, that is entirely reasonable. > > Frederik and Roland, I'm not sure that my changes to debian/changelog and > strace.spec files follow all effective policies in Debian and Fedora, so > please check whether the release commit at > http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=commitdiff;h=ldv/release > is OK or it needs some tweaks before release. > > > -- > ldv > -- ENOSIG
From 7e9987f1a233ce6a28274e696160853bb3cb9cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20Sch=C3=BCler?= <f...@debian.org> Date: Tue, 13 Apr 2010 13:04:00 +0200 Subject: [PATCH] Debian packaging cleanups for the upcoming release. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * debian/control: 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. Signed-off-by: Frederik SchÃŒler <f...@debian.org> --- debian/changelog | 14 ++++++++++++++ debian/control | 2 +- debian/rules | 29 ++++++++++++++++------------- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4e98b72..18c9002 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 <f...@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 <f...@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..3a21635 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,23 +50,20 @@ 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 - +binary-arch: 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 dh_testroot -s dh_installdirs -s @@ -79,3 +81,4 @@ binary-arch: build dh_gencontrol -s dh_md5sums -s dh_builddeb -s + -- 1.7.0.4
signature.asc
Description: This is a digitally signed message part.
------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev
_______________________________________________ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
