r12649 - in packages/trunk/opencity/debian: . patches
Christoph Egger
christoph at alioth.debian.org
Fri Sep 2 18:11:19 UTC 2011
Author: christoph
Date: 2011-09-02 18:11:19 +0000 (Fri, 02 Sep 2011)
New Revision: 12649
Added:
packages/trunk/opencity/debian/patches/remove-use-of-embedded-tinyxml.patch
Modified:
packages/trunk/opencity/debian/changelog
packages/trunk/opencity/debian/control
packages/trunk/opencity/debian/patches/series
packages/trunk/opencity/debian/rules
Log:
Import new upstream release, waiting for some testing
Modified: packages/trunk/opencity/debian/changelog
===================================================================
--- packages/trunk/opencity/debian/changelog 2011-08-30 01:37:39 UTC (rev 12648)
+++ packages/trunk/opencity/debian/changelog 2011-09-02 18:11:19 UTC (rev 12649)
@@ -1,8 +1,16 @@
-opencity (0.0.6.3stable-2) UNRELEASED; urgency=low
+opencity (0.0.6.4stable-1) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * New upstream Version
+ * Build with --as-needed fixed upstream (Closes: #632147)
+ * remove article from synopsis
+ * add misc:depends to opencity-data package
+ * Add build-{arch,indep} targets just depending on build as there's no
+ separatable step for building the arch:all parts
+ * Bump standards version from 3.8.3 to 3.9.2, no (further) changes
+ * Remove quilt bits as the package is source 3.0 (quilt) already
+ anyway
- -- Christoph Egger <christoph at debian.org> Fri, 11 Mar 2011 17:17:50 +0100
+ -- Christoph Egger <christoph at debian.org> Fri, 02 Sep 2011 20:10:28 +0200
opencity (0.0.6.3stable-1) unstable; urgency=low
Modified: packages/trunk/opencity/debian/control
===================================================================
--- packages/trunk/opencity/debian/control 2011-08-30 01:37:39 UTC (rev 12648)
+++ packages/trunk/opencity/debian/control 2011-09-02 18:11:19 UTC (rev 12649)
@@ -4,10 +4,18 @@
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders:
Christoph Egger <christoph at debian.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsdl1.2-dev,
- libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev (>= 1.2.5-7),
- docbook-to-man, libglu1-mesa-dev, quilt, imagemagick, pkg-config
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 5.0.0),
+ autotools-dev,
+ libsdl1.2-dev,
+ libsdl-mixer1.2-dev,
+ libsdl-image1.2-dev,
+ libsdl-net1.2-dev (>= 1.2.5-7),
+ docbook-to-man,
+ libglu1-mesa-dev,
+ imagemagick,
+ libtinyxml-dev,
+ pkg-config
+Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/opencity/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/opencity/?op=log
Homepage: http://www.opencity.info/
@@ -15,7 +23,7 @@
Package: opencity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, opencity-data (= ${source:Version})
-Description: a 3D city simulator game
+Description: 3D city simulator game
OpenCity is 3D city construction simulator. You can build some zones of
housing, trading and industry, electric plant and roads. Besides you can also
raise or lower the terrain.
@@ -25,6 +33,7 @@
Package: opencity-data
Architecture: all
+Depends: ${misc:Depends}
Conflicts: opencity (<< 0.0.5.1stable-2)
Recommends: opencity
Description: data for opencity, a 3D city simulator game
Added: packages/trunk/opencity/debian/patches/remove-use-of-embedded-tinyxml.patch
===================================================================
--- packages/trunk/opencity/debian/patches/remove-use-of-embedded-tinyxml.patch (rev 0)
+++ packages/trunk/opencity/debian/patches/remove-use-of-embedded-tinyxml.patch 2011-09-02 18:11:19 UTC (rev 12649)
@@ -0,0 +1,228 @@
+diff -ur opencity-0.0.6.4stable/configure opencity-0.0.6.4stable.work/configure
+--- opencity-0.0.6.4stable/configure 2011-07-03 19:14:48.000000000 +0200
++++ opencity-0.0.6.4stable.work/configure 2011-09-02 19:45:54.253932007 +0200
+@@ -6194,8 +6194,6 @@
+
+ ac_config_files="$ac_config_files src/structure/Makefile"
+
+-ac_config_files="$ac_config_files src/tinyxml/Makefile"
+-
+ ac_config_files="$ac_config_files src/tinyxpath/Makefile"
+
+ ac_config_files="$ac_config_files src/triangulation/Makefile"
+@@ -6856,7 +6854,6 @@
+ "src/pngfuncs/Makefile") CONFIG_FILES="$CONFIG_FILES src/pngfuncs/Makefile" ;;
+ "src/simulator/Makefile") CONFIG_FILES="$CONFIG_FILES src/simulator/Makefile" ;;
+ "src/structure/Makefile") CONFIG_FILES="$CONFIG_FILES src/structure/Makefile" ;;
+- "src/tinyxml/Makefile") CONFIG_FILES="$CONFIG_FILES src/tinyxml/Makefile" ;;
+ "src/tinyxpath/Makefile") CONFIG_FILES="$CONFIG_FILES src/tinyxpath/Makefile" ;;
+ "src/triangulation/Makefile") CONFIG_FILES="$CONFIG_FILES src/triangulation/Makefile" ;;
+ "viewer/Makefile") CONFIG_FILES="$CONFIG_FILES viewer/Makefile" ;;
+diff -ur opencity-0.0.6.4stable/src/Makefile.in opencity-0.0.6.4stable.work/src/Makefile.in
+--- opencity-0.0.6.4stable/src/Makefile.in 2011-07-03 19:14:47.000000000 +0200
++++ opencity-0.0.6.4stable.work/src/Makefile.in 2011-09-02 19:18:19.921844387 +0200
+@@ -64,7 +64,7 @@
+ oczen_DEPENDENCIES = binreloc/libbinreloc.a mapgen/libmapgen.a \
+ mas/libmas.a model/libmodel.a networking/libnet.a \
+ pngfuncs/libpngfuncs.a simulator/libsim.a \
+- structure/libstruct.a tinyxml/libtinyxml.a \
++ structure/libstruct.a \
+ tinyxpath/libtinyxpath.a triangulation/libtriangulation.a
+ am__opencity_SOURCES_DIST = audiomanager.cpp audiomanagersdl.cpp \
+ buildinglayer.cpp city.cpp conf.cpp destination.cpp \
+@@ -92,7 +92,7 @@
+ opencity_DEPENDENCIES = binreloc/libbinreloc.a mapgen/libmapgen.a \
+ mas/libmas.a model/libmodel.a networking/libnet.a \
+ pngfuncs/libpngfuncs.a simulator/libsim.a \
+- structure/libstruct.a tinyxml/libtinyxml.a \
++ structure/libstruct.a \
+ tinyxpath/libtinyxpath.a triangulation/libtriangulation.a
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -226,7 +226,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = binreloc enum mapgen mas model networking pngfuncs simulator structure tinyxml tinyxpath triangulation
++SUBDIRS = binreloc enum mapgen mas model networking pngfuncs simulator structure tinyxpath triangulation
+ AM_CPPFLAGS = \
+ -I at top_srcdir@/src/ \
+ -I at top_srcdir@/src/binreloc/ \
+@@ -238,7 +238,6 @@
+ -I at top_srcdir@/src/pngfuncs/ \
+ -I at top_srcdir@/src/simulator/ \
+ -I at top_srcdir@/src/structure/ \
+- -I at top_srcdir@/src/tinyxml/ \
+ -I at top_srcdir@/src/tinyxpath/ \
+ -I at top_srcdir@/src/triangulation/ \
+ -DDATADIR=\"@datadir@\" \
+@@ -257,7 +256,7 @@
+ pngfuncs/libpngfuncs.a \
+ simulator/libsim.a \
+ structure/libstruct.a \
+-tinyxml/libtinyxml.a \
++-ltinyxml \
+ tinyxpath/libtinyxpath.a \
+ triangulation/libtriangulation.a
+
+@@ -342,7 +341,7 @@
+ pngfuncs/libpngfuncs.a \
+ simulator/libsim.a \
+ structure/libstruct.a \
+-tinyxml/libtinyxml.a \
++-ltinyxml \
+ tinyxpath/libtinyxpath.a \
+ triangulation/libtriangulation.a
+
+diff -ur opencity-0.0.6.4stable/src/tinyxpath/Makefile.in opencity-0.0.6.4stable.work/src/tinyxpath/Makefile.in
+--- opencity-0.0.6.4stable/src/tinyxpath/Makefile.in 2011-07-03 19:14:47.000000000 +0200
++++ opencity-0.0.6.4stable.work/src/tinyxpath/Makefile.in 2011-09-02 19:34:36.870620447 +0200
+@@ -178,8 +178,6 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CPPFLAGS = \
+- -I at top_srcdir@/src/tinyxml/
+
+ noinst_LIBRARIES = libtinyxpath.a
+ libtinyxpath_a_SOURCES = \
+diff -ur opencity-0.0.6.4stable/src/tinyxpath/node_set.cpp opencity-0.0.6.4stable.work/src/tinyxpath/node_set.cpp
+--- opencity-0.0.6.4stable/src/tinyxpath/node_set.cpp 2011-07-03 18:36:33.000000000 +0200
++++ opencity-0.0.6.4stable.work/src/tinyxpath/node_set.cpp 2011-09-02 19:39:08.579948777 +0200
+@@ -95,7 +95,7 @@
+
+ if ((! cp_lookup) || ! strcmp (XNp_root -> Value (), cp_lookup))
+ v_add_node_in_set (XNp_root);
+- if (XNp_root -> Type () == TiXmlNode::ELEMENT)
++ if (XNp_root -> Type () == TiXmlNode::TINYXML_ELEMENT)
+ {
+ XAp_attrib = XNp_root -> ToElement () -> FirstAttribute ();
+ while (XAp_attrib)
+@@ -142,7 +142,7 @@
+ if (! op_attrib [u_node])
+ {
+ XNp_node = (const TiXmlNode *) vpp_node_set [u_node];
+- if (XNp_node -> Type () == TiXmlNode::TEXT)
++ if (XNp_node -> Type () == TiXmlNode::TINYXML_TEXT)
+ S_res += XNp_node -> Value ();
+ }
+ }
+@@ -211,7 +211,7 @@
+ XNp_ptr = XNp_ptr -> NextSiblingElement ();
+ }
+ XNp_ptr = XNp_node -> Parent ();
+- if (XNp_ptr && XNp_ptr -> Type () == TiXmlNode::ELEMENT)
++ if (XNp_ptr && XNp_ptr -> Type () == TiXmlNode::TINYXML_ELEMENT)
+ v_add_all_foll_node (XNp_ptr, S_name);
+ }
+
+@@ -234,7 +234,7 @@
+ XNp_ptr = XNp_node -> PreviousSibling ();
+ while (XNp_ptr)
+ {
+- if (XNp_ptr -> Type () == TiXmlNode::ELEMENT)
++ if (XNp_ptr -> Type () == TiXmlNode::TINYXML_ELEMENT)
+ {
+ v_add_node_in_set_if_name_or_star (XNp_ptr, S_name);
+ v_copy_node_children (XNp_ptr, cp_lookup);
+diff -ur opencity-0.0.6.4stable/src/tinyxpath/xpath_processor.cpp opencity-0.0.6.4stable.work/src/tinyxpath/xpath_processor.cpp
+--- opencity-0.0.6.4stable/src/tinyxpath/xpath_processor.cpp 2011-07-03 18:36:33.000000000 +0200
++++ opencity-0.0.6.4stable.work/src/tinyxpath/xpath_processor.cpp 2011-09-02 19:40:09.756247843 +0200
+@@ -49,7 +49,7 @@
+ class TiXmlNodeManip : public TiXmlNode
+ {
+ public :
+- TiXmlNodeManip () : TiXmlNode (TiXmlNode::UNKNOWN) {}
++ TiXmlNodeManip () : TiXmlNode (TiXmlNode::TINYXML_UNKNOWN) {}
+ void v_reset (const TiXmlNode * XNp_parent, const TiXmlNode * XNp_next, const TiXmlNode * XNp_prev)
+ {
+ parent = (TiXmlNode *) XNp_parent;
+@@ -1196,7 +1196,7 @@
+ XNp_next = XEp_father -> PreviousSibling ();
+ while (XNp_next)
+ {
+- if (XNp_next -> Type () == TiXmlNode::ELEMENT)
++ if (XNp_next -> Type () == TiXmlNode::TINYXML_ELEMENT)
+ ns_target . v_add_node_in_set_if_name_or_star (XNp_next, S_name);
+ XNp_next = XNp_next -> PreviousSibling ();
+ }
+@@ -1229,7 +1229,7 @@
+ XNp_next = XEp_father -> FirstChild ();
+ while (XNp_next)
+ {
+- if (XNp_next -> Type () == TiXmlNode::COMMENT)
++ if (XNp_next -> Type () == TiXmlNode::TINYXML_COMMENT)
+ ns_target . v_add_node_in_set (XNp_next);
+ XNp_next = XNp_next -> NextSibling ();
+ }
+@@ -1238,7 +1238,7 @@
+ XNp_next = XEp_father -> FirstChild ();
+ while (XNp_next)
+ {
+- if (XNp_next -> Type () == TiXmlNode::TEXT)
++ if (XNp_next -> Type () == TiXmlNode::TINYXML_TEXT)
+ ns_target . v_add_node_in_set (XNp_next);
+ XNp_next = XNp_next -> NextSibling ();
+ }
+@@ -1728,7 +1728,7 @@
+ XNp_child = XEp_context -> FirstChild ();
+ while (XNp_child)
+ {
+- if (XNp_child -> Type () == TiXmlNode::TEXT)
++ if (XNp_child -> Type () == TiXmlNode::TINYXML_TEXT)
+ S_res += XNp_child -> Value ();
+ XNp_child = XNp_child -> NextSibling ();
+ }
+diff -ur opencity-0.0.6.4stable/src/tinyxpath/xpath_stream.h opencity-0.0.6.4stable.work/src/tinyxpath/xpath_stream.h
+--- opencity-0.0.6.4stable/src/tinyxpath/xpath_stream.h 2011-07-03 18:36:33.000000000 +0200
++++ opencity-0.0.6.4stable.work/src/tinyxpath/xpath_stream.h 2011-09-02 19:48:56.646823680 +0200
+@@ -34,7 +34,6 @@
+ #include "byte_stream.h"
+ #include "xpath_syntax.h"
+ #include "tinyxml.h"
+-#include "tinystr.h"
+
+ namespace TinyXPath
+ {
+Only in opencity-0.0.6.4stable.work/src/tinyxpath: xpath_stream.h~
+diff -ur opencity-0.0.6.4stable/src/zen.cpp opencity-0.0.6.4stable.work/src/zen.cpp
+--- opencity-0.0.6.4stable/src/zen.cpp 2011-07-03 18:36:34.000000000 +0200
++++ opencity-0.0.6.4stable.work/src/zen.cpp 2011-09-02 19:47:20.726354749 +0200
+@@ -37,7 +37,7 @@
+ // Libraries headers
+ #include "SDL_image.h"
+ #include "binreloc.h" // BinReloc routines from AutoPackage
+-#include "tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ #include "SimpleOpt.h" // Simple command line argument parser
+
+ // Standard headers
+diff -ur opencity-0.0.6.4stable/viewer/Makefile.in opencity-0.0.6.4stable.work/viewer/Makefile.in
+--- opencity-0.0.6.4stable/viewer/Makefile.in 2011-07-03 19:14:47.000000000 +0200
++++ opencity-0.0.6.4stable.work/viewer/Makefile.in 2011-09-02 19:31:26.905691759 +0200
+@@ -54,7 +54,7 @@
+ viewer_DEPENDENCIES = ../src/model/libmodel.a \
+ ../src/pngfuncs/libpngfuncs.a ../src/structure/libstruct.a \
+ ../src/triangulation/libtriangulation.a \
+- ../src/tinyxml/libtinyxml.a ../src/tinyxpath/libtinyxpath.a
++ ../src/tinyxpath/libtinyxpath.a
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -185,7 +185,6 @@
+ -I at top_srcdir@/src/networking/ \
+ -I at top_srcdir@/src/pngfuncs/ \
+ -I at top_srcdir@/src/structure/ \
+- -I at top_srcdir@/src/tinyxml/ \
+ -I at top_srcdir@/src/tinyxpath/
+
+ viewer_LDADD = \
+@@ -193,7 +192,7 @@
+ ../src/pngfuncs/libpngfuncs.a \
+ ../src/structure/libstruct.a \
+ ../src/triangulation/libtriangulation.a \
+- ../src/tinyxml/libtinyxml.a \
++ -ltinyxml \
+ ../src/tinyxpath/libtinyxpath.a
+
+ viewer_SOURCES = \
Modified: packages/trunk/opencity/debian/patches/series
===================================================================
--- packages/trunk/opencity/debian/patches/series 2011-08-30 01:37:39 UTC (rev 12648)
+++ packages/trunk/opencity/debian/patches/series 2011-09-02 18:11:19 UTC (rev 12649)
@@ -1 +1 @@
-
+remove-use-of-embedded-tinyxml.patch
Modified: packages/trunk/opencity/debian/rules
===================================================================
--- packages/trunk/opencity/debian/rules 2011-08-30 01:37:39 UTC (rev 12648)
+++ packages/trunk/opencity/debian/rules 2011-09-02 18:11:19 UTC (rev 12649)
@@ -18,7 +18,6 @@
endif
config.status: configure
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
dh_testdir
[ ! -f Makefile ] || $(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -31,6 +30,7 @@
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --datadir=/usr/share/games --sysconfdir=/etc
+build-arch build-indep: build
build: build-stamp
build-stamp: config.status
@@ -52,7 +52,6 @@
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean debian/opencity.xpm config.log \
debian/opencity.6 config.sub config.guess config.status
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
rm -rf .pc
install: build
More information about the Pkg-games-commits
mailing list