Bug#442765: Patch for this bug: wput: FTBFS if build twice in a row

[Cyril Brulebois]

Kartik Mistry <[EMAIL PROTECTED]> (19/09/2007):
> tag 442765 patch
> thanks
> 
> Please find attached patch to fix this bug (wput: FTBFS if built twice
> in a row).

Thanks for the patch. I tweaked it a bit, fixed some other things, and
got the resulting package sponsored. Unfortunately, it wasn't uploaded
to DELAYED/n, but directly to the archive, sorry about that.

Anyway, please find attached the debdiff (with config.{guess,sub} parts
stripped).

Cheers,

-- 
Cyril Brulebois

reverted:
--- wput-0.6/debian/dirs
+++ wput-0.6.orig/debian/dirs
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
diff -u wput-0.6/debian/control wput-0.6/debian/control
--- wput-0.6/debian/control
+++ wput-0.6/debian/control
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Khalid El Fathi <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 4.0.0), libgnutls-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://wput.sourceforge.net/
 
 Package: wput
 Architecture: any
@@ -17,2 +17,0 @@
- .
- Homepage: http://wput.sourceforge.net/
diff -u wput-0.6/debian/changelog wput-0.6/debian/changelog
--- wput-0.6/debian/changelog
+++ wput-0.6/debian/changelog
@@ -1,3 +1,25 @@
+wput (0.6-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix double-build FTBFS (Closes: #442765) by tweaking debian/rules:
+     - Call “$(MAKE) clean” rather than “$(MAKE) distclean” since the
+       latter doesn't exist.
+     - Don't ignore “$(MAKE) clean” errors anymore, by checking for the
+       presence of a Makefile.
+     - Do not remove config.status since it's needed for the “clean” run
+       in po/Makefile.
+     - Remove doc/wput.1.gz through dh_clean.
+     - Based on a patch by Kartik Mistry.
+  * Move the config.{guess,sub} update to the config.status target, remove
+    them in the clean target, they are now kept out of the Debian diff.
+  * Use dh_install on wput and doc/wput.1, remove now useless gzip call,
+    as well as useless (commented) dh_* calls.
+  * Delete debian/dirs, no longer needed now that dh_install is used.
+  * 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 18:52:18 +0100
+
 wput (0.6-1) unstable; urgency=low
 
   * New upstream release.
diff -u wput-0.6/debian/rules wput-0.6/debian/rules
--- wput-0.6/debian/rules
+++ wput-0.6/debian/rules
@@ -27,6 +27,12 @@
 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
 
 
@@ -45,19 +51,11 @@
        dh_testdir
        dh_testroot
        rm -f build-stamp 
-       rm -f $(CURDIR)/config.status
 
        # 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 doc/wput.1.gz config.guess config.sub
 
 install: build
        dh_testdir
@@ -67,9 +65,8 @@
 
        # Add here commands to install the package into debian/wput.
        #$(MAKE) install prefix=$(CURDIR)/debian/wput/usr
-       install $(CURDIR)/wput $(CURDIR)/debian/wput/usr/bin
-       gzip -9c $(CURDIR)/doc/wput.1 > $(CURDIR)/doc/wput.1.gz
-       install $(CURDIR)/doc/wput.1.gz 
$(CURDIR)/debian/wput/usr/share/man/man1/
+       dh_install wput usr/bin
+       dh_installman doc/wput.1
 
 
 # Build architecture-independent files here.
@@ -82,25 +79,9 @@
        dh_testroot
        dh_installchangelogs ChangeLog
        dh_installdocs
-#      dh_installexamples
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman
-#      dh_link
        dh_strip
        dh_compress
        dh_fixperms
-#      dh_perl
-#      dh_python
-#      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol

signature.asc
Description: Digital signature