Sync strace.spec and debian/ with packages

* debian/changelog: Sync with 4.10-3.
* debian/control: Likewise.
* debian/rules: Likewise.
* strace.spec: Sync with 4.10-3.

diff --git a/debian/changelog b/debian/changelog
index 74392ed72ab72fe7aac026c3c3a47836531951f7..cc06157d03192d184da11a39122e2ef14b1b5835 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,27 @@
-strace (4.10-1) experimental; urgency=low
+strace (4.10-3) unstable; urgency=medium
 
+  * Really fix mips* builds - fix sys_syscall() handling.
+    Closes: #781753
+  * Clean up strace64.substvars at clean time
+  * Remove ancient changelog entries that annoy lintian
+  * Update Standards-Version to 3.9.6 (no changes needed)
+
+ -- Steve McIntyre <93sam@debian.org>  Wed, 08 Jul 2015 23:44:03 +0100
+
+strace (4.10-2) unstable; urgency=medium
+
+  * Fix building on arm64 using patches from upstream. Closes: #790770
+  * Fix various test suite failures using patches from upstream.
+    Closes: #781040
+  * Fix mips o32 build. Thanks to Arturo Borrero Gonzalez
+    <arturo.borrero.glez@gmail.com> for tracking this.
+  * Add build-dependency on gawk for the test suite. Closes: #780992
+
+ -- Steve McIntyre <93sam@debian.org>  Thu, 02 Jul 2015 02:03:25 +0100
+
+strace (4.10-1) unstable; urgency=low
+
+  [ Dmitry V. Levin ]
   * New upstream version.
     + enhanced ioctl decoding,  closes: #692913
     + enabled mips64el build, closes: #773375
@@ -7,7 +29,7 @@ strace (4.10-1) experimental; urgency=low
     + updated generic and added arch-specific PTRACE_* constants,
       closes: #734554
 
- -- Dmitry V. Levin <ldv@altlinux.org>  Fri, 06 Mar 2015 13:14:15 +0000
+ -- Steve McIntyre <93sam@debian.org>  Sat, 21 Mar 2015 22:18:25 +0000
 
 strace (4.9-2) unstable; urgency=medium
 
@@ -767,7 +789,7 @@ strace (3.1-11) unstable; urgency=low
   * Ported to libc6 / glibc2 (Bug# 11729)
   * Compress manpage
 
- -- Wichert Akkerman <wakkerma@wi.leidenuniv.nl>  Fri,  1 Aug 1997 00:13:38 +02
+ -- Wichert Akkerman <wakkerma@wi.leidenuniv.nl>  Fri,  1 Aug 1997 00:13:38 +0200
 
 strace (3.1-10) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 5c67fea1ed26999b227f058daa4c580e23350d39..55d2b0e87b23ef03b0425a0e1ecfa9604761ac72 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://sourceforge.net/projects/strace/
 
 Package: strace

diff --git a/debian/rules b/debian/rules
index 912b4103ee25f20d113cc13f9bf2af7d3f713624..a9ba147b900c8caf637899f27a01b37dff809056 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,7 @@ build64/Makefile:
 clean:
        dh_testdir
        dh_testroot
-       rm -rf build build64 strace64.1
+       rm -rf build build64 strace64.1 debian/strace64.substvars
        dh_clean
 
 binary: binary-indep binary-arch

diff --git a/strace.spec b/strace.spec
index 8165d0d7e38452212ab5d76289c2b5629749b96e..015c15f096d3498b87d519152b5f7bb08a2d7e91 100644 (file)
--- a/strace.spec
+++ b/strace.spec
@@ -1,14 +1,12 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
 Version: 4.10
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Debuggers
 URL: http://sourceforge.net/projects/strace/
 Source: http://downloads.sourceforge.net/strace/%{name}-%{version}.tar.xz
-
 BuildRequires: libacl-devel, time
-
 %define strace64_arches ppc64 sparc64
 
 %description
@@ -79,6 +77,12 @@ make -k check VERBOSE=1
 %endif
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon May 11 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 4.10-2
+- Backport set of upstream patches to get it buildable on AArch64
+
 * Fri Mar 06 2015 Dmitry V. Levin <ldv@altlinux.org> - 4.10-1
 - New upstream release:
   + enhanced ioctl decoding (#902788).