r11727 - in packages/trunk/a7xpg/debian: . patches source

[Vincent Fourmond]

Author: fourmond
Date: 2011-02-09 21:44:50 +0000 (Wed, 09 Feb 2011)
New Revision: 11727

Added:
   packages/trunk/a7xpg/debian/patches/start_game_string.patch
   packages/trunk/a7xpg/debian/source/
   packages/trunk/a7xpg/debian/source/format
Removed:
   packages/trunk/a7xpg/debian/README.source
Modified:
   packages/trunk/a7xpg/debian/changelog
   packages/trunk/a7xpg/debian/control
   packages/trunk/a7xpg/debian/patches/series
   packages/trunk/a7xpg/debian/rules
Log:
[a7xpg] fix minor bug + switch to format 3.0 (quilt)

Deleted: packages/trunk/a7xpg/debian/README.source
===================================================================
--- packages/trunk/a7xpg/debian/README.source	2011-02-09 15:49:17 UTC (rev 11726)
+++ packages/trunk/a7xpg/debian/README.source	2011-02-09 21:44:50 UTC (rev 11727)
@@ -1,5 +0,0 @@
-This package uses quilt for applying patches.
-
-Refer to /usr/share/doc/quilt/README.source for more information
-
- -- Jordan Metzmeier <jordanm at linuxgen.com>, Thu, 26 Aug 2010 18:23:20 -0400

Modified: packages/trunk/a7xpg/debian/changelog
===================================================================
--- packages/trunk/a7xpg/debian/changelog	2011-02-09 15:49:17 UTC (rev 11726)
+++ packages/trunk/a7xpg/debian/changelog	2011-02-09 21:44:50 UTC (rev 11727)
@@ -1,10 +1,16 @@
 a7xpg (0.11.dfsg1-6) unstable; urgency=low
 
+  [ Jordan Metzmeier ]
   * Updated standards version
-  * Added README.source
 
- -- Jordan Metzmeier <jordan at linuxgen.com>  Thu, 26 Aug 2010 19:10:38 -0400
+  [ Vincent Fourmond ]
+  * Switched to source format 3.0 (quilt)
+  * Dropped build-dep on quilt
+  * Imported Ubuntu patch courtesy of Roy Jamison <xteejyx at googlemail.com>
+    to clarify the startup message (closes: #605071)
 
+ -- Vincent Fourmond <fourmond at debian.org>  Wed, 09 Feb 2011 22:38:07 +0100
+
 a7xpg (0.11.dfsg1-5) unstable; urgency=low
 
   * Patched for changes in the D language. (Closes: #574310)

Modified: packages/trunk/a7xpg/debian/control
===================================================================
--- packages/trunk/a7xpg/debian/control	2011-02-09 15:49:17 UTC (rev 11726)
+++ packages/trunk/a7xpg/debian/control	2011-02-09 21:44:50 UTC (rev 11727)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Peter De Wachter <pdewacht at gmail.com>, Vincent Fourmond <fourmond at debian.org>
-Build-Depends: debhelper (>= 5), quilt, gdc,
+Build-Depends: debhelper (>= 5), gdc,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
  libsdl1.2-dev, libsdl-mixer1.2-dev
 Standards-Version: 3.9.1

Modified: packages/trunk/a7xpg/debian/patches/series
===================================================================
--- packages/trunk/a7xpg/debian/patches/series	2011-02-09 15:49:17 UTC (rev 11726)
+++ packages/trunk/a7xpg/debian/patches/series	2011-02-09 21:44:50 UTC (rev 11727)
@@ -1,3 +1,4 @@
+start_game_string.patch
 01_port_opengl_headers.diff
 02_sdl_import_remove_windows_code.diff
 03_sdl_import_fix_weird_sdl_keysym_problem.diff

Added: packages/trunk/a7xpg/debian/patches/start_game_string.patch
===================================================================
--- packages/trunk/a7xpg/debian/patches/start_game_string.patch	                        (rev 0)
+++ packages/trunk/a7xpg/debian/patches/start_game_string.patch	2011-02-09 21:44:50 UTC (rev 11727)
@@ -0,0 +1,19 @@
+Author: Roy Jamison <xteejyx at googlemail.com>
+Description: Clarify message about game starting keypress
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/591847
+Forwarded: no
+Last-Update: 2010-11-26
+
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xGameManager.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xGameManager.d	2010-06-09 18:07:33.570776002 +0100
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xGameManager.d	2010-06-09 18:10:14.270775875 +0100
+@@ -665,7 +665,7 @@
+ 
+   private void titleDrawStatus() {
+     if ((cnt % 120) < 60)
+-      LetterRender.drawString("PUSH BUTTON TO START", 320, 400, 8);
++      LetterRender.drawString("PUSH LEFT CTRL TO START", 320, 400, 8);
+     drawScore();
+     drawHiScore();
+     glEnable(GL_TEXTURE_2D);

Modified: packages/trunk/a7xpg/debian/rules
===================================================================
--- packages/trunk/a7xpg/debian/rules	2011-02-09 15:49:17 UTC (rev 11726)
+++ packages/trunk/a7xpg/debian/rules	2011-02-09 21:44:50 UTC (rev 11727)
@@ -16,7 +16,6 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
 	touch $@
 
 build: build-stamp
@@ -35,7 +34,6 @@
 	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f a7xpg
 	rm -f `find . -name "*.o"`
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
 install: build

Added: packages/trunk/a7xpg/debian/source/format
===================================================================
--- packages/trunk/a7xpg/debian/source/format	                        (rev 0)
+++ packages/trunk/a7xpg/debian/source/format	2011-02-09 21:44:50 UTC (rev 11727)
@@ -0,0 +1 @@
+3.0 (quilt)