r7329 - in packages/trunk/passage/debian: . patches

[Cyril Brulebois]

Author: kibi
Date: 2008-06-11 01:45:02 +0000 (Wed, 11 Jun 2008)
New Revision: 7329

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

Modified: packages/trunk/passage/debian/changelog
===================================================================
--- packages/trunk/passage/debian/changelog	2008-06-11 01:31:47 UTC (rev 7328)
+++ packages/trunk/passage/debian/changelog	2008-06-11 01:45:02 UTC (rev 7329)
@@ -1,3 +1,12 @@
+passage (3+dfsg1-3) unstable; urgency=low
+
+  * Fix FTBFS with new “3.0 (quilt)” source package format by using a
+    patch level of 1 instead of 0 in the patches and by adjusting the
+    series file appropriately (i.e. by deleting the “-p0” option),
+    thanks to Raphaël Hertzog for the notice (Closes: #485262).
+
+ -- Cyril Brulebois <kibi at debian.org>  Wed, 11 Jun 2008 03:38:20 +0200
+
 passage (3+dfsg1-2) unstable; urgency=low
 
   * Add patch from upstream CVS to fix amd64 brokenness (Closes: #475334)

Modified: packages/trunk/passage/debian/patches/abs_path.patch
===================================================================
--- packages/trunk/passage/debian/patches/abs_path.patch	2008-06-11 01:31:47 UTC (rev 7328)
+++ packages/trunk/passage/debian/patches/abs_path.patch	2008-06-11 01:45:02 UTC (rev 7329)
@@ -2,8 +2,8 @@
 Paul Wise <pabs at debian.org>
 Placed in the Public Domain
 Use absolute paths to the installed data files.
---- gamma256/gameSource/common.cpp.orig
-+++ gamma256/gameSource/common.cpp
+--- a/gamma256/gameSource/common.cpp
++++ b/gamma256/gameSource/common.cpp
 @@ -10,7 +10,7 @@
  
  
@@ -13,8 +13,8 @@
      }
  
  
---- gamma256/gameSource/musicPlayer.cpp.orig
-+++ gamma256/gameSource/musicPlayer.cpp
+--- a/gamma256/gameSource/musicPlayer.cpp
++++ b/gamma256/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/passage/debian/patches/amd64_fix.patch
===================================================================
--- packages/trunk/passage/debian/patches/amd64_fix.patch	2008-06-11 01:31:47 UTC (rev 7328)
+++ packages/trunk/passage/debian/patches/amd64_fix.patch	2008-06-11 01:45:02 UTC (rev 7329)
@@ -1,8 +1,8 @@
 Jason Rohrer <jasonrohrer at fastmail.fm>
 http://bugs.debian.org/475334
 Patch from upstream CVS to fix brokenness on amd64.
---- gamma256/gameSource/landscape.cpp.orig
-+++ gamma256/gameSource/landscape.cpp
+--- a/gamma256/gameSource/landscape.cpp
++++ b/gamma256/gameSource/landscape.cpp
 @@ -135,21 +135,21 @@
   */
  // this is the readable version of the funcion

Modified: packages/trunk/passage/debian/patches/series
===================================================================
--- packages/trunk/passage/debian/patches/series	2008-06-11 01:31:47 UTC (rev 7328)
+++ packages/trunk/passage/debian/patches/series	2008-06-11 01:45:02 UTC (rev 7329)
@@ -1,2 +1,2 @@
-abs_path.patch -p0
-amd64_fix.patch -p0
+abs_path.patch
+amd64_fix.patch