[SCM] logic game ported from ATARI XE/XL branch, master, updated. debian/0.65.6+dfsg-1-7-gf68950d

Stephen Kitt steve at sk2.org
Fri Dec 3 15:13:16 UTC 2010 

The following commit has been merged in the master branch:
commit b9b6dd54461dcc186b332f3e364e6eb8468f510b
Author: Stephen Kitt <steve at sk2.org>
Date:   Fri Dec 3 15:24:19 2010 +0100

    New upstream version.

diff --git a/debian/changelog b/debian/changelog
index 3b457b6..1941f97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnurobbo (0.66+dfsg-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Stephen Kitt <steve at sk2.org>  Mon, 29 Nov 2010 11:50:08 +0100
+
 gnurobbo (0.65.6+dfsg-1) unstable; urgency=low
 
   * New upstream version (packaged without sound support for Debian,
diff --git a/debian/patches/Makefile.diff b/debian/patches/Makefile.diff
index 6e24f6e..925f3f9 100644
--- a/debian/patches/Makefile.diff
+++ b/debian/patches/Makefile.diff
@@ -1,96 +1,119 @@
-Subject: Adjust Makefile for the Debian package
-From: Ansgar Burchardt <ansgar at 43-1.org>
-Date: Fri, 06 Mar 2009 02:16:03 +0100
+Description: adapt the build to Debian's requirements
+ Change the upstream-provided target directories for Debian, so they
+ take DESTDIR into account and install documentation to
+ /usr/share/doc/gnurobbo.
+ .
+ Avoid attempting to install non-DFSG-free files which have been
+ removed from the source package.
+ .
+ Disable music support.
+ .
+ Add -lm to support building with gold.
+ .
+ Remove the gnurobbo binary when cleaning.
+Author: Stephen Kitt <steve at sk2.org>
+Last-Update: 2010-12-03
 
 --- gnurobbo.orig/Makefile
 +++ gnurobbo/Makefile
-@@ -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/$(TARGET)/
-+PACKAGE_DATA_DIR=$(DESTDIR)/usr/share/games/$(TARGET)/
-+BINDIR=$(DESTDIR)/usr/games/
-+DOCDIR=$(DESTDIR)/usr/share/doc/$(TARGET)/
- # Local:
- #PACKAGE_DATA_DIR=$(HOME)/Games/$(TARGET)/
- #BINDIR=$(HOME)/Games/$(TARGET)/
- #DOCDIR=$(HOME)/Games/$(TARGET)/
- # The current folder:
--PACKAGE_DATA_DIR=./data/
--BINDIR=./
--DOCDIR=./
-+#PACKAGE_DATA_DIR=./data/
-+#BINDIR=./
-+#DOCDIR=./
+@@ -5,9 +5,9 @@
+ #DOCDIR?=/usr/local/share/$(TARGET)
  
- # 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
+ # GNU Debian system wide installation
+-#PACKAGE_DATA_DIR?=/usr/share/games/$(TARGET)
+-#BINDIR?=/usr/games
+-#DOCDIR?=/usr/share/games/$(TARGET)
++PACKAGE_DATA_DIR?=$(DESTDIR)/usr/share/games/$(TARGET)
++BINDIR?=$(DESTDIR)/usr/games
++DOCDIR?=$(DESTDIR)/usr/share/doc/$(TARGET)
+ 
+ # Local installation within your home folder
+ #PACKAGE_DATA_DIR?=$(HOME)/Games/$(TARGET)
+@@ -15,12 +15,12 @@
+ #DOCDIR?=$(HOME)/Games/$(TARGET)
+ 
+ # Run from current folder i.e. no installation (default)
+-PACKAGE_DATA_DIR?=./data
+-BINDIR?=.
+-DOCDIR?=.
++#PACKAGE_DATA_DIR?=./data
++#BINDIR?=.
++#DOCDIR?=.
+ 
+ # Comment out the line below if you want to disable music support
+-MUSIC=-DHAVE_MUSIC
++#MUSIC=-DHAVE_MUSIC
+ # Comment out the line below if you want to disable the designer
  DESIGNER=-DHAVE_DESIGNER
  
-@@ -29,10 +29,10 @@
+@@ -36,17 +36,17 @@
  
  # These should be ok for most
- 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)
+ SDL_CONFIG?=sdl-config
+-CFLAGS?=-O3 -pipe
+-CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
++CFLAGS?=-O3
++CFLAGS+=-pipe -Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
+ 	-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
+-LDFLAGS=
++LDFLAGS?=
+ # Use these instead for debugging and/or profiling (mainly intended for GNU Robbo developers)
+ #CFLAGS?=-O0 -pipe -g -pg
+ #CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
+ #	-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
+ #LDFLAGS=-pg
  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)
-@@ -46,7 +46,7 @@
+@@ -60,7 +60,7 @@
  .PHONY: all clean install
  
  clean:
--	rm $(OBJECTS)
-+	rm -f $(OBJECTS) $(TARGET)
+-	rm -f *.o
++	rm -f *.o gnurobbo
  
  install:
- 	@if [[ "$(PACKAGE_DATA_DIR)" == ./* ]] ; then \
-@@ -71,18 +71,18 @@
+ 	@if [ "$(PACKAGE_DATA_DIR)" = ./data ] ; then \
+@@ -68,10 +68,6 @@
+ 		exit 2; \
+ 	fi			
+ 	mkdir -p $(PACKAGE_DATA_DIR)/levels
+-	mkdir -p $(PACKAGE_DATA_DIR)/sounds/default
+-	mkdir -p $(PACKAGE_DATA_DIR)/sounds/free
+-	mkdir -p $(PACKAGE_DATA_DIR)/sounds/oily
+-	mkdir -p $(PACKAGE_DATA_DIR)/sounds/skins
+ 	mkdir -p $(PACKAGE_DATA_DIR)/rob
+ 	mkdir -p $(PACKAGE_DATA_DIR)/skins/original
+ 	mkdir -p $(PACKAGE_DATA_DIR)/skins/tronic
+@@ -87,19 +83,10 @@
  	mkdir -p $(BINDIR)
  	mkdir -p $(DOCDIR)
  	cp data/levels/* $(PACKAGE_DATA_DIR)/levels/
 -	cp data/sounds/default/* $(PACKAGE_DATA_DIR)/sounds/default/
+-	cp data/sounds/free/* $(PACKAGE_DATA_DIR)/sounds/free/
 -	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/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/; \
+-		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/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/cz_CZ/* $(PACKAGE_DATA_DIR)/locales/cz_CZ/
  	cp data/locales/de_DE/* $(PACKAGE_DATA_DIR)/locales/de_DE/
-@@ -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 data/locales/en_GB/* $(PACKAGE_DATA_DIR)/locales/en_GB/
+@@ -109,8 +96,3 @@
+ 	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 NEWS COPYING README LICENSE-sound $(DOCDIR)/
 -	@if [ -n "$(FONT_USE_SDL_TTF)" ] ; then \
--	cp LICENSE-ttf $(DOCDIR)/; \
+-		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

More information about the Pkg-games-commits mailing list