r7331 - in packages/trunk/funnyboat/debian: . patches

[Cyril Brulebois]

Author: kibi
Date: 2008-06-11 02:02:07 +0000 (Wed, 11 Jun 2008)
New Revision: 7331

Modified:
   packages/trunk/funnyboat/debian/changelog
   packages/trunk/funnyboat/debian/patches/funnyboat-cursor-patch.diff
   packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.diff
   packages/trunk/funnyboat/debian/patches/series
   packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.diff
Log:
Adjust patch level to avoid FTBFS with new source package format (Closes: #485347).

Modified: packages/trunk/funnyboat/debian/changelog
===================================================================
--- packages/trunk/funnyboat/debian/changelog	2008-06-11 01:51:51 UTC (rev 7330)
+++ packages/trunk/funnyboat/debian/changelog	2008-06-11 02:02:07 UTC (rev 7331)
@@ -1,3 +1,12 @@
+funnyboat (1.5-7) 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: #485347).
+
+ -- Cyril Brulebois <kibi at debian.org>  Wed, 11 Jun 2008 04:02:37 +0200
+
 funnyboat (1.5-6) unstable; urgency=low
 
   * Remove python-numeric from the runtime dependency since it

Modified: packages/trunk/funnyboat/debian/patches/funnyboat-cursor-patch.diff
===================================================================
--- packages/trunk/funnyboat/debian/patches/funnyboat-cursor-patch.diff	2008-06-11 01:51:51 UTC (rev 7330)
+++ packages/trunk/funnyboat/debian/patches/funnyboat-cursor-patch.diff	2008-06-11 02:02:07 UTC (rev 7331)
@@ -1,5 +1,5 @@
---- main.py.orig	2008-04-22 23:46:13.000000000 -0700
-+++ main.py	2008-04-22 23:40:16.000000000 -0700
+--- a/main.py
++++ b/main.py
 @@ -62,6 +62,8 @@
      pygame.display.set_icon(util.load_image("kuvake"))
      pygame.display.set_caption("Trip on the Funny Boat")

Modified: packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.diff
===================================================================
--- packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.diff	2008-06-11 01:51:51 UTC (rev 7330)
+++ packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.diff	2008-06-11 02:02:07 UTC (rev 7331)
@@ -1,7 +1,7 @@
 Index: game.py
 ===================================================================
---- game.py.orig
-+++ game.py
+--- a/game.py
++++ b/game.py
 @@ -245,10 +245,13 @@
  
      def take_screenshot(self):

Modified: packages/trunk/funnyboat/debian/patches/series
===================================================================
--- packages/trunk/funnyboat/debian/patches/series	2008-06-11 01:51:51 UTC (rev 7330)
+++ packages/trunk/funnyboat/debian/patches/series	2008-06-11 02:02:07 UTC (rev 7331)
@@ -1,3 +1,3 @@
-save-sshot-in-homedir.diff -p0
-use_debian_vera_ttf.diff -p0
-funnyboat-cursor-patch.diff -p0
+save-sshot-in-homedir.diff
+use_debian_vera_ttf.diff
+funnyboat-cursor-patch.diff

Modified: packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.diff
===================================================================
--- packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.diff	2008-06-11 01:51:51 UTC (rev 7330)
+++ packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.diff	2008-06-11 02:02:07 UTC (rev 7331)
@@ -1,7 +1,7 @@
 Index: util.py
 ===================================================================
---- util.py.orig
-+++ util.py
+--- a/util.py
++++ b/util.py
 @@ -9,8 +9,8 @@
  
  # The Cosmetica font seemed to be broken... had trouble rendering small text