debian: sync with the package

* debian/control (Build-Depends) [amd64]: Remove libunwind-dev.
* debian/changelog: Sync with 4.12-3.
* debian/rules: Likewise.

diff --git a/debian/changelog b/debian/changelog
index 89157c822b890283267aa501a924c5cd4608de22..c168ae6bc1cc10a6f295504bf075718d38e7cb95 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+strace (4.12-3) unstable; urgency=medium
+
+  * Fix up 32/64-bit test output in strace -S test to fix i386 build
+  * Run make check with VERBOSE=1 so we get useful information in build logs
+
+ -- Steve McIntyre <93sam@debian.org>  Sat, 04 Jun 2016 02:37:44 +0100
+
+strace (4.12-2) unstable; urgency=medium
+
+  * Remove libunwind dependency. Closes: #826223
+
+ -- Steve McIntyre <93sam@debian.org>  Fri, 03 Jun 2016 13:43:44 +0100
+
 strace (4.12-1) unstable; urgency=low
 
   [ Dmitry V. Levin ]

diff --git a/debian/control b/debian/control
index c762be15602c93e6574e26dd6f740ae22b77c627..55d2b0e87b23ef03b0425a0e1ecfa9604761ac72 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: strace
 Maintainer: Steve McIntyre <93sam@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), gawk, libunwind-dev [amd64]
+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), gawk
 Standards-Version: 3.9.6
 Homepage: http://sourceforge.net/projects/strace/
 

diff --git a/debian/rules b/debian/rules
index a9ba147b900c8caf637899f27a01b37dff809056..4b556a73e17f3c062467ceed20df4eb58165301e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ build-indep: build-stamp $(extra_build_targets)
 %-stamp: %/Makefile
        $(MAKE) -C $*
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-       $(MAKE) -C $* check
+       $(MAKE) -C $* check VERBOSE=1
 endif
        touch $@