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

[Jordà Polo]

Author: jorda-guest
Date: 2009-09-11 19:42:06 +0000 (Fri, 11 Sep 2009)
New Revision: 10338

Removed:
   packages/trunk/neverball/debian/patches/lasterror.patch
   packages/trunk/neverball/debian/patches/localemodir.patch
Modified:
   packages/trunk/neverball/debian/changelog
   packages/trunk/neverball/debian/patches/series
   packages/trunk/neverball/debian/rules
Log:
Update package to new upstream release


Modified: packages/trunk/neverball/debian/changelog
===================================================================
--- packages/trunk/neverball/debian/changelog	2009-09-11 17:42:09 UTC (rev 10337)
+++ packages/trunk/neverball/debian/changelog	2009-09-11 19:42:06 UTC (rev 10338)
@@ -1,6 +1,7 @@
-neverball (1.5.2-2) UNRELEASED; urgency=low
+neverball (1.5.3-1) UNRELEASED; urgency=low
 
-  * debian/patches/lasterror.patch: Print error message when VFS init fails.
+  * New upstream release.
+  * debian/patches/localemodir.patch: Remove patch; included upstream.
 
  -- Jordà Polo <jorda at ettin.org>  Mon, 31 Aug 2009 08:05:09 +0200
 

Deleted: packages/trunk/neverball/debian/patches/lasterror.patch
===================================================================
--- packages/trunk/neverball/debian/patches/lasterror.patch	2009-09-11 17:42:09 UTC (rev 10337)
+++ packages/trunk/neverball/debian/patches/lasterror.patch	2009-09-11 19:42:06 UTC (rev 10338)
@@ -1,44 +0,0 @@
-# Patch to help debug PhysFS init problems: it print last error when VFS
-# init fails. It has already been applied upstream.
-diff --git a/ball/main.c b/ball/main.c
-index 59d8047..5fac1e0 100644
---- a/ball/main.c
-+++ b/ball/main.c
-@@ -383,7 +383,8 @@ int main(int argc, char *argv[])
- 
-     if (!fs_init(argv[0]))
-     {
--        fputs("Failure to initialize virtual file system\n", stderr);
-+        fprintf(stderr, "Failure to initialize virtual file system: %s\n",
-+                fs_error());
-         return 1;
-     }
- 
-diff --git a/putt/main.c b/putt/main.c
-index d5d5635..ac08e1c 100644
---- a/putt/main.c
-+++ b/putt/main.c
-@@ -196,7 +196,8 @@ int main(int argc, char *argv[])
- 
-     if (!fs_init(argv[0]))
-     {
--        fputs("Failure to initialize virtual file system\n", stderr);
-+        fprintf(stderr, "Failure to initialize virtual file system: %s\n",
-+                fs_error());
-         return 1;
-     }
- 
-diff --git a/share/mapc.c b/share/mapc.c
-index 3117147..ab3b580 100644
---- a/share/mapc.c
-+++ b/share/mapc.c
-@@ -2457,7 +2457,8 @@ int main(int argc, char *argv[])
- 
-     if (!fs_init(argv[0]))
-     {
--        fprintf(stderr, "Failure to initialize virtual file system\n");
-+        fprintf(stderr, "Failure to initialize virtual file system: %s\n",
-+                fs_error());
-         return 1;
-     }
- 

Deleted: packages/trunk/neverball/debian/patches/localemodir.patch
===================================================================
--- packages/trunk/neverball/debian/patches/localemodir.patch	2009-09-11 17:42:09 UTC (rev 10337)
+++ packages/trunk/neverball/debian/patches/localemodir.patch	2009-09-11 19:42:06 UTC (rev 10338)
@@ -1,38 +0,0 @@
-# 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-09-11 17:42:09 UTC (rev 10337)
+++ packages/trunk/neverball/debian/patches/series	2009-09-11 19:42:06 UTC (rev 10338)
@@ -1,2 +0,0 @@
-localemodir.patch
-lasterror.patch

Modified: packages/trunk/neverball/debian/rules
===================================================================
--- packages/trunk/neverball/debian/rules	2009-09-11 17:42:09 UTC (rev 10337)
+++ packages/trunk/neverball/debian/rules	2009-09-11 19:42:06 UTC (rev 10338)
@@ -76,9 +76,9 @@
 get-orig-source:
 	URL="https://s.snth.net/svn/neverball/trunk" && \
 	REV=$$(svn info $$URL | grep Revision: | cut -d\  -f2) && \
-	DIR="neverball-1.5.2+svn$$REV" && \
+	DIR="neverball-1.5.3+svn$$REV" && \
 	svn export $$URL $$DIR && \
-	tar czf neverball_1.5.2+svn$$REV.orig.tar.gz $$DIR && \
+	tar czf neverball_1.5.3+svn$$REV.orig.tar.gz $$DIR && \
 	rm -rf $$DIR
 
 binary: binary-indep binary-arch