--- strace-4.5.14.orig/debian/changelog
+++ strace-4.5.14/debian/changelog
@@ -1,3 +1,13 @@
+strace (4.5.14-2) unstable; urgency=low
+
+  * New comaintainer.
+  * Fix build failure with linux-2.6.18, thanks to Andreas Henriksson for the
+    patch, closes: #392556.
+  * Fix build with libc6 2.5.
+  * Acknowledge NMUs, closes: #315500, #355733
+
+ -- Frederik Schüler <fs@debian.org>  Thu, 26 Oct 2006 22:11:25 +0200
+
 strace (4.5.14-1) unstable; urgency=low
 
   * New upstream version.
--- strace-4.5.14.orig/debian/compat
+++ strace-4.5.14/debian/compat
@@ -0,0 +1 @@
+4
--- strace-4.5.14.orig/debian/control
+++ strace-4.5.14/debian/control
@@ -2,9 +2,9 @@
 Section: utils
 Priority: standard
 Maintainer: Roland McGrath <frob@debian.org>
-Uploaders: Wichert Akkerman <wakkerma@debian.org>
-Build-Depends: libc6-dev (>= 2.2.2-1) [!alpha !ia64], libc6.1-dev (>= 2.2.2-1) [alpha ia64], libc6-dev-s390x [s390], libc6-dev-sparc64 [sparc], debhelper
-Standards-Version: 3.6.2
+Uploaders: Frederik Schüler <fs@debian.org>
+Build-Depends: libc6-dev (>= 2.2.2-1) [!alpha !ia64], libc6.1-dev (>= 2.2.2-1) [alpha ia64], libc6-dev-s390x [s390], libc6-dev-sparc64 [sparc], debhelper (>= 5.0.0)
+Standards-Version: 3.7.2
 
 Package: strace
 Architecture: alpha amd64 arm armeb hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 s390x sh sparc
--- strace-4.5.14.orig/debian/rules
+++ strace-4.5.14/debian/rules
@@ -66,8 +66,8 @@
 
 # Install strace
 	install -d -o root -g root -m 755 debian/tmp/usr/bin
-	install -o root -g root -m 755 build/strace debian/tmp/usr/bin/strace
-	dh_strip
+	install -s -o root -g root -m 755 build/strace debian/tmp/usr/bin/strace
+
 
 	dpkg-gencontrol -is -pstrace-udeb -fdebian/files~
 	dpkg-deb --build debian/tmp ../$(UDEB)
--- strace-4.5.14.orig/strace.c
+++ strace-4.5.14/strace.c
@@ -2251,7 +2251,7 @@
 			if (!cflag
 			    && (qual_flags[WSTOPSIG(status)] & QUAL_SIGNAL)) {
 				unsigned long addr = 0, pc = 0;
-#ifdef PT_GETSIGINFO
+#if defined(PT_CR_IPSR) && defined(PT_CR_IIP) && defined(PT_GETSIGINFO)
 #				define PSR_RI	41
 				struct siginfo si;
 				unsigned long psr;
--- strace-4.5.14.orig/system.c
+++ strace-4.5.14/system.c
@@ -78,6 +78,7 @@
 #endif
 
 #include <linux/sysctl.h>
+#include <linux/version.h>
 
 static const struct xlat mount_flags[] = {
 	{ MS_MGC_VAL,	"MS_MGC_VAL"	},
@@ -1578,7 +1579,9 @@
 	{ CTL_KERN, "CTL_KERN" },
 	{ CTL_VM, "CTL_VM" },
 	{ CTL_NET, "CTL_NET" },
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
 	{ CTL_PROC, "CTL_PROC" },
+#endif
 	{ CTL_FS, "CTL_FS" },
 	{ CTL_DEBUG, "CTL_DEBUG" },
 	{ CTL_DEV, "CTL_DEV" },