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

[Iain Lane]

Author: laney-guest
Date: 2008-12-23 18:26:37 +0000 (Tue, 23 Dec 2008)
New Revision: 8547

Added:
   packages/trunk/opencity/debian/patches/gcc-4.4-fixes
   packages/trunk/opencity/debian/patches/series
Removed:
   packages/trunk/opencity/debian/patches/series
Modified:
   packages/trunk/opencity/debian/
   packages/trunk/opencity/debian/changelog
   packages/trunk/opencity/debian/rules
Log:
* 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.


Property changes on: packages/trunk/opencity/debian
___________________________________________________________________
Name: svn-bp:origUrl
   + http://pkg-games.alioth.debian.org/tarballs/opencity_0.0.6.1stable.orig.tar.gz

Modified: packages/trunk/opencity/debian/changelog
===================================================================
--- packages/trunk/opencity/debian/changelog	2008-12-23 17:01:13 UTC (rev 8546)
+++ packages/trunk/opencity/debian/changelog	2008-12-23 18:26:37 UTC (rev 8547)
@@ -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 ]

Added: packages/trunk/opencity/debian/patches/gcc-4.4-fixes
===================================================================
--- packages/trunk/opencity/debian/patches/gcc-4.4-fixes	                        (rev 0)
+++ packages/trunk/opencity/debian/patches/gcc-4.4-fixes	2008-12-23 18:26:37 UTC (rev 8547)
@@ -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 {

Deleted: packages/trunk/opencity/debian/patches/series
===================================================================
--- packages/trunk/opencity/debian/patches/series	2008-12-23 17:01:13 UTC (rev 8546)
+++ packages/trunk/opencity/debian/patches/series	2008-12-23 18:26:37 UTC (rev 8547)
@@ -1 +0,0 @@
-no-pedantic.diff

Added: packages/trunk/opencity/debian/patches/series
===================================================================
--- packages/trunk/opencity/debian/patches/series	                        (rev 0)
+++ packages/trunk/opencity/debian/patches/series	2008-12-23 18:26:37 UTC (rev 8547)
@@ -0,0 +1 @@
+gcc-4.4-fixes

Modified: packages/trunk/opencity/debian/rules
===================================================================
--- packages/trunk/opencity/debian/rules	2008-12-23 17:01:13 UTC (rev 8546)
+++ packages/trunk/opencity/debian/rules	2008-12-23 18:26:37 UTC (rev 8547)
@@ -102,6 +102,10 @@
 	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