r5207 - in packages/trunk/dd2/debian: . patches

Barry deFreese bddebian-guest at alioth.debian.org
Fri Jan 4 04:17:49 UTC 2008


Author: bddebian-guest
Date: 2008-01-04 04:17:48 +0000 (Fri, 04 Jan 2008)
New Revision: 5207

Added:
   packages/trunk/dd2/debian/patches/
   packages/trunk/dd2/debian/patches/001_configure.patch
   packages/trunk/dd2/debian/patches/01_update_readme.patch
   packages/trunk/dd2/debian/patches/02_makefile_scores.patch
   packages/trunk/dd2/debian/patches/03_hiscore_file.patch
   packages/trunk/dd2/debian/patches/04_hiscore_patches.patch
   packages/trunk/dd2/debian/patches/series
Modified:
   packages/trunk/dd2/debian/changelog
   packages/trunk/dd2/debian/control
   packages/trunk/dd2/debian/rules
Log:
  * New upstream release
    + License bump to make it LGPLv3 compatible
  * Add quilt patching system
    + Move source changes to patches:
      + 001_configure.patch - Automake init dodgindiamond2 not dd2
      + 01_update_readme.patch - Remove cruft from upstream README
      + 02_makefile_scores.patch - Install scores file in $(DESTDIR)..
      + 03_hiscore_file.patch - Add real users (No idea why)
      + 04_hiscore_patches.patch - main.c and engine.h - path for 
hiscore file
  * Add autoconf, automake build-deps to reconfigure on build


Modified: packages/trunk/dd2/debian/changelog
===================================================================
--- packages/trunk/dd2/debian/changelog	2008-01-04 03:53:10 UTC (rev 5206)
+++ packages/trunk/dd2/debian/changelog	2008-01-04 04:17:48 UTC (rev 5207)
@@ -1,9 +1,11 @@
-dd2 (0.2.1-4) UNRELEASED; urgency=low
+dd2 (0.2.2-1) UNRELEASED; urgency=low
 
   [ Barry deFreese ]
   * New maintainer (Closes: #453751)
     + Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
   * Add myself to uploaders
+  * New upstream release
+    + License bump to make it LGPLv3 compatible
   * Make distclean not ignore errors
   * Add watch file
   * Add desktop file
@@ -11,6 +13,14 @@
   * Move config.{sub,guess} handling to configure target
   * Bump debhelper build-dep and compat to 5
   * Bump Standards Version to 3.7.3
+  * Add quilt patching system
+    + Move source changes to patches:
+      + 001_configure.patch - Automake init dodgindiamond2 not dd2
+      + 01_update_readme.patch - Remove cruft from upstream README
+      + 02_makefile_scores.patch - Install scores file in $(DESTDIR)..
+      + 03_hiscore_file.patch - Add real users (No idea why)
+      + 04_hiscore_patches.patch - main.c and engine.h - path for hiscore file
+  * Add autoconf, automake build-deps to reconfigure on build
 
  -- Barry deFreese <bddebian at comcast.net>  Thu, 13 Dec 2007 10:34:46 -0500
 

Modified: packages/trunk/dd2/debian/control
===================================================================
--- packages/trunk/dd2/debian/control	2008-01-04 03:53:10 UTC (rev 5206)
+++ packages/trunk/dd2/debian/control	2008-01-04 04:17:48 UTC (rev 5207)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bddebian at comcast.net>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, autoconf, automake, quilt, libsdl1.2-dev, libsdl-gfx1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev
 Standards-Version: 3.7.3
 Homepage: http://www.usebox.net/jjm/dd2/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/dd2/

Added: packages/trunk/dd2/debian/patches/001_configure.patch
===================================================================
--- packages/trunk/dd2/debian/patches/001_configure.patch	                        (rev 0)
+++ packages/trunk/dd2/debian/patches/001_configure.patch	2008-01-04 04:17:48 UTC (rev 5207)
@@ -0,0 +1,14 @@
+diff -urN dd2-0.2.2.orig/configure.in dd2-0.2.2/configure.in
+--- dd2-0.2.2.orig/configure.in	2007-08-14 14:57:10.000000000 -0400
++++ dd2-0.2.2/configure.in	2008-01-03 17:56:33.000000000 -0500
+@@ -1,7 +1,9 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Makefile.am)
+ 
+-AM_INIT_AUTOMAKE(dd2, 0.2.2)
++AM_INIT_AUTOMAKE(dodgindiamond2, 0.2.2)
++
++AM_MAINTAINER_MODE
+ 
+ AC_PROG_CC
+ 

