r3861 - in packages/trunk/sauerbraten/debian: . patches

[Bruno Fuddl-guestquot; Fuddl" Kleinert]

Author: fuddl-guest
Date: 2007-08-26 19:57:43 +0000 (Sun, 26 Aug 2007)
New Revision: 3861

Added:
   packages/trunk/sauerbraten/debian/patches/
   packages/trunk/sauerbraten/debian/patches/00list
   packages/trunk/sauerbraten/debian/patches/10_fix_clean_target.dpatch
Modified:
   packages/trunk/sauerbraten/debian/changelog
   packages/trunk/sauerbraten/debian/rules
Log:
add dpatch to fix broken clean target in toplevel makefile

Modified: packages/trunk/sauerbraten/debian/changelog
===================================================================
--- packages/trunk/sauerbraten/debian/changelog	2007-08-26 18:47:23 UTC (rev 3860)
+++ packages/trunk/sauerbraten/debian/changelog	2007-08-26 19:57:43 UTC (rev 3861)
@@ -6,6 +6,7 @@
     this in this release) (Closes: #426691)
   * Remove 10_search_home_for_config.dpatch (Upstream solved this in this
     release)
+  * Add 10_fix_clean_target.dpatch to avoid calling autotools in clean target
   * Add NEWS.Debian
 
   [ Cyril Brulebois ]

Added: packages/trunk/sauerbraten/debian/patches/00list
===================================================================
--- packages/trunk/sauerbraten/debian/patches/00list	                        (rev 0)
+++ packages/trunk/sauerbraten/debian/patches/00list	2007-08-26 19:57:43 UTC (rev 3861)
@@ -0,0 +1 @@
+10_fix_clean_target.dpatch

Added: packages/trunk/sauerbraten/debian/patches/10_fix_clean_target.dpatch
===================================================================
--- packages/trunk/sauerbraten/debian/patches/10_fix_clean_target.dpatch	                        (rev 0)
+++ packages/trunk/sauerbraten/debian/patches/10_fix_clean_target.dpatch	2007-08-26 19:57:43 UTC (rev 3861)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_clean_target.dpatch by  <fuddl at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad sauerbraten-0.0.20070819.dfsg~/Makefile sauerbraten-0.0.20070819.dfsg/Makefile
+--- sauerbraten-0.0.20070819.dfsg~/Makefile	2007-08-17 14:07:14.000000000 +0200
++++ sauerbraten-0.0.20070819.dfsg/Makefile	2007-08-26 21:48:01.066603274 +0200
+@@ -56,9 +56,9 @@
+ libenet: enet/Makefile
+ 	$(MAKE)	-C enet/ all
+ 
+-clean: enet/Makefile
++clean:
+ 	-$(RM) $(SERVER_OBJS) $(CLIENT_OBJS) sauer_server sauer_client
+-	$(MAKE)	-C enet/ clean
++	-$(MAKE) -C enet/ distclean
+ 
+ engine/server-standalone.o:
+ 	$(CXX) $(CXXFLAGS) -DSTANDALONE	-c -o engine/server-standalone.o engine/server.cpp


Property changes on: packages/trunk/sauerbraten/debian/patches/10_fix_clean_target.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/trunk/sauerbraten/debian/rules
===================================================================
--- packages/trunk/sauerbraten/debian/rules	2007-08-26 18:47:23 UTC (rev 3860)
+++ packages/trunk/sauerbraten/debian/rules	2007-08-26 19:57:43 UTC (rev 3861)
@@ -1,19 +1,22 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-build:
+include /usr/share/dpatch/dpatch.make
+
+build: build-stamp
+build-stamp: patch
 	dh_testdir
 	uudecode -o sauerbraten.png debian/sauerbraten.png.uu
 	convert sauerbraten.png sauerbraten.xpm
 	$(MAKE)
 	touch $@
 
-clean:
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	$(MAKE) clean
-	$(MAKE) -C enet distclean
 	rm -f sauerbraten.png sauerbraten.xpm
 	dh_clean