r10081 - in packages/trunk/excellent-bifurcation/debian: . patches

[Miriam Ruiz]

Author: miriam
Date: 2009-07-27 12:15:30 +0000 (Mon, 27 Jul 2009)
New Revision: 10081

Added:
   packages/trunk/excellent-bifurcation/debian/patches/config_file.patch
Modified:
   packages/trunk/excellent-bifurcation/debian/changelog
   packages/trunk/excellent-bifurcation/debian/control
   packages/trunk/excellent-bifurcation/debian/patches/series
Log:
Save init.d according to XDG base directory specifications and not in the current directory. Closes: #530630
Build-depends on libxdg-basedir-dev (>= 1.0.0) and pkg-config
Bumped Standards-Version to 3.8.2



Modified: packages/trunk/excellent-bifurcation/debian/changelog
===================================================================
--- packages/trunk/excellent-bifurcation/debian/changelog	2009-07-27 10:28:29 UTC (rev 10080)
+++ packages/trunk/excellent-bifurcation/debian/changelog	2009-07-27 12:15:30 UTC (rev 10081)
@@ -1,3 +1,12 @@
+excellent-bifurcation (0.0.20071015-2) UNRELEASED; urgency=low
+
+  * Save init.d according to XDG base directory specifications and not
+    in the current directory. Closes: #530630
+  * Build-depends on libxdg-basedir-dev and pkg-config
+  * Bumped Standards-Version to 3.8.2
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Mon, 27 Jul 2009 13:24:30 +0200
+
 excellent-bifurcation (0.0.20071015-1) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/excellent-bifurcation/debian/control
===================================================================
--- packages/trunk/excellent-bifurcation/debian/control	2009-07-27 10:28:29 UTC (rev 10080)
+++ packages/trunk/excellent-bifurcation/debian/control	2009-07-27 12:15:30 UTC (rev 10081)
@@ -3,8 +3,9 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5), quilt, dh-buildinfo, liballegro4.2-dev
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 5), quilt, dh-buildinfo, pkg-config,
+ liballegro4.2-dev, libxdg-basedir-dev (>= 1.0.0)
+Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/excellent-bifurcation/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/excellent-bifurcation/?op=log
 

Added: packages/trunk/excellent-bifurcation/debian/patches/config_file.patch
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/config_file.patch	                        (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/patches/config_file.patch	2009-07-27 12:15:30 UTC (rev 10081)
@@ -0,0 +1,70 @@
+# Copyright (C) 2009  Miriam Ruiz <little_miry at yahoo.es>
+# Distributed under the same license as the game. See debian/copyright.
+
+--- excellent-bifurcation-0.0.20071015.orig/src/Makefile
++++ excellent-bifurcation-0.0.20071015/src/Makefile
+@@ -1,5 +1,8 @@
+ CC=gcc
+ CFLAGS=-Wall -O2
++PKGCONFIG_FILES=libxdg-basedir
++PKGCONFIG_CFLAGS= `pkg-config $(PKGCONFIG_FILES) --cflags`
++PKGCONFIG_LDFLAGS= `pkg-config $(PKGCONFIG_FILES) --libs`
+ LDFLAGS=-lalleg-4.2.2
+ SOURCES=$(shell find . -name "*.c")
+ OBJECTS=$(SOURCES:.c=.o)
+@@ -8,10 +11,10 @@
+ all: $(SOURCES) $(EXECUTABLE)
+ 
+ $(EXECUTABLE): $(OBJECTS) 
+-	$(CC) $(LDFLAGS) $(OBJECTS) -o $@
++	$(CC) $(LDFLAGS) $(PKGCONFIG_LDFLAGS) $(OBJECTS) -o $@
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(PKGCONFIG_CFLAGS) `pkg-config libxdg-basedir --libs` -c $< -o $@
+ 
+ clean:
+ 	rm -f $(EXECUTABLE) $(OBJECTS)
+--- excellent-bifurcation-0.0.20071015.orig/src/main.c
++++ excellent-bifurcation-0.0.20071015/src/main.c
+@@ -49,6 +49,11 @@
+ #include "menu.h"
+ #include "sound.h"
+ 
++#include <basedir.h>
++#include <basedir_fs.h>
++#include <sys/stat.h>
++#include <limits.h>
++
+ // timer interupt functions and variables:
+ void framecount(void);
+ 
+@@ -106,6 +111,8 @@
+ 
+ int main(void)
+ {
++char FileName[PATH_MAX];
++xdgHandle xdg_handle;
+ 
+ int allint =  allegro_init();
+    if (allint == -1)
+@@ -115,7 +122,18 @@
+       exit(1);
+    }
+ 
+-   set_config_file("init.txt");
++   if (xdgInitHandle(&xdg_handle))
++   {
++      snprintf (FileName,sizeof(FileName),"%s/excellent-bifurcation",xdgConfigHome(&xdg_handle));
++      xdgMakePath(FileName, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++      snprintf (FileName,sizeof(FileName),"%s/excellent-bifurcation/init.txt",xdgConfigHome(&xdg_handle));
++         xdgWipeHandle(&xdg_handle);
++      fprintf(stderr, "Config File: \"%s\"\n", FileName);
++      set_config_file(FileName);
++   } else {
++      fprintf(stderr, "Error initializing XDG Handle\n");
++      exit(1);
++   }
+ 
+    install_keyboard();
+    install_timer();

Modified: packages/trunk/excellent-bifurcation/debian/patches/series
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/series	2009-07-27 10:28:29 UTC (rev 10080)
+++ packages/trunk/excellent-bifurcation/debian/patches/series	2009-07-27 12:15:30 UTC (rev 10081)
@@ -1,2 +1,3 @@
 directories.patch
 windowed.patch
+config_file.patch