[pkg-ggz-commits] r6 - / ggz-client-libs ggz-docs ggz-gnome-client ggz-grubby ggz-gtk-client ggz-gtk-games ggz-kde-client ggz-kde-games ggz-python ggz-sdl-games ggz-server ggz-txt-client ggz-utils libggz

Josef Spillner josef-guest at costa.debian.org
Thu Jan 26 14:40:56 UTC 2006


Author: josef-guest
Date: 2006-01-26 14:40:54 +0000 (Thu, 26 Jan 2006)
New Revision: 6

Modified:
   README.debian
   ggz-client-libs/rules.common.mk
   ggz-docs/rules.common.mk
   ggz-gnome-client/rules.common.mk
   ggz-grubby/rules.common.mk
   ggz-gtk-client/rules.common.mk
   ggz-gtk-games/rules.common.mk
   ggz-kde-client/rules.common.mk
   ggz-kde-games/rules.common.mk
   ggz-python/rules.common.mk
   ggz-sdl-games/rules.common.mk
   ggz-server/rules.common.mk
   ggz-txt-client/rules.common.mk
   ggz-utils/rules.common.mk
   libggz/rules.common.mk
Log:
- synchronisation of all rules.common.mk files
- addition of cdbs to todo list (only had time for a quick look)



Modified: README.debian
===================================================================
--- README.debian	2006-01-14 12:03:20 UTC (rev 5)
+++ README.debian	2006-01-26 14:40:54 UTC (rev 6)
@@ -40,7 +40,7 @@
 - manpages for ggz-python (partially fixed for 0.0.13!)
 - optional full PostgreSQL-enabled ggz-server package with debconf setup?
 - internationalization of description files
-- patch usage in debian/rules (for now in ggz-docs and ggz-python)
+- conversion to CDBS?
 
 Open questions:
 ---------------

Modified: ggz-client-libs/rules.common.mk
===================================================================
--- ggz-client-libs/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-client-libs/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,9 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -49,12 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: ggz-docs/rules.common.mk
===================================================================
--- ggz-docs/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-docs/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,10 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	patch -p1 < $(wildcard debian/patches/*.diff)
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -50,13 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
-	-patch -R -p1 < $(wildcard debian/patches/*.diff)
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: ggz-gnome-client/rules.common.mk
===================================================================
--- ggz-gnome-client/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-gnome-client/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,9 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -49,12 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: ggz-grubby/rules.common.mk
===================================================================
--- ggz-grubby/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-grubby/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,9 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -49,12 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: ggz-gtk-client/rules.common.mk
===================================================================
--- ggz-gtk-client/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-gtk-client/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,9 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -49,12 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: ggz-gtk-games/rules.common.mk
===================================================================
--- ggz-gtk-games/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-gtk-games/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,9 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -49,12 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: ggz-kde-client/rules.common.mk
===================================================================
--- ggz-kde-client/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-kde-client/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,9 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -49,12 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: ggz-kde-games/rules.common.mk
===================================================================
--- ggz-kde-games/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-kde-games/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,9 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -49,12 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: ggz-python/rules.common.mk
===================================================================
--- ggz-python/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-python/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,10 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	patch -p1 < $(wildcard debian/patches/*.diff)
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -50,13 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
-	-patch -R -p1 < $(wildcard debian/patches/*.diff)
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: ggz-sdl-games/rules.common.mk
===================================================================
--- ggz-sdl-games/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-sdl-games/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,9 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -49,12 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: ggz-server/rules.common.mk
===================================================================
--- ggz-server/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-server/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,9 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -49,12 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: ggz-txt-client/rules.common.mk
===================================================================
--- ggz-txt-client/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-txt-client/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,9 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -49,12 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: ggz-utils/rules.common.mk
===================================================================
--- ggz-utils/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ ggz-utils/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,9 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -49,12 +54,12 @@
 	touch $@
 
 clean:	checkroot
-	dh_clean
 	rm -f *-stamp
-	rm -f config.log
-	rm -f config.status
-	rm -f debian/files
 	-$(MAKE) distclean
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
+	dh_clean
 
 ### misc rules
 

Modified: libggz/rules.common.mk
===================================================================
--- libggz/rules.common.mk	2006-01-14 12:03:20 UTC (rev 5)
+++ libggz/rules.common.mk	2006-01-26 14:40:54 UTC (rev 6)
@@ -34,9 +34,14 @@
 ### configure the package
 ### the RULES_CONFIGURE come from debian/rules
 
+patches = $(wildcard debian/patches/*.diff)
+
 config:	config-stamp
 config-stamp:
 	dh_testdir
+	if test -d debian/patches; then \
+		cat $(patches) | patch -p1; \
+	fi
 	$(SHELL) ./configure $(config_flags) \
 		$(RULES_CONFIGURE)
 	touch $@
@@ -51,6 +56,9 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
+	-if test -d debian/patches; then \
+		cat $(patches) | patch -R -p1; \
+	fi
 	dh_clean
 
 ### misc rules




More information about the pkg-ggz-commits mailing list