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

[Jordà Polo]

Author: jorda-guest
Date: 2009-08-25 05:52:54 +0000 (Tue, 25 Aug 2009)
New Revision: 10212

Removed:
   packages/trunk/neverball/debian/patches/data_path.patch
Modified:
   packages/trunk/neverball/debian/changelog
   packages/trunk/neverball/debian/patches/series
   packages/trunk/neverball/debian/rules
Log:
Pass {DATA,LOCALE}DIR variables instead of patching


Modified: packages/trunk/neverball/debian/changelog
===================================================================
--- packages/trunk/neverball/debian/changelog	2009-08-25 00:35:58 UTC (rev 10211)
+++ packages/trunk/neverball/debian/changelog	2009-08-25 05:52:54 UTC (rev 10212)
@@ -7,8 +7,9 @@
     + Suggest ttf-wqy-zenhei, used for the Chinese translation.
     + Add build-dependency on libphysfs-dev.
   * debian/copyright: Include copyright and license for the JPEG routines.
-  * debian/patches/data_path.patch: Update patch; data and locale paths
-    are now set using the Makefile.
+  * debian/patches:
+    + data_path.patch: Remove patch; it is now possible to pass data and
+      locale paths directly to the Makefile.
 
  -- Jordà Polo <jorda at ettin.org>  Wed, 19 Aug 2009 19:36:43 +0200
 

Deleted: packages/trunk/neverball/debian/patches/data_path.patch
===================================================================
--- packages/trunk/neverball/debian/patches/data_path.patch	2009-08-25 00:35:58 UTC (rev 10211)
+++ packages/trunk/neverball/debian/patches/data_path.patch	2009-08-25 05:52:54 UTC (rev 10212)
@@ -1,13 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -27,8 +27,8 @@ endif
- # Paths (packagers might want to set DATADIR and LOCALEDIR)
- 
- USERDIR   := .neverball
--DATADIR   := ./data
--LOCALEDIR := ./locale
-+DATADIR   := /usr/share/games/neverball
-+LOCALEDIR := /usr/share/locale
- 
- ifdef MINGW
-     USERDIR := Neverball

Modified: packages/trunk/neverball/debian/patches/series
===================================================================
--- packages/trunk/neverball/debian/patches/series	2009-08-25 00:35:58 UTC (rev 10211)
+++ packages/trunk/neverball/debian/patches/series	2009-08-25 05:52:54 UTC (rev 10212)
@@ -1 +0,0 @@
-data_path.patch

Modified: packages/trunk/neverball/debian/rules
===================================================================
--- packages/trunk/neverball/debian/rules	2009-08-25 00:35:58 UTC (rev 10211)
+++ packages/trunk/neverball/debian/rules	2009-08-25 05:52:54 UTC (rev 10212)
@@ -21,7 +21,7 @@
 build: patch build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE)
+	$(MAKE) DATADIR=/usr/share/games/neverball LOCALEDIR=/usr/share/locale
 	# Rename icons for .desktop files.
 	cp dist/neverball_128.png dist/neverball.png
 	cp dist/neverputt_128.png dist/neverputt.png