r12486 - packages/trunk/glfw/debian

[Bruno Fuddl-guestquot; Fuddl" Kleinert]

Author: fuddl-guest
Date: 2011-07-01 13:51:45 +0000 (Fri, 01 Jul 2011)
New Revision: 12486

Modified:
   packages/trunk/glfw/debian/changelog
   packages/trunk/glfw/debian/rules
Log:
Make quilt apply *all* patches, not just the first one


Modified: packages/trunk/glfw/debian/changelog
===================================================================
--- packages/trunk/glfw/debian/changelog	2011-06-30 15:26:45 UTC (rev 12485)
+++ packages/trunk/glfw/debian/changelog	2011-07-01 13:51:45 UTC (rev 12486)
@@ -1,3 +1,11 @@
+glfw (2.6-4) unstable; urgency=low
+
+  * Team upload.
+  * Really fix #558904, as only the first quilt patch was applied but not that
+    one from the previous upload. (Closes: #558904)
+
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 01 Jul 2011 15:43:16 +0200
+
 glfw (2.6-3) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/glfw/debian/rules
===================================================================
--- packages/trunk/glfw/debian/rules	2011-06-30 15:26:45 UTC (rev 12485)
+++ packages/trunk/glfw/debian/rules	2011-07-01 13:51:45 UTC (rev 12486)
@@ -3,7 +3,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push || test $$? = 2	
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2	
 	PREFIX=/usr sh compile.sh
 	
 	touch configure-stamp
@@ -23,7 +23,7 @@
 	
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) x11-clean
-	QUILT_PATCHES=debian/patches quilt pop -R || test $$? = 2
+	QUILT_PATCHES=debian/patches quilt pop -R -a || test $$? = 2
 	rm -rf .pc 
 	dh_clean build-stamp configure-stamp