This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository tecnoballz.
commit 2d28b7d4e914afd18bbeec09262b17f5d1b4f5ae Author: Ansgar Burchardt <[email protected]> Date: Sun Aug 14 12:17:08 2011 +0000 Use tinyxml system library. --- debian/changelog | 1 + debian/control | 2 +- debian/patches/series | 1 + debian/patches/system-tinyxml.diff | 96 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 832f61d..7fc7a34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ tecnoballz (0.92-5) unstable; urgency=low * Clean up two more files modified by autoreconf. [ Ansgar Burchardt ] + * Use tinyxml system library. * Use XZ compression for binary packages. * Bump Standards-Version to 3.9.2 (no changes). diff --git a/debian/control b/debian/control index 2f0082e..c8297dc 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 8), autoconf, automake, dpkg-dev (>= 1.15.7~), libmikmod2-dev, libxext-dev, libvorbis-dev, libogg-dev, libsmpeg-dev, libxxf86dga-dev, libxxf86vm-dev, autotools-dev, - libsdl-image1.2-dev + libsdl-image1.2-dev, libtinyxml-dev Standards-Version: 3.9.2 Homepage: http://linux.tlk.fr/games/TecnoballZ/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/tecnoballz/ diff --git a/debian/patches/series b/debian/patches/series index faddf88..291bf8e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 030_texts_dir.diff 031_honor_cxxflags.diff 032_warnings.patch +system-tinyxml.diff diff --git a/debian/patches/system-tinyxml.diff b/debian/patches/system-tinyxml.diff new file mode 100644 index 0000000..c521c29 --- /dev/null +++ b/debian/patches/system-tinyxml.diff @@ -0,0 +1,96 @@ +From: Ansgar Burchardt <[email protected]> +Date: Sun, 14 Aug 2011 14:08:35 +0200 +Subject: Use tinyxml system library +Origin: vendor + +--- tecnoballz.orig/include/handler_levels.h ++++ tecnoballz/include/handler_levels.h +@@ -32,7 +32,7 @@ + class handler_levels; + + #include "../include/tecnoballz.h" +-#include "../include/tinyxml.h" ++#include <tinyxml.h> + #include <string.h> + + typedef struct +--- tecnoballz.orig/include/tinystr.h ++++ tecnoballz/include/tinystr.h +@@ -34,6 +34,8 @@ + * - added swap(), clear(), size(), capacity(), operator+(). + */ + ++#error "Embedded copy of libtinyxml-dev should not be used." ++ + #ifndef TIXML_USE_STL + + #ifndef TIXML_STRING_INCLUDED +--- tecnoballz.orig/include/tinyxml.h ++++ tecnoballz/include/tinyxml.h +@@ -22,6 +22,7 @@ + distribution. + */ + ++#error "Embedded copy of libtinyxml-dev should not be used." + + #ifndef TINYXML_INCLUDED + #define TINYXML_INCLUDED +--- tecnoballz.orig/src/Makefile.am ++++ tecnoballz/src/Makefile.am +@@ -9,7 +9,7 @@ + games_PROGRAMS = tecnoballz + tecnoballz_SOURCES = $(SOURCES_MAIN) + tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@ +-tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MM_LIBS@ @MIKMOD_LIBS@ -L. ++tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MM_LIBS@ @MIKMOD_LIBS@ -ltinyxml -L. + + SOURCES_MAIN = \ + bitmap_data.cc \ +@@ -81,9 +81,5 @@ + tecnoballz.cc \ + tiles_background.cc \ + tilesmap_scrolling.cc \ +- tinyxml.cc \ +- tinyxmlerror.cc \ +- tinyxmlparser.cc \ +- tinystr.cc + $(NULL) + +--- tecnoballz.orig/src/handler_levels.cc ++++ tecnoballz/src/handler_levels.cc +@@ -29,7 +29,7 @@ + using namespace std; + #include "../include/handler_levels.h" + #include "../include/handler_resources.h" +-#include "../include/tinyxml.h" ++#include <tinyxml.h> + #include <string.h> + #include <sstream> + +@@ -143,7 +143,7 @@ + Sint32 type = parent->Type (); + switch (type) + { +- case TiXmlNode::ELEMENT: ++ case TiXmlNode::TINYXML_ELEMENT: + { + string element = parent->Value (); + if (element == "level") +@@ -221,7 +221,7 @@ + string name; + switch (type) + { +- case TiXmlNode::ELEMENT: ++ case TiXmlNode::TINYXML_ELEMENT: + { + element = parent->ToElement (); + last_element = parent->Value (); +@@ -290,7 +290,7 @@ + break; + + +- case TiXmlNode::TEXT: ++ case TiXmlNode::TINYXML_TEXT: + text = parent->ToText (); + value_str = text->Value (); + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/tecnoballz.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
