r12827 - in packages/trunk/trigger/debian: . patches

[Stefan Potyra]

Author: sistpoty-guest
Date: 2011-11-18 22:38:55 +0000 (Fri, 18 Nov 2011)
New Revision: 12827

Added:
   packages/trunk/trigger/debian/patches/20_system_tinyxml.patch
Modified:
   packages/trunk/trigger/debian/changelog
   packages/trunk/trigger/debian/control
   packages/trunk/trigger/debian/patches/series
   packages/trunk/trigger/debian/rules
Log:
* add debian/patches/20_system_tinyxml.patch to link against the system tinyxml
* add tinyxml to build-depends
* make sure to remove shipped tinyxml before configure is called.


Modified: packages/trunk/trigger/debian/changelog
===================================================================
--- packages/trunk/trigger/debian/changelog	2011-11-18 21:33:05 UTC (rev 12826)
+++ packages/trunk/trigger/debian/changelog	2011-11-18 22:38:55 UTC (rev 12827)
@@ -8,14 +8,18 @@
   * debian/rules: add build-arch/build-indep target.
   * debian/control: bump Standards-Version to 3.9.2, no changes needed apart
     from dropping the transitional package.
+  * debian/control: add libtinyxml-dev to build-depends.
+  * debian/rules: remove shipped tinyxml files before configuring the package.
+  * debian/patches/20_system_tinyxml.patch: link against system tinyxml.
 
   [More work TODO...]
   * shipped tinyxml should go
   * debian/control: fix description (it's not 6 courses any longer!)
   * Check if changes are needed for new standars-version (don't think so).
   * Test all new courses ... :)
+  * make changelog more readable.
 
- -- Stefan Potyra <sistpoty at ubuntu.com>  Fri, 18 Nov 2011 22:26:17 +0100
+ -- Stefan Potyra <sistpoty at ubuntu.com>  Fri, 18 Nov 2011 23:36:12 +0100
 
 trigger-rally (0.5.2.1-2) unstable; urgency=low
 

Modified: packages/trunk/trigger/debian/control
===================================================================
--- packages/trunk/trigger/debian/control	2011-11-18 21:33:05 UTC (rev 12826)
+++ packages/trunk/trigger/debian/control	2011-11-18 22:38:55 UTC (rev 12827)
@@ -10,7 +10,8 @@
  libsdl-image1.2-dev, 
  docbook-to-man, 
  automake (>= 1.9),
- libglew1.5-dev
+ libglew1.5-dev,
+ libtinyxml-dev
 Standards-Version: 3.9.2
 Uploaders: Stefan Potyra <sistpoty at ubuntu.com>, 
  Alexander Reichle-Schmehl <tolimar at debian.org>, 

Added: packages/trunk/trigger/debian/patches/20_system_tinyxml.patch
===================================================================
--- packages/trunk/trigger/debian/patches/20_system_tinyxml.patch	                        (rev 0)
+++ packages/trunk/trigger/debian/patches/20_system_tinyxml.patch	2011-11-18 22:38:55 UTC (rev 12827)
@@ -0,0 +1,20 @@
+Description: trigger-rally ships an internal copy of tinyxml
+ This patch enables trigger to use the system tinxml library.
+ .
+ It's not clean enough yet to be committed upstream.
+ Author: Stefan Potyra <sistpoty at ubuntu.com>
+
+Index: trigger-rally-0.6.0/configure.ac
+===================================================================
+--- trigger-rally-0.6.0.orig/configure.ac	2011-11-18 22:54:53.000000000 +0100
++++ trigger-rally-0.6.0/configure.ac	2011-11-18 23:10:10.963885333 +0100
+@@ -129,6 +129,9 @@
+ AC_SUBST([HAVE_GLEW])
+ AC_SEARCH_LIBS([__glewActiveTextureARB], [GLEW])
+ 
++# link against system tinyxml (if toElement() is available)
++AC_SEARCH_LIBS([_ZN12TiXmlElement9ToElementEv], [tinyxml])
++
+ # Um, can't get this to substitute [app]datadir :/
+ #AC_DEFINE([DATADIR], [$(datadir)], [comment])
+ 

Modified: packages/trunk/trigger/debian/patches/series
===================================================================
--- packages/trunk/trigger/debian/patches/series	2011-11-18 21:33:05 UTC (rev 12826)
+++ packages/trunk/trigger/debian/patches/series	2011-11-18 22:38:55 UTC (rev 12827)
@@ -1 +1,2 @@
 10_system_glew.patch
+20_system_tinyxml.patch

Modified: packages/trunk/trigger/debian/rules
===================================================================
--- packages/trunk/trigger/debian/rules	2011-11-18 21:33:05 UTC (rev 12826)
+++ packages/trunk/trigger/debian/rules	2011-11-18 22:38:55 UTC (rev 12827)
@@ -31,6 +31,13 @@
 configure: configure.ac
 	# make sure that the shipped glew is not used during build
 	$(RM) -r src/glew
+	# same goes for tinyxml
+	$(RM) src/pengine/tinyxml.h
+	$(RM) src/pengine/tinyxmlparser.cpp
+	$(RM) src/pengine/tinyxml.cpp
+	$(RM) src/pengine/tinystr.cpp
+	$(RM) src/pengine/tinyxmlerror.cpp
+	$(RM) src/pengine/tinystr.h
 	./autogen.sh
 
 config.status: configure