r10177 - in packages/trunk/neverball/debian: . patches

[Jordà Polo]

Author: jorda-guest
Date: 2009-08-22 15:39:40 +0000 (Sat, 22 Aug 2009)
New Revision: 10177

Modified:
   packages/trunk/neverball/debian/changelog
   packages/trunk/neverball/debian/patches/data_path.patch
Log:
Update patch: data and locale paths are now set using the Makefile


Modified: packages/trunk/neverball/debian/changelog
===================================================================
--- packages/trunk/neverball/debian/changelog	2009-08-22 14:30:46 UTC (rev 10176)
+++ packages/trunk/neverball/debian/changelog	2009-08-22 15:39:40 UTC (rev 10177)
@@ -5,6 +5,8 @@
   * debian/control:
     + Suggest ttf-wqy-zenhei, used for the Chinese translation.
     + Add build-dependency on libphysfs-dev.
+  * debian/patches/data_path.patch: Update patch; data and locale paths
+    are now set using the Makefile.
 
  -- Jordà Polo <jorda at ettin.org>  Wed, 19 Aug 2009 19:36:43 +0200
 

Modified: packages/trunk/neverball/debian/patches/data_path.patch
===================================================================
--- packages/trunk/neverball/debian/patches/data_path.patch	2009-08-22 14:30:46 UTC (rev 10176)
+++ packages/trunk/neverball/debian/patches/data_path.patch	2009-08-22 15:39:40 UTC (rev 10177)
@@ -1,16 +1,13 @@
---- neverball-1.4.0+svn2098.orig/share/base_config.h
-+++ neverball-1.4.0+svn2098/share/base_config.h
-@@ -30,11 +30,11 @@
- #endif
+--- a/Makefile
++++ b/Makefile
+@@ -27,8 +27,8 @@ endif
+ # Paths (packagers might want to set DATADIR and LOCALEDIR)
  
- #ifndef CONFIG_DATA
--#define CONFIG_DATA   "./data"        /* Game data directory */
-+#define CONFIG_DATA   "/usr/share/games/neverball"   /* Game data directory */
- #endif
+ USERDIR   := .neverball
+-DATADIR   := ./data
+-LOCALEDIR := ./locale
++DATADIR   := /usr/share/games/neverball
++LOCALEDIR := /usr/share/locale
  
- #ifndef CONFIG_LOCALE
--#define CONFIG_LOCALE "./locale"      /* Game localisation */
-+#define CONFIG_LOCALE "/usr/share/locale"   /* Game localisation */
- #endif
- 
- /* User config directory */
+ ifdef MINGW
+     USERDIR := Neverball