tag 442565 pending thanks Kartik Mistry <[EMAIL PROTECTED]> (19/09/2007): > Please find attached patch to fix these bugs (FTBFS if built twice in > a row).
Thanks, I've tweaked it a bit, and prepared an NMU, which is planned to
be uploaded RSN. Source debdiff is attached, with the config.{guess,sub}
part stripped.
Cheers,
--
Cyril Brulebois
diff -u fldiff-1.1/debian/changelog fldiff-1.1/debian/changelog
--- fldiff-1.1/debian/changelog
+++ fldiff-1.1/debian/changelog
@@ -1,3 +1,23 @@
+fldiff (1.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix double-build FTBFS (Closes: #424272, #442565), thanks to Kartik
+ Mistry for his original patch:
+ - Call “$(MAKE) clean” instead of “$(MAKE) clean” so that configure
+ doesn't get lost.
+ - Get rid of config.log, config.status, and Makefile through the
+ dh_clean call.
+ - No longer ignore make clean errors.
+ * Also get rid of fldiff.list through dh_clean, since it is
+ (re)generated during the build. It is now kept out of the Debian diff.
+ * Move the autotool-dev code snippet to update config.{guess,sub} from
+ the clean target to the config.status one, and delete these files
+ through dh_clean, so as to keep their update out of the Debian diff.
+ * Move the Homepage from the description to a source field.
+ * Bump Standards-Version from 3.7.2 to 3.7.3, no changes needed.
+
+ -- Cyril Brulebois <[EMAIL PROTECTED]> Tue, 26 Feb 2008 23:00:40 +0100
+
fldiff (1.1-1) unstable; urgency=low
* New upstream release.
diff -u fldiff-1.1/debian/control fldiff-1.1/debian/control
--- fldiff-1.1/debian/control
+++ fldiff-1.1/debian/control
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Khalid El Fathi <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 4.0.0), autotools-dev, libfltk1.1-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://www.easysw.com/~mike/fldiff/
Package: fldiff
Architecture: any
@@ -19,2 +19,0 @@
- .
- Homepage: http://www.easysw.com/~mike/fldiff/
diff -u fldiff-1.1/debian/rules fldiff-1.1/debian/rules
--- fldiff-1.1/debian/rules
+++ fldiff-1.1/debian/rules
@@ -27,6 +27,13 @@
config.status: configure
dh_testdir
# Add here commands to configure the package.
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info
@@ -47,16 +54,9 @@
rm -f build-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
+ [ ! -f Makefile ] || $(MAKE) clean
- dh_clean
+ dh_clean config.log config.status Makefile fldiff.list config.guess
config.sub
install: build
dh_testdir
signature.asc
Description: Digital signature
