[pkg-ggz-commits] r26 - / 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
Wed Jul 12 15:35:49 UTC 2006 

Author: josef-guest
Date: 2006-07-12 15:35:47 +0000 (Wed, 12 Jul 2006)
New Revision: 26

Modified:
   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
   pkg-ggz-prepare.sh
Log:
- fix shell glob issue for patches
- sync all buildfiles, so we can upload ggz-server and then ggz-python



Modified: ggz-client-libs/rules.common.mk
===================================================================
--- ggz-client-libs/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-client-libs/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean
@@ -71,7 +71,7 @@
 	dh_clean
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(prefix)
+	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
 	$(MAKE) -f debian/rules RULES_MAKE
 
 	dh_install
@@ -80,7 +80,7 @@
 	dh_installdocs
 
 	dh_strip
-	dh_compress
+	dh_compress -X.docbook
 	dh_link
 	dh_fixperms
 	dh_makeshlibs -V

Modified: ggz-docs/rules.common.mk
===================================================================
--- ggz-docs/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-docs/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean
@@ -71,7 +71,7 @@
 	dh_clean
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(prefix)
+	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
 	$(MAKE) -f debian/rules RULES_MAKE
 
 	dh_install
@@ -80,7 +80,7 @@
 	dh_installdocs
 
 	dh_strip
-	dh_compress
+	dh_compress -X.docbook
 	dh_link
 	dh_fixperms
 	dh_makeshlibs -V

Modified: ggz-gnome-client/rules.common.mk
===================================================================
--- ggz-gnome-client/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-gnome-client/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean
@@ -71,7 +71,7 @@
 	dh_clean
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(prefix)
+	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
 	$(MAKE) -f debian/rules RULES_MAKE
 
 	dh_install
@@ -80,7 +80,7 @@
 	dh_installdocs
 
 	dh_strip
-	dh_compress
+	dh_compress -X.docbook
 	dh_link
 	dh_fixperms
 	dh_makeshlibs -V

Modified: ggz-grubby/rules.common.mk
===================================================================
--- ggz-grubby/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-grubby/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean
@@ -71,7 +71,7 @@
 	dh_clean
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(prefix)
+	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
 	$(MAKE) -f debian/rules RULES_MAKE
 
 	dh_install
@@ -80,7 +80,7 @@
 	dh_installdocs
 
 	dh_strip
-	dh_compress
+	dh_compress -X.docbook
 	dh_link
 	dh_fixperms
 	dh_makeshlibs -V

Modified: ggz-gtk-client/rules.common.mk
===================================================================
--- ggz-gtk-client/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-gtk-client/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean
@@ -71,7 +71,7 @@
 	dh_clean
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(prefix)
+	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
 	$(MAKE) -f debian/rules RULES_MAKE
 
 	dh_install
@@ -80,7 +80,7 @@
 	dh_installdocs
 
 	dh_strip
-	dh_compress
+	dh_compress -X.docbook
 	dh_link
 	dh_fixperms
 	dh_makeshlibs -V

Modified: ggz-gtk-games/rules.common.mk
===================================================================
--- ggz-gtk-games/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-gtk-games/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean
@@ -71,7 +71,7 @@
 	dh_clean
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(prefix)
+	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
 	$(MAKE) -f debian/rules RULES_MAKE
 
 	dh_install
@@ -80,7 +80,7 @@
 	dh_installdocs
 
 	dh_strip
-	dh_compress
+	dh_compress -X.docbook
 	dh_link
 	dh_fixperms
 	dh_makeshlibs -V

Modified: ggz-kde-client/rules.common.mk
===================================================================
--- ggz-kde-client/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-kde-client/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean

Modified: ggz-kde-games/rules.common.mk
===================================================================
--- ggz-kde-games/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-kde-games/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean

Modified: ggz-python/rules.common.mk
===================================================================
--- ggz-python/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-python/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean
@@ -71,7 +71,7 @@
 	dh_clean
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(prefix)
+	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
 	$(MAKE) -f debian/rules RULES_MAKE
 
 	dh_install
