On Tue, 2006-10-24 at 19:04 -0700, Steve Langasek wrote: > On Wed, Oct 25, 2006 at 01:56:24AM +0100, Ben Hutchings wrote: > > The latest source package of xcdroast added a patch to make it call > > wodim. Unfortunately the binary package uploaded for i386 was built > > without this patch, possibly due to some incorrect dependencies in > > debian/rules. > > > I believe the other binary packages have been built with this patch and > > a binNMU of the i386 binary package would fix it for installations with > > an existing xcdroast configuration. > > A binNMU is not a correct solution for any bug which is sourceful in origin. > Incorrect dependencies in debian/rules are a sourceful bug.
I wasn't seriously suggesting it! But that does remind me that I should
post my changes to debian/rules as well.
Currently "build" depends on "configure-stamp", which depends on
"patch". However, "binary" only depends on "build-stamp", which depends
on neither "configure-stamp" or "patch". Less seriously,
"configure-stamp" depends on "patch", which means it is never up-to-date
and the configure step can be unnceessarily repeated.
This patch makes all the top-level targets - but none of the stamp files
- depend on "patch" and makes "build-stamp" depend on "configure-stamp".
diff -u xcdroast-0.98+0alpha15/debian/rules xcdroast-0.98+0alpha15/debian/rules
--- xcdroast-0.98+0alpha15/debian/rules
+++ xcdroast-0.98+0alpha15/debian/rules
@@ -21,13 +21,13 @@
endif
-configure: configure-stamp
-configure-stamp: patch
+configure: patch configure-stamp
+configure-stamp:
dh_testdir
cp /usr/share/misc/config.sub `pwd`/config.sub
cp /usr/share/misc/config.guess `pwd`/config.guess
-
+
rm configure; autoconf
# Add here commands to configure the package.
./configure --prefix=/usr \
@@ -39,8 +39,8 @@
touch configure-stamp
-build: configure-stamp build-stamp
-build-stamp:
+build: patch build-stamp
+build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
@@ -60,7 +60,7 @@
dh_clean
-install: build-stamp
+install: patch build-stamp
dh_testdir
dh_testroot
dh_clean -k
@@ -75,14 +75,14 @@
mkdir -p $(CURDIR)/debian/xcdroast/usr/share/xcdroast/
mv $(CURDIR)/debian/xcdroast/usr/lib/xcdroast/icons
$(CURDIR)/debian/xcdroast/usr/share/xcdroast/
-
+
# Build architecture-independent files here.
-binary-indep: build-stamp install
+binary-indep: install
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: build-stamp install
+binary-arch: install
# dh_testversion
dh_testdir
dh_testroot
-- END --
Ben.
--
Ben Hutchings -- [EMAIL PROTECTED] shortened to [EMAIL PROTECTED]
If you've signed my GPG key, please send a signature on and to the new uid.
Once a job is fouled up, anything done to improve it makes it worse.
signature.asc
Description: This is a digitally signed message part
