r10838 - packages/trunk/gimp-dds/debian

[Vincent Fourmond]

Author: fourmond
Date: 2010-03-14 00:49:58 +0000 (Sun, 14 Mar 2010)
New Revision: 10838

Modified:
   packages/trunk/gimp-dds/debian/changelog
   packages/trunk/gimp-dds/debian/rules
Log:
[gimp-dds] Apply KiBi trick to avoid FTBSes on non-linux arches, thanks !

Modified: packages/trunk/gimp-dds/debian/changelog
===================================================================
--- packages/trunk/gimp-dds/debian/changelog	2010-03-13 15:03:35 UTC (rev 10837)
+++ packages/trunk/gimp-dds/debian/changelog	2010-03-14 00:49:58 UTC (rev 10838)
@@ -1,3 +1,10 @@
+gimp-dds (2.0.9-2) unstable; urgency=low
+
+  * Modify debian/rules to use Makefile.linux on all arches, to avoid
+    FTBSes on the non-linux arches (closes: 573773)
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 14 Mar 2010 01:46:45 +0100
+
 gimp-dds (2.0.9-1) unstable; urgency=low
 
   * Drop dependency on quilt, unneeded for 3.0 (quilt)

Modified: packages/trunk/gimp-dds/debian/rules
===================================================================
--- packages/trunk/gimp-dds/debian/rules	2010-03-13 15:03:35 UTC (rev 10837)
+++ packages/trunk/gimp-dds/debian/rules	2010-03-14 00:49:58 UTC (rev 10838)
@@ -9,6 +9,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# We use the Makefile.linux as else it defaults to using the win32 one
+# on freebsd.
+MAKEFILE = -f Makefile.linux
 
 configure: configure-stamp
 
@@ -20,7 +23,7 @@
 
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE)
+	$(MAKE) $(MAKEFILE)
 	touch $@
 
 clean:
@@ -28,7 +31,7 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	$(MAKE) clean
+	$(MAKE) $(MAKEFILE) clean
 
 #	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	dh_clean