[pkg-ggz-commits] r254 - in ggz-server/trunk/debian: . patches

[josef-guest at alioth.debian.org]

Author: josef-guest
Date: 2007-07-23 07:45:47 +0000 (Mon, 23 Jul 2007)
New Revision: 254

Added:
   ggz-server/trunk/debian/patches/
   ggz-server/trunk/debian/patches/ggzd-statedir.diff
Modified:
   ggz-server/trunk/debian/changelog
   ggz-server/trunk/debian/rules
Log:
- fix installation: use correct directory with correct permissions (patch from GGZ SVN)



Modified: ggz-server/trunk/debian/changelog
===================================================================
--- ggz-server/trunk/debian/changelog	2007-07-19 19:54:14 UTC (rev 253)
+++ ggz-server/trunk/debian/changelog	2007-07-23 07:45:47 UTC (rev 254)
@@ -1,3 +1,10 @@
+ggz-server (0.0.14-2) UNRELEASED; urgency=low
+
+  * Included patch derived from r9205 from ggz-0-0-14-branch.
+    - Fixes read-only /usr/share installation error
+
+ -- Josef Spillner <josef at ggzgamingzone.org>  Mon, 23 July 2007 09:34:22 +0200
+
 ggz-server (0.0.14-1) unstable; urgency=low
 
   [ Josef Spillner ]

Added: ggz-server/trunk/debian/patches/ggzd-statedir.diff
===================================================================
--- ggz-server/trunk/debian/patches/ggzd-statedir.diff	                        (rev 0)
+++ ggz-server/trunk/debian/patches/ggzd-statedir.diff	2007-07-23 07:45:47 UTC (rev 254)
@@ -0,0 +1,68 @@
+Index: ggzd/ggzd/ggzduedit.c
+===================================================================
+--- ggzd/ggzd/ggzduedit.c	(Revision 9154)
++++ ggzd/ggzd/ggzduedit.c	(Arbeitskopie)
+@@ -515,7 +515,7 @@
+ 
+ 	if(!conn.datadir) {
+ 		if(!conn.database) {
+-			conn.datadir = GGZDDATADIR;
++			conn.datadir = GGZDSTATEDIR;
+ 		}
+ 	}
+ 
+Index: ggzd/ggzd/Makefile.am
+===================================================================
+--- ggzd/ggzd/Makefile.am	(Revision 9154)
++++ ggzd/ggzd/Makefile.am	(Arbeitskopie)
+@@ -64,6 +64,7 @@
+ 	$(HOWL_INCLUDES) \
+ 	$(AVAHI_INCLUDES) \
+ 	-DGGZDCONFDIR=\"$(ggzdconfdir)\" \
++	-DGGZDSTATEDIR=\"$(ggzdstatedir)\" \
+ 	-DGGZDEXECMODDIR=\"$(ggzdexecmoddir)\"
+ 
+ ggzd_LDFLAGS = $(LIBGGZ_LDFLAGS)
+@@ -87,6 +88,7 @@
+ 	-I$(top_srcdir)/ggzd/database \
+ 	-I$(top_srcdir)/ggzdmod \
+ 	-DGGZDCONFDIR=\"$(ggzdconfdir)\" \
++	-DGGZDSTATEDIR=\"$(ggzdstatedir)\" \
+ 	$(LIBGGZ_INCLUDES)
+ 
+ ggzduedit_LDFLAGS = $(LIBGGZ_LDFLAGS)
+Index: ggzd/ggzd/parse_opt.c
+===================================================================
+--- ggzd/ggzd/parse_opt.c	(Revision 9154)
++++ ggzd/ggzd/parse_opt.c	(Arbeitskopie)
+@@ -310,9 +310,9 @@
+ 	if(!opt.conf_dir)
+ 		opt.conf_dir = ggz_strdup(GGZDCONFDIR);
+ 
+-	/* If no data_dir, default it to DATADIR */
++	/* If no data_dir, default it to STATEDIR */
+ 	if(!opt.data_dir)
+-		opt.data_dir = ggz_strdup(GGZDDATADIR);
++		opt.data_dir = ggz_strdup(GGZDSTATEDIR);
+ 
+ 	/* If no main_port, default it to 5688 (or whatever) */
+ 	if(!opt.main_port)
+diff -Nur ggzd.orig/ggzd/Makefile.in ggzd/ggzd/Makefile.in
+--- ggzd.orig/ggzd/Makefile.in	2007-07-20 21:20:38.000000000 +0200
++++ ggzd/ggzd/Makefile.in	2007-07-20 21:09:39.000000000 +0200
+@@ -327,6 +327,7 @@
+ 	$(HOWL_INCLUDES) \
+ 	$(AVAHI_INCLUDES) \
+ 	-DGGZDCONFDIR=\"$(ggzdconfdir)\" \
++	-DGGZDSTATEDIR=\"$(ggzdstatedir)\" \
+ 	-DGGZDEXECMODDIR=\"$(ggzdexecmoddir)\"
+ 
+ ggzd_LDFLAGS = $(LIBGGZ_LDFLAGS)
+@@ -350,6 +351,7 @@
+ 	-I$(top_srcdir)/ggzd/database \
+ 	-I$(top_srcdir)/ggzdmod \
+ 	-DGGZDCONFDIR=\"$(ggzdconfdir)\" \
++	-DGGZDSTATEDIR=\"$(ggzdstatedir)\" \
+ 	$(LIBGGZ_INCLUDES)
+ 
+ ggzduedit_LDFLAGS = $(LIBGGZ_LDFLAGS)

Modified: ggz-server/trunk/debian/rules
===================================================================
--- ggz-server/trunk/debian/rules	2007-07-19 19:54:14 UTC (rev 253)
+++ ggz-server/trunk/debian/rules	2007-07-23 07:45:47 UTC (rev 254)
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --localstatedir=/var/lib --disable-debug
 DEB_DH_MAKESHLIBS_ARGS_ALL = -V