This is an automated email from the git hooks/post-receive script. bbk-guest pushed a commit to branch master in repository trigger-rally.
commit a353dbc5b74e14ae5e687550e07ba02f2fc8abfc Author: Stefan Potyra <[email protected]> Date: Fri Nov 18 22:38:55 2011 +0000 * 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. --- debian/changelog | 6 +++++- debian/control | 3 ++- debian/patches/20_system_tinyxml.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 7 +++++++ 5 files changed, 35 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa4924e..52e1a47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,14 +8,18 @@ trigger-rally (0.6.0-1) UNRELEASED; urgency=low * 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 <[email protected]> Fri, 18 Nov 2011 22:26:17 +0100 + -- Stefan Potyra <[email protected]> Fri, 18 Nov 2011 23:36:12 +0100 trigger-rally (0.5.2.1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 7b75a26..bcb12eb 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 5.0.0), 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 <[email protected]>, Alexander Reichle-Schmehl <[email protected]>, diff --git a/debian/patches/20_system_tinyxml.patch b/debian/patches/20_system_tinyxml.patch new file mode 100644 index 0000000..ef07704 --- /dev/null +++ b/debian/patches/20_system_tinyxml.patch @@ -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 <[email protected]> + +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]) + diff --git a/debian/patches/series b/debian/patches/series index 90e55ae..b1fbcc5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 10_system_glew.patch +20_system_tinyxml.patch diff --git a/debian/rules b/debian/rules index e5e6fbd..74aed24 100755 --- a/debian/rules +++ b/debian/rules @@ -31,6 +31,13 @@ $(MANPAGES): $(addsuffix .sgml,$(MANPAGES)) 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
