r7332 - in packages/trunk/opencity/debian: . patches

[Cyril Brulebois]

Author: kibi
Date: 2008-06-11 02:09:49 +0000 (Wed, 11 Jun 2008)
New Revision: 7332

Modified:
   packages/trunk/opencity/debian/changelog
   packages/trunk/opencity/debian/patches/no-pedantic.diff
   packages/trunk/opencity/debian/patches/series
Log:
Adjust patch level to avoid FTBFS with new source package format (Closes: #485352).

Modified: packages/trunk/opencity/debian/changelog
===================================================================
--- packages/trunk/opencity/debian/changelog	2008-06-11 02:02:07 UTC (rev 7331)
+++ packages/trunk/opencity/debian/changelog	2008-06-11 02:09:49 UTC (rev 7332)
@@ -9,6 +9,12 @@
   [ Ansgar Burchardt ]
   * debian/control: Add Homepage field
 
+  [ Cyril Brulebois ]
+  * Fix FTBFS with new “3.0 (quilt)” source package format by using a
+    patch level of 1 instead of 0 in the no-pedantic.diff patch and by
+    adjusting the series file appropriately (i.e. by deleting the “-p0”
+    option), thanks to Raphaël Hertzog for the notice (Closes: #485352).
+
  -- Goneri Le Bouder <goneri at rulezlan.org>  Sun, 23 Mar 2008 13:53:23 +0100
 
 opencity (0.0.5.1stable-1) unstable; urgency=low

Modified: packages/trunk/opencity/debian/patches/no-pedantic.diff
===================================================================
--- packages/trunk/opencity/debian/patches/no-pedantic.diff	2008-06-11 02:02:07 UTC (rev 7331)
+++ packages/trunk/opencity/debian/patches/no-pedantic.diff	2008-06-11 02:09:49 UTC (rev 7332)
@@ -1,7 +1,5 @@
-Index: configure
-===================================================================
---- configure.orig
-+++ configure
+--- a/configure
++++ b/configure
 @@ -4914,7 +4914,7 @@
  fi;
  

Modified: packages/trunk/opencity/debian/patches/series
===================================================================
--- packages/trunk/opencity/debian/patches/series	2008-06-11 02:02:07 UTC (rev 7331)
+++ packages/trunk/opencity/debian/patches/series	2008-06-11 02:09:49 UTC (rev 7332)
@@ -1 +1 @@
-no-pedantic.diff -p0
+no-pedantic.diff