Added: packages/trunk/dd2/debian/patches/01_update_readme.patch
===================================================================
--- packages/trunk/dd2/debian/patches/01_update_readme.patch	                        (rev 0)
+++ packages/trunk/dd2/debian/patches/01_update_readme.patch	2008-01-04 04:17:48 UTC (rev 5207)
@@ -0,0 +1,81 @@
+diff -urN dd2-0.2.2.orig/README dd2-0.2.2/README
+--- dd2-0.2.2.orig/README	2004-07-02 11:34:03.000000000 -0400
++++ dd2-0.2.2/README	2008-01-03 12:09:47.000000000 -0500
+@@ -5,35 +5,10 @@
+ 
+ ** Required **
+ 
+-DD2 needs SDL 1.2.x and SDL_Mixer.
+-
+-You can find both needed libraries at http://www.libsdl.org/
+-
+ You can get newest version of this package at:
+ 
+    http://www.usebox.net/jjm/dd2/
+ 
+-** Install **
+-
+-UNIX Instructions
+-
+-In the root directory of DD2 package:
+-
+-$ ./configure
+-$ make
+-$ su
+-$ make install
+-$ exit
+-$ dd2
+-
+-You may read the generic INSTALL file.
+-
+-Win32 Instructions
+-
+-The game doesn't need any installation. Just unzip the
+-package and run dd2.exe. In case of error (eg. the game
+-doesn't start), check stderr.txt file in dd2.exe directory.
+-
+ ** Configuration **
+ 
+ You can change player control, sound and graphic mode in
+@@ -44,15 +19,9 @@
+ 
+ ** Keyboard **
+ 
+-Player 1: UP, DOWN, LEFT, RIGHT, RIGHT CONTROL
++Player 1: UP, DOWN, LEFT, RIGHT, M
+ Player 2: w, s, a, d, LEFT CONTROL
+ 
+-There are reports of systems with just one control key. In those
+-systems you should use 'm' key instead RIGHT CONTROL. To enable
+-this alternative fire key, configure with:
+-
+-$ ./configure --enable-alternate-fire-key 
+-
+ ** Joystick **
+ 
+ Player 1: Joystick 1 (if available)
+@@ -106,7 +75,7 @@
+ 
+  In order to use esd driver, execute in a bash alike shell:
+ 
+- 	SDL_AUDIODRIVER="esd" dd2
++ 	SDL_AUDIODRIVER="esd" dodgindiamon2
+ 
+  Check the FAQ about using SDL: http://www.libsdl.org/faq.php.
+ 
+@@ -124,14 +93,7 @@
+ 
+  By now the best way to avoid this problem is to not press alt+tab!
+ 
+-7. The game doesn't work on MAC OS X.
+-
+- DD2 uses SDL_DOUBLEBUF and that feature is not supported on MAC OS X.
+-
+- However since version 1.2.6 SDL has experimental code that should make
+- it work, but I have no reports about it working.
+-
+-8. I have a problem that is not listed here!
++7. I have a problem that is not listed here!
+ 
+  Check the FAQ about using SDL: http://www.libsdl.org/faq.php.
+ 

Added: packages/trunk/dd2/debian/patches/02_makefile_scores.patch
===================================================================
--- packages/trunk/dd2/debian/patches/02_makefile_scores.patch	                        (rev 0)
+++ packages/trunk/dd2/debian/patches/02_makefile_scores.patch	2008-01-04 04:17:48 UTC (rev 5207)
@@ -0,0 +1,10 @@
+diff -urN dd2-0.2.2.orig/src/data/Makefile.am dd2-0.2.2/src/data/Makefile.am
+--- dd2-0.2.2.orig/src/data/Makefile.am	2004-05-17 10:41:00.000000000 -0400
++++ dd2-0.2.2/src/data/Makefile.am	2008-01-03 12:15:17.000000000 -0500
+@@ -5,5 +5,5 @@
+ efx6.wav efx7.wav efx8.wav gfx.bmp dd2.cfg game.act dd2-hiscore
+ 
+ install-data-hook:
+-	chmod a+rw $(pkgdatadir)/dd2-hiscore
++	chmod a+rw $(DESTDIR)$(pkgdatadir)/dd2-hiscore
+ 

Added: packages/trunk/dd2/debian/patches/03_hiscore_file.patch
===================================================================
--- packages/trunk/dd2/debian/patches/03_hiscore_file.patch	                        (rev 0)
+++ packages/trunk/dd2/debian/patches/03_hiscore_file.patch	2008-01-04 04:17:48 UTC (rev 5207)
@@ -0,0 +1,14 @@
+diff -urN dd2-0.2.2.orig/src/data/dd2-hiscore dd2-0.2.2/src/data/dd2-hiscore
+--- dd2-0.2.2.orig/src/data/dd2-hiscore	2004-05-18 11:41:22.000000000 -0400
++++ dd2-0.2.2/src/data/dd2-hiscore	2008-01-03 12:17:09.000000000 -0500
+@@ -1,8 +1,8 @@
+ nobody:10:10000
+-nobody:9:9000
++gurkan:9:9000
+ nobody:8:8000
+ nobody:7:7000
+-nobody:6:6000
++moni:6:6000
+ nobody:5:5000
+ nobody:4:4000
+ nobody:3:3000

Added: packages/trunk/dd2/debian/patches/04_hiscore_patches.patch
===================================================================
--- packages/trunk/dd2/debian/patches/04_hiscore_patches.patch	                        (rev 0)
+++ packages/trunk/dd2/debian/patches/04_hiscore_patches.patch	2008-01-04 04:17:48 UTC (rev 5207)
@@ -0,0 +1,35 @@
+diff -urN dd2-0.2.2.orig/src/engine.h dd2-0.2.2/src/engine.h
+--- dd2-0.2.2.orig/src/engine.h	2007-08-14 14:55:10.000000000 -0400
++++ dd2-0.2.2/src/engine.h	2008-01-03 12:24:11.000000000 -0500
+@@ -25,6 +25,10 @@
+ #define DD2_DATA="./data"
+ #endif
+ 
++#ifndef DD2_SCORE
++#define DD2_SCORE "/var/games/dodgindiamond2"
++#endif
++
+ #include "SDL.h"
+ #include "SDL_mixer.h"
+ 
+diff -urN dd2-0.2.2.orig/src/main.c dd2-0.2.2/src/main.c
+--- dd2-0.2.2.orig/src/main.c	2007-08-14 14:59:42.000000000 -0400
++++ dd2-0.2.2/src/main.c	2008-01-03 12:22:52.000000000 -0500
+@@ -296,7 +296,7 @@
+ #endif
+ 
+ 	/* read hi-scores */
+-	sprintf(buffer,"%s/dd2-hiscore",DD2_DATA);
++	sprintf(buffer,"%s/hiscore",DD2_SCORE);
+ 	if(!loadScore(buffer,hiscore))
+ 		fprintf(stderr,"unable to read hi-scores, using defaults\n");
+ 
+@@ -463,7 +463,7 @@
+ 	saveCFG(buffer,&conf);
+ 
+ 	/* save hi-scores */
+-	sprintf(buffer,"%s/dd2-hiscore",DD2_DATA);
++	sprintf(buffer,"%s/hiscore",DD2_SCORE);
+ 	if(!saveScore(buffer,hiscore))
+ 		fprintf(stderr,"unable to save hi-scores\ndo you have permissions to write into %s?\n"
+ 			,buffer);

Added: packages/trunk/dd2/debian/patches/series
===================================================================
--- packages/trunk/dd2/debian/patches/series	                        (rev 0)
+++ packages/trunk/dd2/debian/patches/series	2008-01-04 04:17:48 UTC (rev 5207)
@@ -0,0 +1,6 @@
+001_configure.patch
+01_update_readme.patch
+02_makefile_scores.patch
+03_hiscore_file.patch
+04_hiscore_patches.patch
+

Modified: packages/trunk/dd2/debian/rules
===================================================================
--- packages/trunk/dd2/debian/rules	2008-01-04 03:53:10 UTC (rev 5206)
+++ packages/trunk/dd2/debian/rules	2008-01-04 04:17:48 UTC (rev 5207)
@@ -4,6 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -19,7 +20,7 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
+config.status: patch configure
 	dh_testdir
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -29,6 +30,7 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
+	autoreconf -f -i
 	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --enable-alternate-fire-key --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games --infodir=\$${prefix}/share/info --datadir=\$${prefix}/share/games
 
 
@@ -39,7 +41,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 




More information about the Pkg-games-commits mailing list