@@ -80,7 +80,7 @@
 	dh_installdocs
 
 	dh_strip
-	dh_compress
+	dh_compress -X.docbook
 	dh_link
 	dh_fixperms
 	dh_makeshlibs -V

Modified: ggz-sdl-games/rules.common.mk
===================================================================
--- ggz-sdl-games/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-sdl-games/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean
@@ -71,7 +71,7 @@
 	dh_clean
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(prefix)
+	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
 	$(MAKE) -f debian/rules RULES_MAKE
 
 	dh_install
@@ -80,7 +80,7 @@
 	dh_installdocs
 
 	dh_strip
-	dh_compress
+	dh_compress -X.docbook
 	dh_link
 	dh_fixperms
 	dh_makeshlibs -V

Modified: ggz-server/rules.common.mk
===================================================================
--- ggz-server/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-server/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean
@@ -71,7 +71,7 @@
 	dh_clean
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(prefix)
+	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
 	$(MAKE) -f debian/rules RULES_MAKE
 
 	dh_install
@@ -80,7 +80,7 @@
 	dh_installdocs
 
 	dh_strip
-	dh_compress
+	dh_compress -X.docbook
 	dh_link
 	dh_fixperms
 	dh_makeshlibs -V

Modified: ggz-txt-client/rules.common.mk
===================================================================
--- ggz-txt-client/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-txt-client/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean
@@ -71,7 +71,7 @@
 	dh_clean
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(prefix)
+	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
 	$(MAKE) -f debian/rules RULES_MAKE
 
 	dh_install
@@ -80,7 +80,7 @@
 	dh_installdocs
 
 	dh_strip
-	dh_compress
+	dh_compress -X.docbook
 	dh_link
 	dh_fixperms
 	dh_makeshlibs -V

Modified: ggz-utils/rules.common.mk
===================================================================
--- ggz-utils/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ ggz-utils/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean
@@ -71,7 +71,7 @@
 	dh_clean
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(prefix)
+	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
 	$(MAKE) -f debian/rules RULES_MAKE
 
 	dh_install
@@ -80,7 +80,7 @@
 	dh_installdocs
 
 	dh_strip
-	dh_compress
+	dh_compress -X.docbook
 	dh_link
 	dh_fixperms
 	dh_makeshlibs -V

Modified: libggz/rules.common.mk
===================================================================
--- libggz/rules.common.mk	2006-07-10 10:09:49 UTC (rev 25)
+++ libggz/rules.common.mk	2006-07-12 15:35:47 UTC (rev 26)
@@ -39,7 +39,7 @@
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	if test -d debian/patches; then \
+	if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -p1; \
 	fi
 	$(SHELL) ./configure $(config_flags) \
@@ -56,7 +56,7 @@
 clean:	checkroot
 	rm -f *-stamp
 	-$(MAKE) distclean
-	-if test -d debian/patches; then \
+	-if ! test -z "$(patches)"; then \
 		cat $(patches) | patch -R -p1; \
 	fi
 	dh_clean
@@ -71,7 +71,7 @@
 	dh_clean
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(prefix)
+	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
 	$(MAKE) -f debian/rules RULES_MAKE
 
 	dh_install
@@ -80,7 +80,7 @@
 	dh_installdocs
 
 	dh_strip
-	dh_compress
+	dh_compress -X.docbook
 	dh_link
 	dh_fixperms
 	dh_makeshlibs -V

Modified: pkg-ggz-prepare.sh
===================================================================
--- pkg-ggz-prepare.sh	2006-07-10 10:09:49 UTC (rev 25)
+++ pkg-ggz-prepare.sh	2006-07-12 15:35:47 UTC (rev 26)
@@ -47,6 +47,7 @@
 			tar xzf $base\_$version.orig.tar.gz
 			cp -r ../$pkgdir/$base $base-$version/debian
 			rm -rf $base-$version/debian/.svn
+			rm -rf $base-$version/debian/patches/.svn
 			cd ..
 		else
 			echo "Skip $base..."

More information about the pkg-ggz-commits mailing list