The following commit has been merged in the master branch:
commit f8653773f7419453e7e43d550b269bf51fe8e27e
Author: Stephen Kitt <[email protected]>
Date: Mon Feb 1 23:30:12 2010 +0100
Update patch and dependencies for 0.65.6.
diff --git a/debian/changelog b/debian/changelog
index d091779..3b457b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnurobbo (0.65.6+dfsg-1) unstable; urgency=low
+
+ * New upstream version (packaged without sound support for Debian,
+ since the sound license is CC Sampling Plus 1.0 which is considered
+ non-free).
+
+ -- Stephen Kitt <[email protected]> Mon, 01 Feb 2010 20:52:56 +0100
+
gnurobbo (0.62+dfsg-2) unstable; urgency=low
* Explicitly link in the maths library (closes: #554691).
diff --git a/debian/control b/debian/control
index 4dcc9b0..bed8acf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
Priority: optional
Maintainer: Debian Games Team <[email protected]>
Uploaders: Stephen Kitt <[email protected]>
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46), libsdl-ttf2.0-dev,
libsdl1.2-dev (>> 1.2.7)
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46), libsdl-ttf2.0-dev,
libsdl1.2-dev (>> 1.2.7), libsdl-image1.2-dev, libsdl-mixer1.2-dev
Standards-Version: 3.8.3
Homepage: http://gnurobbo.sourceforge.net/
Vcs-Git: git://git.debian.org/git/pkg-games/gnurobbo.git
diff --git a/debian/patches/Makefile.diff b/debian/patches/Makefile.diff
index 00d4d91..6e24f6e 100644
--- a/debian/patches/Makefile.diff
+++ b/debian/patches/Makefile.diff
@@ -4,15 +4,15 @@ Date: Fri, 06 Mar 2009 02:16:03 +0100
--- gnurobbo.orig/Makefile
+++ gnurobbo/Makefile
-@@ -1,16 +1,16 @@
+@@ -1,19 +1,19 @@
# Change these to install somewhere else
# System wide:
-#PACKAGE_DATA_DIR=/usr/local/share/$(TARGET)/
-#BINDIR=/usr/local/bin/
--#DOCDIR=/usr/local/share/doc/$(TARGET)/
-+PACKAGE_DATA_DIR=$(DESTDIR)/usr/share/games/gnurobbo/
+-#DOCDIR=/usr/local/share/$(TARGET)/
++PACKAGE_DATA_DIR=$(DESTDIR)/usr/share/games/$(TARGET)/
+BINDIR=$(DESTDIR)/usr/games/
-+DOCDIR=$(DESTDIR)/usr/share/doc/gnurobbo/
++DOCDIR=$(DESTDIR)/usr/share/doc/$(TARGET)/
# Local:
#PACKAGE_DATA_DIR=$(HOME)/Games/$(TARGET)/
#BINDIR=$(HOME)/Games/$(TARGET)/
@@ -25,52 +25,72 @@ Date: Fri, 06 Mar 2009 02:16:03 +0100
+#BINDIR=./
+#DOCDIR=./
- # Choose ONE of these and comment the other
- #FONT_USE_PIXMAP=-DUSE_PIXMAP_FONT
-@@ -24,10 +24,10 @@
+ # Uncomment the line below if you want to have music support
+-#MUSIC=-DHAVE_MUSIC
++MUSIC=-DHAVE_MUSIC
+ # Comment the line below if you want to disable the designer
+ DESIGNER=-DHAVE_DESIGNER
+
+@@ -29,10 +29,10 @@
# 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)/\" $(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
--LIBS=`sdl-config --libs` $(FONT_USE_SDL_TTF)
-+LDFLAGS=
-+LIBS=-lm `sdl-config --libs` $(FONT_USE_SDL_TTF)
+ SDL_CONFIG=sdl-config
+-CFLAGS=-O3 -pipe -Wall -fomit-frame-pointer `$(SDL_CONFIG) --cflags`
-DPLATFORM_PC -DVERSION=\"$(VERSION)\"
-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)/\" $(FONT_USE_PIXMAP) $(MUSIC)
$(DESIGNER)
++CFLAGS+=-pipe -Wall -I/usr/include `$(SDL_CONFIG) --cflags` -DPLATFORM_PC
-DVERSION=\"$(VERSION)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)/\"
$(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
+ LINK=$(CC)
+ LDFLAGS=
+-LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF)
++LIBS=-lm `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF)
# You won't need to alter anything below
all: $(SOURCES) $(TARGET)
-@@ -41,7 +41,8 @@
+@@ -46,7 +46,7 @@
.PHONY: all clean install
clean:
- rm $(OBJECTS)
-+ rm -f $(OBJECTS)
-+ rm -f gnurobbo
++ rm -f $(OBJECTS) $(TARGET)
install:
@if [[ "$(PACKAGE_DATA_DIR)" == ./* ]] ; then \
-@@ -61,17 +62,17 @@
+@@ -71,18 +71,18 @@
+ mkdir -p $(BINDIR)
+ mkdir -p $(DOCDIR)
cp data/levels/* $(PACKAGE_DATA_DIR)/levels/
- cp data/skins/original/*.bmp data/skins/original/skinrc
$(PACKAGE_DATA_DIR)/skins/original/
- cp data/skins/tronic/*.bmp data/skins/tronic/skinrc
$(PACKAGE_DATA_DIR)/skins/tronic/
+- cp data/sounds/default/* $(PACKAGE_DATA_DIR)/sounds/default/
+- cp data/sounds/oily/* $(PACKAGE_DATA_DIR)/sounds/oily/
+- cp data/sounds/skins/* $(PACKAGE_DATA_DIR)/sounds/skins/
++ #cp data/sounds/default/* $(PACKAGE_DATA_DIR)/sounds/default/
++ #cp data/sounds/oily/* $(PACKAGE_DATA_DIR)/sounds/oily/
++ #cp data/sounds/skins/* $(PACKAGE_DATA_DIR)/sounds/skins/
+ cp data/rob/*.bmp $(PACKAGE_DATA_DIR)/rob/
+ cp data/skins/original/*.bmp data/skins/original/*.png
data/skins/original/skinrc $(PACKAGE_DATA_DIR)/skins/original/
+ cp data/skins/tronic/*.bmp data/skins/tronic/*.png
data/skins/tronic/skinrc $(PACKAGE_DATA_DIR)/skins/tronic/
+ cp data/skins/oily/*.bmp data/skins/oily/*.png data/skins/oily/skinrc
$(PACKAGE_DATA_DIR)/skins/oily/
- @if [ -n "$(FONT_USE_SDL_TTF)" ] ; then \
-- cp data/skins/original/*ttf $(PACKAGE_DATA_DIR)/skins/original/; \
-- cp data/skins/tronic/*ttf $(PACKAGE_DATA_DIR)/skins/tronic/; \
-- fi
+- cp data/skins/original/robbo.ttf $(PACKAGE_DATA_DIR)/skins/original/; \
+- cp data/skins/tronic/robbo.ttf $(PACKAGE_DATA_DIR)/skins/tronic/; \
+- cp data/skins/oily/robbo.ttf $(PACKAGE_DATA_DIR)/skins/oily/; \
+- fi
+ #...@if [ -n "$(FONT_USE_SDL_TTF)" ] ; then \
-+ #cp data/skins/original/*ttf $(PACKAGE_DATA_DIR)/skins/original/; \
-+ #cp data/skins/tronic/*ttf $(PACKAGE_DATA_DIR)/skins/tronic/; \
++ #cp data/skins/original/robbo.ttf $(PACKAGE_DATA_DIR)/skins/original/; \
++ #cp data/skins/tronic/robbo.ttf $(PACKAGE_DATA_DIR)/skins/tronic/; \
++ #cp data/skins/oily/robbo.ttf $(PACKAGE_DATA_DIR)/skins/oily/; \
+ #fi
cp data/locales/en_GB/* $(PACKAGE_DATA_DIR)/locales/en_GB/
cp data/locales/pl_PL/* $(PACKAGE_DATA_DIR)/locales/pl_PL/
cp data/locales/de_DE/* $(PACKAGE_DATA_DIR)/locales/de_DE/
- cp data/locales/sk_SK/* $(PACKAGE_DATA_DIR)/locales/sk_SK/
- cp data/locales/sv_SE/* $(PACKAGE_DATA_DIR)/locales/sv_SE/
+@@ -91,8 +91,8 @@
+ cp data/locales/ru_RU/* $(PACKAGE_DATA_DIR)/locales/ru_RU/
+ cp data/locales/id_ID/* $(PACKAGE_DATA_DIR)/locales/id_ID/
cp $(TARGET) $(BINDIR)/
-- cp ChangeLog NEWS COPYING README $(DOCDIR)/
-+ #cp ChangeLog NEWS COPYING README $(DOCDIR)/
-
-
-
+- cp ChangeLog NEWS COPYING README LICENSE-sound $(DOCDIR)/
+- @if [ -n "$(FONT_USE_SDL_TTF)" ] ; then \
+- cp LICENSE-ttf $(DOCDIR)/; \
+- fi
+-
++ #cp ChangeLog NEWS COPYING README LICENSE-sound $(DOCDIR)/
++ #...@if [ -n "$(FONT_USE_SDL_TTF)" ] ; then \
++ #cp LICENSE-ttf $(DOCDIR)/; \
++ #fi
++
--
logic game ported from ATARI XE/XL
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
