Sync strace.spec and debian/ with packages

* debian/changelog: Sync with 4.5.20-2.3.
* debian/control: Likewise.
* strace.spec: Sync with 4.6-2.

diff --git a/debian/changelog b/debian/changelog
index ada939f76f5fe01d7a4d206552cdd20e976cf86b..f1881830fe0f7bb3b4d534395b867a232803434c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,27 @@ strace (4.6-1) unstable; urgency=low
 
  -- Dmitry V. Levin <ldv@altlinux.org>  Mon, 14 Mar 2011 15:16:17 +0000
 
+strace (4.5.20-2.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add sh4 to arch list.
+  * Add powerpcspe to arch list (Closes: #579842).
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Tue, 22 Mar 2011 09:03:49 +0900
+
+strace (4.5.20-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add sh4 to arch list (Closes: #537105).
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Wed, 09 Mar 2011 09:22:01 +0900
+
+strace (4.5.20-2.1) unstable; urgency=low
+
+  * NMU, added armhf support. (Closes: #596960)
+
+ -- Konstantinos Margaritis <markos@debian.org>  Thu, 24 Feb 2011 14:47:54 +0000
+
 strace (4.5.20-2) unstable; urgency=low
 
   * Add missing sparc syscall defines to fix FTBFS on sparc.

diff --git a/debian/control b/debian/control
index d458b5275d17d5c7c04c088da6a099f8caab8b68..417a909a2f2a67541630a54538b9b09df8c827ec 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: strace
 Maintainer: Frederik Schüler <fs@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), coreutils (>= 7.0), time
+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.4
 Homepage: http://sourceforge.net/projects/strace/
 
 Package: strace
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 s390x sh sparc sparc64
+Architecture: alpha amd64 arm armeb armel armhf hppa i386 ia64 m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A system call tracer
  strace is a system call tracer, i.e. a debugging tool which prints out
@@ -40,7 +40,7 @@ Package: strace-udeb
 Section: debian-installer
 XC-Package-Type: udeb
 Priority: extra
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh sparc sparc64
+Architecture: alpha amd64 arm armeb armel armhf hppa i386 ia64 m68k mips mipsel powerpc powerpcspe ppc64 s390 sh4 sparc sparc64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A system call tracer
  strace is a system call tracer, i.e. a debugging tool which prints out

diff --git a/strace.spec b/strace.spec
index bd444534848139fd10045a1f0716bcca3b17a155..4fad2ae841e4e084f1694225495644584352b270 100644 (file)
--- a/strace.spec
+++ b/strace.spec
@@ -1,7 +1,7 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
 Version: 4.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Development/Debuggers
 URL: http://sourceforge.net/projects/strace/
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Mon Mar 14 2011 Dmitry V. Levin <ldv@altlinux.org> - 4.6-1
 - New upstream release.
   + fixed a corner case in waitpid handling (#663547).