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

[Jordà Polo]

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

Added:
   packages/trunk/neverball/debian/patches/localemodir.patch
Modified:
   packages/trunk/neverball/debian/changelog
   packages/trunk/neverball/debian/patches/series
Log:
New patch to fix LOCALEDIR variable


Modified: packages/trunk/neverball/debian/changelog
===================================================================
--- packages/trunk/neverball/debian/changelog	2009-08-25 05:52:54 UTC (rev 10212)
+++ packages/trunk/neverball/debian/changelog	2009-08-25 05:54:39 UTC (rev 10213)
@@ -10,6 +10,8 @@
   * debian/patches:
     + data_path.patch: Remove patch; it is now possible to pass data and
       locale paths directly to the Makefile.
+    + localemodir.patch: New patch; fixes unexpected behaviour when setting
+      the LOCALEDIR variable.
 
  -- Jordà Polo <jorda at ettin.org>  Wed, 19 Aug 2009 19:36:43 +0200
 

Added: packages/trunk/neverball/debian/patches/localemodir.patch
===================================================================
--- packages/trunk/neverball/debian/patches/localemodir.patch	                        (rev 0)
+++ packages/trunk/neverball/debian/patches/localemodir.patch	2009-08-25 05:54:39 UTC (rev 10213)
@@ -0,0 +1,38 @@
+# This patch just changes the name of the LOCALEDIR variable in
+# po/Makefile, as it already exists in the root Makefile and causes
+# problems when it is defined on the command line. It has already been
+# applied upstream and shouldn't be needed for the next version.
+diff --git a/po/Makefile b/po/Makefile
+index 3a0e9f7..5c62f4f 100644
+--- a/po/Makefile
++++ b/po/Makefile
+@@ -15,9 +15,9 @@ endif
+ ROOT := ..
+ 
+ DOMAIN    := neverball
+-LOCALEDIR := $(ROOT)/locale
++MODIR     := $(ROOT)/locale
+ POFILES   := $(LINGUAS:%=%.po)
+-MOFILES   := $(LINGUAS:%=$(LOCALEDIR)/%/LC_MESSAGES/$(DOMAIN).mo)
++MOFILES   := $(LINGUAS:%=$(MODIR)/%/LC_MESSAGES/$(DOMAIN).mo)
+ SOURCES   := \
+     $(wildcard $(ROOT)/ball/*.[ch])  \
+     $(wildcard $(ROOT)/share/*.[ch]) \
+@@ -40,7 +40,7 @@ XGETTEXT_FLAGS := \
+ all: $(MOFILES)
+ 
+ clean:
+-	rm -rf $(LOCALEDIR)
++	rm -rf $(MODIR)
+ 
+ #------------------------------------------------------------------------------
+ 
+@@ -52,7 +52,7 @@ clean:
+ 
+ update-po: $(DOMAIN).pot-update $(POFILES) $(MOFILES)
+ 
+-$(LOCALEDIR)/%/LC_MESSAGES/$(DOMAIN).mo: %.po
++$(MODIR)/%/LC_MESSAGES/$(DOMAIN).mo: %.po
+ 	mkdir -p $(dir $@)
+ 	msgfmt -c --statistics -o $@ $<
+ 

Modified: packages/trunk/neverball/debian/patches/series
===================================================================
--- packages/trunk/neverball/debian/patches/series	2009-08-25 05:52:54 UTC (rev 10212)
+++ packages/trunk/neverball/debian/patches/series	2009-08-25 05:54:39 UTC (rev 10213)
@@ -0,0 +1 @@
+localemodir.patch