[opencity] 48/91: * New upstream release * debian/patches/no-pedantic.diff: Dropped, not needed any more. * debian/patches/gcc-4.4-fixes: Fix build with upcoming GCC version 4.4, with thanks to Martin Michlmayr (Closes: #504950). * debian/rules: Add get-orig-source to download and repack upstream bz2 source with uscan.

[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 d8e717aa7a745870fea4a03a36a05e540921f02a
Author: Iain Lane <laney at debian.org>
Date:   Tue Dec 23 18:26:37 2008 +0000

    * New upstream release
    * debian/patches/no-pedantic.diff: Dropped, not needed any more.
    * debian/patches/gcc-4.4-fixes: Fix build with upcoming GCC version
      4.4, with thanks to Martin Michlmayr (Closes: #504950).
    * debian/rules: Add get-orig-source to download and repack upstream
      bz2 source with uscan.
---
 debian/changelog             | 11 +++++++++++
 debian/patches/gcc-4.4-fixes | 36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  2 +-
 debian/rules                 |  4 ++++
 4 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7ab2601..1456f98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+opencity (0.0.6.1stable-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/no-pedantic.diff: Dropped, not needed any more.
+  * debian/patches/gcc-4.4-fixes: Fix build with upcoming GCC version
+    4.4, with thanks to Martin Michlmayr (Closes: #504950).
+  * debian/rules: Add get-orig-source to download and repack upstream
+    bz2 source with uscan.
+
+ -- Iain Lane <laney at ubuntu.com>  Tue, 23 Dec 2008 18:18:59 +0000
+
 opencity (0.0.5.1stable-2) experimental; urgency=low
 
   [ Ansgar Burchardt ]
diff --git a/debian/patches/gcc-4.4-fixes b/debian/patches/gcc-4.4-fixes
new file mode 100644
index 0000000..2b210a6
--- /dev/null
+++ b/debian/patches/gcc-4.4-fixes
@@ -0,0 +1,36 @@
+Index: opencity-0.0.6stable/src/model/ac3dmaterial.cpp
+===================================================================
+--- opencity-0.0.6stable.orig/src/model/ac3dmaterial.cpp	2008-12-23 18:12:54.000000000 +0000
++++ opencity-0.0.6stable/src/model/ac3dmaterial.cpp	2008-12-23 18:13:06.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include "macros.h"				// for debugging macros
+ #include "ac3dmacros.h"
+ 
++#include <cstdio>
+ #include <sstream>
+ 
+ using std::stringstream;
+Index: opencity-0.0.6stable/src/model/ac3dobject.cpp
+===================================================================
+--- opencity-0.0.6stable.orig/src/model/ac3dobject.cpp	2008-12-23 18:12:34.000000000 +0000
++++ opencity-0.0.6stable/src/model/ac3dobject.cpp	2008-12-23 18:12:45.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include "ac3dmacros.h"			// AC3D specific macros
+ 
+ #include <cstring>
++#include <cstdio>
+ #include <cstdlib>
+ 
+ 
+Index: opencity-0.0.6stable/src/model/ac3dsurface.cpp
+===================================================================
+--- opencity-0.0.6stable.orig/src/model/ac3dsurface.cpp	2008-12-23 18:13:14.000000000 +0000
++++ opencity-0.0.6stable/src/model/ac3dsurface.cpp	2008-12-23 18:13:26.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include "macros.h"		// debug macros
+ #include "ac3dmacros.h"
+ 
++#include <cstdio>
+ #include <cstring>
+ 
+ namespace AC3D {
diff --git a/debian/patches/series b/debian/patches/series
index e73fbae..e901c11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-no-pedantic.diff
+gcc-4.4-fixes
diff --git a/debian/rules b/debian/rules
index 631b440..6d8754e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,6 +102,10 @@ binary-arch: build install
 	dh_md5sums -a
 	dh_builddeb -a
 
+DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname )
+
+get-orig-source:
+	cd $(DEBIAN_DIR)/.. && uscan --force-download --repack
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 

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