r7328 - in packages/trunk/gravitation/debian: . patches

[Cyril Brulebois]

Author: kibi
Date: 2008-06-11 01:31:47 +0000 (Wed, 11 Jun 2008)
New Revision: 7328

Modified:
   packages/trunk/gravitation/debian/changelog
   packages/trunk/gravitation/debian/patches/abs_path.patch
   packages/trunk/gravitation/debian/patches/series
Log:
Adjust patch level to avoid FTBFS with new source package format (Closes: #485257).

Modified: packages/trunk/gravitation/debian/changelog
===================================================================
--- packages/trunk/gravitation/debian/changelog	2008-06-09 20:13:01 UTC (rev 7327)
+++ packages/trunk/gravitation/debian/changelog	2008-06-11 01:31:47 UTC (rev 7328)
@@ -1,7 +1,14 @@
 gravitation (3+dfsg1-2) UNRELEASED; urgency=low
 
+  [ Paul Wise ]
   * Document using the Esc key to quit the game
 
+  [ Cyril Brulebois ]
+  * Fix FTBFS with new “3.0 (quilt)” source package format by using a
+    patch level of 1 instead of 0 in the abs_path.patch patch and by
+    adjusting the series file appropriately (i.e. by deleting the “-p0”
+    option), thanks to Raphaël Hertzog for the notice (Closes: #485257).
+
  -- Paul Wise <pabs at debian.org>  Wed, 26 Mar 2008 18:36:40 +0900
 
 gravitation (3+dfsg1-1) unstable; urgency=low

Modified: packages/trunk/gravitation/debian/patches/abs_path.patch
===================================================================
--- packages/trunk/gravitation/debian/patches/abs_path.patch	2008-06-09 20:13:01 UTC (rev 7327)
+++ packages/trunk/gravitation/debian/patches/abs_path.patch	2008-06-11 01:31:47 UTC (rev 7328)
@@ -2,8 +2,8 @@
 Paul Wise <pabs at debian.org>
 Placed in the Public Domain
 Use absolute paths to the installed data files.
---- game5/gameSource/common.cpp.orig
-+++ game5/gameSource/common.cpp
+--- a/game5/gameSource/common.cpp
++++ b/game5/gameSource/common.cpp
 @@ -10,7 +10,7 @@
  
  
@@ -13,8 +13,8 @@
      }
  
  
---- game5/gameSource/musicPlayer.cpp.orig
-+++ game5/gameSource/musicPlayer.cpp
+--- a/game5/gameSource/musicPlayer.cpp
++++ b/game5/gameSource/musicPlayer.cpp
 @@ -393,7 +393,7 @@
  
  void loadMusicImage( char *inTGAFileName ) {
@@ -24,8 +24,8 @@
  
      w = musicImage->getWidth();
      h = musicImage->getHeight();
---- minorGems/util/SettingsManager.cpp.orig
-+++ minorGems/util/SettingsManager.cpp
+--- a/minorGems/util/SettingsManager.cpp
++++ b/minorGems/util/SettingsManager.cpp
 @@ -260,7 +260,7 @@
  
  

Modified: packages/trunk/gravitation/debian/patches/series
===================================================================
--- packages/trunk/gravitation/debian/patches/series	2008-06-09 20:13:01 UTC (rev 7327)
+++ packages/trunk/gravitation/debian/patches/series	2008-06-11 01:31:47 UTC (rev 7328)
@@ -1 +1 @@
-abs_path.patch -p0
+abs_path.patch