Hello David,

I've fixed the open RC bugs in your package in order to help the release
of Etch. I've prepared an NMU for which I've attached the diff. Please
note that I've also modified the upstream source tarball.


Thijs
diff -Nru /tmp/T6SYQ8kJMk/snack-2.2.9/debian/changelog /tmp/6lCwPLWknq/snack-2.2.9.dfsg/debian/changelog
--- /tmp/T6SYQ8kJMk/snack-2.2.9/debian/changelog	2006-10-12 15:56:51.000000000 +0200
+++ /tmp/6lCwPLWknq/snack-2.2.9.dfsg/debian/changelog	2006-10-12 15:56:51.000000000 +0200
@@ -1,3 +1,14 @@
+snack (2.2.9.dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload for release critical bugs.
+  * Rework debian/rules to actually put content into the -dev package.
+    (Closes: #362436, #334834)
+  * Remove binary-only tclkit-linux-x86 from upstream tarball.
+    (Closes: #319985)
+  * Make package binNMU-safe.
+
+ -- Thijs Kinkhorst <[EMAIL PROTECTED]>  Thu, 12 Oct 2006 15:27:16 +0200
+
 snack (2.2.9-1) unstable; urgency=low
 
   * New upstream release (closes: #294713)
diff -Nru /tmp/T6SYQ8kJMk/snack-2.2.9/debian/control /tmp/6lCwPLWknq/snack-2.2.9.dfsg/debian/control
--- /tmp/T6SYQ8kJMk/snack-2.2.9/debian/control	2006-10-12 15:56:51.000000000 +0200
+++ /tmp/6lCwPLWknq/snack-2.2.9.dfsg/debian/control	2006-10-12 15:56:51.000000000 +0200
@@ -2,7 +2,7 @@
 Section: sound
 Priority: extra
 Maintainer: David A. van Leeuwen <[EMAIL PROTECTED]>
-Build-depends: tk8.4-dev, debhelper, libogg-dev, libvorbis-dev, libx11-dev
+Build-Depends: tk8.4-dev, debhelper (>= 5), libogg-dev, libvorbis-dev, libx11-dev, dpkg-dev (>=1.13.19)
 Standards-Version: 3.6.1
 
 Package: libsnack2
@@ -28,7 +28,7 @@
 
 Package: libsnack2-dev
 Architecture: all
-Depends: libsnack2 (= ${Source-Version}), libc6-dev
+Depends: libsnack2 (>= ${source:Version}), libc6-dev
 Replaces: snack-dev
 Section: libdevel
 Description: Snack development files
diff -Nru /tmp/T6SYQ8kJMk/snack-2.2.9/debian/copyright /tmp/6lCwPLWknq/snack-2.2.9.dfsg/debian/copyright
--- /tmp/T6SYQ8kJMk/snack-2.2.9/debian/copyright	2006-10-12 15:56:51.000000000 +0200
+++ /tmp/6lCwPLWknq/snack-2.2.9.dfsg/debian/copyright	2006-10-12 15:56:51.000000000 +0200
@@ -3,6 +3,9 @@
 
 It was downloaded from http://www.speech.kth.se/snack
 
+The file demos/tcl/tclkit-linux-x86 has been removed from the upstream
+tarball because it lacks source code.
+
 Distributed under the Gnu general public license, see
 /usr/share/common-licenses/GPL
 
diff -Nru /tmp/T6SYQ8kJMk/snack-2.2.9/debian/libsnack2-dev.install /tmp/6lCwPLWknq/snack-2.2.9.dfsg/debian/libsnack2-dev.install
--- /tmp/T6SYQ8kJMk/snack-2.2.9/debian/libsnack2-dev.install	1970-01-01 01:00:00.000000000 +0100
+++ /tmp/6lCwPLWknq/snack-2.2.9.dfsg/debian/libsnack2-dev.install	2006-10-12 15:56:51.000000000 +0200
@@ -0,0 +1,2 @@
+unix/snackConfig.sh	usr/lib
+generic/*.h		/usr/include
diff -Nru /tmp/T6SYQ8kJMk/snack-2.2.9/debian/libsnack2-doc.install /tmp/6lCwPLWknq/snack-2.2.9.dfsg/debian/libsnack2-doc.install
--- /tmp/T6SYQ8kJMk/snack-2.2.9/debian/libsnack2-doc.install	1970-01-01 01:00:00.000000000 +0100
+++ /tmp/6lCwPLWknq/snack-2.2.9.dfsg/debian/libsnack2-doc.install	2006-10-12 15:56:51.000000000 +0200
@@ -0,0 +1,3 @@
+doc/*			usr/share/doc/libsnack2/html
+demos/python/*		usr/share/doc/libsnack2/examples/python
+demos/tcl/*		usr/share/doc/libsnack2/examples/tcl
diff -Nru /tmp/T6SYQ8kJMk/snack-2.2.9/debian/rules /tmp/6lCwPLWknq/snack-2.2.9.dfsg/debian/rules
--- /tmp/T6SYQ8kJMk/snack-2.2.9/debian/rules	2006-10-12 15:56:51.000000000 +0200
+++ /tmp/6lCwPLWknq/snack-2.2.9.dfsg/debian/rules	2006-10-12 15:56:51.000000000 +0200
@@ -6,7 +6,7 @@
 # export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=1
+export DH_COMPAT=5
 # DvL Package names
 MAIN=libsnack2
 DOC=libsnack2-doc
@@ -52,7 +52,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) -C unix SNACK_INSTALL_PATH=../debian/tmp/usr/lib install
+	$(MAKE) -C unix SNACK_INSTALL_PATH=../debian/libsnack2/usr/lib install
 
 # Build architecture-dependent files here.
 # binary-arch: DH_OPTIONS=-p${MAIN}
@@ -86,56 +86,26 @@
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a
-	dh_builddeb -a -p${MAIN}
+	dh_builddeb -a
 
-# binary-dev: DH_OPTIONS=-p${DEV}
-binary-dev: build 
+binary-indep: build
 	dh_testdir -i
 	dh_testroot -i
-	dh_clean -k -i
 	dh_installdirs -i
+	dh_install -i
 	dh_installdocs -i README
 	dh_installchangelogs -i changes
-	install -m 644 unix/snackConfig.sh debian/${DEV}/usr/lib
-	install -m 644 generic/*.h debian/${DEV}/usr/include
+	-rm debian/libsnack2-doc/usr/share/doc/libsnack2/examples/tcl/freewrap
 	dh_link -i
 	dh_strip -i
 	dh_compress -i
 	dh_fixperms -i
+	chmod +x debian/libsnack2-doc/usr/share/doc/libsnack2/examples/tcl/*.tcl
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i
-	dh_builddeb -i -p${DEV}
+	dh_builddeb -i
 
-binary-doc: build
-	dh_testdir -i
-	dh_testroot -i
-	dh_clean -k -i
-	dh_installdirs -i
-	install -m 644 doc/* debian/${DOC}/usr/share/doc/${MAIN}/html
-	dh_installdocs -i README
-	dh_installchangelogs -i changes
-	dh_link -i
-	dh_strip -i
-	dh_compress -i
-#	this does _not_ work:
-#	dh_installexamples -v demos/*
-#	mv debian/${DOC}/usr/share/doc/${DOC}/examples/* debian/${DOC}/usr/share/doc/${MAIN}/examples
-	install -m 644 demos/python/* debian/${DOC}/usr/share/doc/${MAIN}/examples/python
-	install -m 644 demos/tcl/* debian/${DOC}/usr/share/doc/${MAIN}/examples/tcl
-	-rm debian/${DOC}/usr/share/doc/${MAIN}/examples/tcl/freewrap
-	dh_fixperms -i
-#	this is a binary!---not in -doc
-#	rm debian/${DOC}/usr/share/doc/${MAIN}/examples/tcl/freewrap
-	chmod +x debian/${DOC}/usr/share/doc/${MAIN}/examples/tcl/*.tcl
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i -p${DOC}
-
-binary-indep: build 
-	$(MAKE) -f debian/rules DH_OPTIONS="-p${DEV}" binary-dev
-	$(MAKE) -f debian/rules DH_OPTIONS="-p${DOC}" binary-doc
 
 # DvL: order is important!
 binary: binary-arch binary-indep
Binary files /tmp/T6SYQ8kJMk/snack-2.2.9/demos/tcl/tclkit-linux-x86 and /tmp/6lCwPLWknq/snack-2.2.9.dfsg/demos/tcl/tclkit-linux-x86 differ

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to