Hello, please find attached my current updates to the debian/* files, diffed against latest git.
I would like to make an upload to the Debian archive soon, to fix the release- critical bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560516 (which is done by a rather simple patch to configure.ac). Roland, are you OK with that? Best regards Frederik Schüler -- ENOSIG
Author: Frederik Schüler <f...@debian.org>
Date: Thu Feb 4 16:58:24 2010 +0100
Update debian/* files
* debian/control: add sparc64 to the architectures list. This closes
Debian bug #560062
* Backport commit f0df31e71a58c6e79ba77c1a9d84b2f38d44bec7 to fix FTBFS.
This closes Debian bug #560516
* debian/control: Update standards-version to 3.8.3.
* debian/control: Lower package priority to optional, matching the archive
override.
* debian/control: add ${misc:Depends} to Depends: lines where appropriate.
* debian/watch: new file, allows automatic tracking of new upstream versions.
* debian/source/format: new file, adapt to debian source format "quilt"
* debian/rules: indentation cleanups; use dh_testroot and dh_prep in clean
target.
Signed-off-by: Frederik Schüler <f...@debian.org>
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..dc5c337
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="uversionmangle=s/-/./g" http://sf.net/strace/strace-([[:digit:].-]*)\.tar\.bz2
+
diff --git a/debian/changelog b/debian/changelog
index 8f752d8..abc760c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+strace (4.5.19-2) unstable; urgency=low
+
+ * Add sparc64 to the architectures list, closes: #560062
+ * Fix FTBFS, thanks to Aurelien Jarno <aurel...@aurel32.net> for pointing
+ out the solution. Closes: #560516
+ * Rebuild as normal package, closes: #566968
+ * Update standards-version to 3.8.3.
+ * Lower package priority to optional, matching the archive override.
+ * Add watch file.
+
+ -- Frederik Schüler <f...@debian.org> Tue, 26 Jan 2010 12:20:51 +0100
+
strace (4.5.19-1) unstable; urgency=low
[ Dmitry V. Levin ]
diff --git a/debian/control b/debian/control
index da46c25..54e1fed 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,14 @@
Source: strace
Maintainer: Frederik Schüler <f...@debian.org>
Section: utils
-Priority: standard
+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)
-Standards-Version: 3.8.1.0
+Standards-Version: 3.8.3
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
-Section: utils
-Priority: standard
-Depends: ${shlibs:Depends}
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 s390x sh 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
a trace of all the system calls made by a another process/program.
@@ -23,9 +21,8 @@ Description: A system call tracer
Package: strace64
Architecture: i386 powerpc s390 sparc
-Section: utils
Priority: extra
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc: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.
@@ -43,8 +40,8 @@ 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
-Depends: ${shlibs:Depends}
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh 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
a trace of all the system calls made by a another process/program.
diff --git a/debian/rules b/debian/rules
index c87b35a..84001bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,14 @@
#! /usr/bin/make -f
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -35,6 +43,9 @@ build64/Makefile:
cd $(@D); CC="$(CC64)" sh ../configure --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) --host=$(HOST64)
clean:
+ dh_testdir
+ dh_testroot
+ dh_prep
dh_clean
rm -rf debian/strace debian/strace-udeb debian/substvars debian/files debian/files~
rm -rf build64 stamp-build64 strace64.1
@@ -44,13 +55,13 @@ binary: binary-indep binary-arch
binary-indep:
-binary-arch: build checkroot
+binary-arch: build
test -f stamp-build || make $(MFLAGS) -f debian/rules build
-
+
# 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
@@ -69,5 +80,3 @@ binary-arch: build checkroot
dh_md5sums -s
dh_builddeb -s
-checkroot:
- test root = "`whoami`"
signature.asc
Description: This is a digitally signed message part.
------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com
_______________________________________________ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
