[opencity] 46/91: Adjust patch level to avoid FTBFS with new source package format (Closes: #485352).

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository opencity.

commit 472c32161a8c2c441d86d5d722f0ff694c50b546
Author: Cyril Brulebois <kibi at debian.org>
Date:   Wed Jun 11 02:09:49 2008 +0000

    Adjust patch level to avoid FTBFS with new source package format (Closes: #485352).
---
 debian/changelog                | 6 ++++++
 debian/patches/no-pedantic.diff | 6 ++----
 debian/patches/series           | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f73278..8f418fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,12 @@ opencity (0.0.5.1stable-2) UNRELEASED; urgency=low
   [ 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
diff --git a/debian/patches/no-pedantic.diff b/debian/patches/no-pedantic.diff
index 03f77a1..da617f4 100644
--- a/debian/patches/no-pedantic.diff
+++ b/debian/patches/no-pedantic.diff
@@ -1,7 +1,5 @@
-Index: configure
-===================================================================
---- configure.orig
-+++ configure
+--- a/configure
++++ b/configure
 @@ -4914,7 +4914,7 @@
  fi;
  
diff --git a/debian/patches/series b/debian/patches/series
index 4848427..e73fbae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-no-pedantic.diff -p0
+no-pedantic.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/opencity.git