2008-07-19 Frederik Schüler <fs@debian.org>

	* debian/control: Add strace64 package.
	Fixes Debian#491167, Debian#491188.
	* debian/rules: Use debhelper flag --same-arch instead of --arch in
	order to build strace64 only on the specified architectures.
	* debian/strace64.install: New file, list for dh_install.
	* debian/strace64.manpages: New file, list for dh_install.
	* debian/changelog: Add prereleases entries.

5 files changed, 55 insertions, 24 deletions

diff --git a/debian/changelog b/debian/changelog
index 4139f02..3ddd01d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,20 @@
 strace (4.5.17-1) unstable; urgency=low
 
   * New upstream release.
+
+ -- Frederik Schüler <fs@debian.org>  Sat, 19 Jul 2008 21:38:30 +0200
+
+strace (4.5.16+cvs20080708-2) unstable; urgency=low
+
+  * Rerun autotools in correct order.
+  * Add strace64 package on i386, powerpc, s390 and sparc, 
+    closes: #491167, #491188
+
+ -- Frederik Schüler <fs@debian.org>  Thu, 17 Jul 2008 17:21:27 +0200
+
+strace (4.5.16+cvs20080708-1) unstable; urgency=low
+
+  * New upstream snapshot.
     + Fix chmod/chown typo in debian/rules, closes: #459255.
     + Install strace-graph too, closes: 469068.
     + Fix m68k build, closes: 456879.
diff --git a/debian/control b/debian/control
index ba6bef2..6505230 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,22 @@ Description: A system call tracer
  interface. A close examination of this boundary is very useful for bug
  isolation, sanity checking and attempting to capture race conditions.
 
+Package: strace64
+Architecture: i386 powerpc s390 sparc
+Depends: ${shlibs:Depends}
+Description: A system call tracer for 64bit binaries
+ strace is a system call tracer, i.e. a debugging tool which prints out
+ a trace of all the system calls made by a another process/program.
+ The program to be traced need not be recompiled for this, so you can
+ use it on binaries for which you don't have source.
+ .
+ This package containts the 64bit version of the binary, intended for 
+ biarch systems with 32bit userland and 64bit kernel.
+ .
+ System calls and signals are events that happen at the user/kernel
+ interface. A close examination of this boundary is very useful for bug
+ isolation, sanity checking and attempting to capture race conditions.
+
 Package: strace-udeb
 Section: debian-installer
 XC-Package-Type: udeb
diff --git a/debian/rules b/debian/rules
index 5291840..843f317 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ build64/Makefile:
 clean:
 	dh_clean
 	rm -rf debian/strace debian/strace-udeb debian/substvars debian/files debian/files~
-	rm -rf build64 stamp-build64
+	rm -rf build64 stamp-build64 strace64.1
 	rm -rf build stamp-build
 
 binary: binary-indep binary-arch
@@ -46,29 +46,28 @@ binary-indep:
 
 binary-arch: build checkroot
 	test -f stamp-build || make $(MFLAGS) -f debian/rules build
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdirs -a
-	dh_installdocs -a
-	dh_installman -a
-	dh_installexamples -a
-	dh_installchangelogs ChangeLog
-	dh_install -a
-	# install 64bit executable and manpage if it has been built
-	if test -f stamp-build64; then \
-	  mv build64/strace build64/strace64 ; \
-	  dh_install build64/strace64 usr/bin ; \
-	  dh_link usr/share/man/man1/strace.1 usr/share/man/man1/strace64.1; \
-	else : ; fi
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	
+	# prepare 64bit executable and manpage, if it has been built
+	test -f stamp-build64 && ( mv build64/strace build64/strace64 ; \
+		cp strace.1 strace64.1 ) || true
+	
+	dh_testdir -s
+	dh_testroot -s
+	dh_installdirs -s
+	dh_installdocs -s
+	dh_installman -s
+	dh_installexamples -s
+	dh_installchangelogs -s ChangeLog
+	dh_install -s
+	dh_link -s
+	dh_strip -s
+	dh_compress -s
+	dh_fixperms -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 checkroot:
 	test root = "`whoami`"
diff --git a/debian/strace64.install b/debian/strace64.install
new file mode 100644
index 0000000..2d3036d
--- /dev/null
+++ b/debian/strace64.install
@@ -0,0 +1 @@
+build64/strace64 usr/bin
diff --git a/debian/strace64.manpages b/debian/strace64.manpages
new file mode 100644
index 0000000..e3adc93
--- /dev/null
+++ b/debian/strace64.manpages
@@ -0,0 +1 @@
+strace64.1