The following commit has been merged in the master branch:
commit b53ae3e909418fcbe1927cd766f2120a7305d40c
Author: Stephen Kitt <[email protected]>
Date: Sun Oct 25 13:11:33 2009 +0100
Refresh patches against 0.62.
diff --git a/debian/changelog b/debian/changelog
index ebb835b..291766e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gnurobbo (0.62-1) unstable; urgency=low
+
+ * New maintainer (Closes: #544913).
+ * New upstream version.
+ * Refreshed patches:
+ + do-not-dump-vmusage.diff: removed, merged upstream;
+ + Makefile.diff: updated.
+
+ -- Stephen Kitt <[email protected]> Sun, 25 Oct 2009 13:08:58 +0100
+
gnurobbo (0.61-1) unstable; urgency=low
[ Ansgar Burchardt ]
diff --git a/debian/patches/Makefile.diff b/debian/patches/Makefile.diff
index aea3805..95a254e 100644
--- a/debian/patches/Makefile.diff
+++ b/debian/patches/Makefile.diff
@@ -5,7 +5,7 @@ Date: Fri, 06 Mar 2009 02:16:03 +0100
--- gnurobbo.orig/Makefile
+++ gnurobbo/Makefile
@@ -1,16 +1,16 @@
- #Change these to install somewhere else
+ # Change these to install somewhere else
# System wide:
-#PACKAGE_DATA_DIR=/usr/local/share/$(TARGET)/
-#BINDIR=/usr/local/bin/
@@ -25,21 +25,21 @@ Date: Fri, 06 Mar 2009 02:16:03 +0100
+#BINDIR=./
+#DOCDIR=./
- #You won't need to alter these
- TARGET=gnurobbo
-@@ -20,9 +20,9 @@
+ # Choose ONE of these and comment the other
+ #FONT_USE_PIXMAP=-DUSE_PIXMAP_FONT
+@@ -24,9 +24,9 @@
- #These should be ok for most
+ # These should be ok for most
CC=gcc
--CFLAGS=-O3 -pipe -Wall -fomit-frame-pointer -I/usr/include `sdl-config
--cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\"
-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)/\"
-+CFLAGS+=-pipe -Wall -I/usr/include `sdl-config --cflags` -DPLATFORM_PC
-DVERSION=\"$(VERSION)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)/\"
+-CFLAGS=-O3 -pipe -Wall -fomit-frame-pointer -I/usr/include `sdl-config
--cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\"
-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)/\" $(FONT_USE_PIXMAP)
++CFLAGS+=-pipe -Wall -I/usr/include `sdl-config --cflags` -DPLATFORM_PC
-DVERSION=\"$(VERSION)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)/\"
$(FONT_USE_PIXMAP)
LINK=gcc
-LDFLAGS=-L/usr/lib
+LDFLAGS=
- LIBS=`sdl-config --libs` -lSDL_ttf
+ LIBS=`sdl-config --libs` $(FONT_USE_SDL_TTF)
- #You won't need to alter anything below
-@@ -37,7 +37,8 @@
+ # You won't need to alter anything below
+@@ -41,7 +41,8 @@
.PHONY: all clean install
clean:
@@ -48,13 +48,13 @@ Date: Fri, 06 Mar 2009 02:16:03 +0100
+ rm -f gnurobbo
install:
- mkdir -p $(PACKAGE_DATA_DIR)/levels
-@@ -51,7 +52,7 @@
- cp data/locales/en_GB/* $(PACKAGE_DATA_DIR)/locales/en_GB/
- cp data/locales/pl_PL/* $(PACKAGE_DATA_DIR)/locales/pl_PL/
+ @if [[ "$(PACKAGE_DATA_DIR)" == ./* ]] ; then \
+@@ -71,7 +72,7 @@
+ cp data/locales/sk_SK/* $(PACKAGE_DATA_DIR)/locales/sk_SK/
+ cp data/locales/sv_SE/* $(PACKAGE_DATA_DIR)/locales/sv_SE/
cp $(TARGET) $(BINDIR)/
-- cp ChangeLog COPYING README $(DOCDIR)/
-+ #cp ChangeLog COPYING README $(DOCDIR)/
+- cp ChangeLog NEWS COPYING README $(DOCDIR)/
++ #cp ChangeLog NEWS COPYING README $(DOCDIR)/
diff --git a/debian/patches/series b/debian/patches/series
index 529db4f..5169081 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
Makefile.diff
-do-not-dump-vmusage.diff
--
logic game ported from ATARI XE/XL
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
