r12651 - in packages/tags/opencity: ! dirs' list truncated !
Christoph Egger
christoph at alioth.debian.org
Fri Sep 2 18:21:26 UTC 2011
Author: christoph
Date: 2011-09-02 18:21:25 +0000 (Fri, 02 Sep 2011)
New Revision: 12651
Added:
packages/tags/opencity/0.0.6.4stable-1/
packages/tags/opencity/0.0.6.4stable-1/debian/changelog
packages/tags/opencity/0.0.6.4stable-1/debian/control
packages/tags/opencity/0.0.6.4stable-1/debian/patches/remove-use-of-embedded-tinyxml.patch
packages/tags/opencity/0.0.6.4stable-1/debian/patches/series
packages/tags/opencity/0.0.6.4stable-1/debian/rules
Removed:
packages/tags/opencity/0.0.6.4stable-1/debian/changelog
packages/tags/opencity/0.0.6.4stable-1/debian/control
packages/tags/opencity/0.0.6.4stable-1/debian/patches/series
packages/tags/opencity/0.0.6.4stable-1/debian/rules
Log:
[svn-buildpackage] Tagging opencity 0.0.6.4stable-1
Deleted: packages/tags/opencity/0.0.6.4stable-1/debian/changelog
===================================================================
--- packages/trunk/opencity/debian/changelog 2011-07-02 07:22:21 UTC (rev 12487)
+++ packages/tags/opencity/0.0.6.4stable-1/debian/changelog 2011-09-02 18:21:25 UTC (rev 12651)
@@ -1,177 +0,0 @@
-opencity (0.0.6.3stable-2) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- Christoph Egger <christoph at debian.org> Fri, 11 Mar 2011 17:17:50 +0100
-
-opencity (0.0.6.3stable-1) unstable; urgency=low
-
- * New upstream version
-
- -- Christoph Egger <christoph at debian.org> Sun, 20 Dec 2009 13:08:21 +0100
-
-opencity (0.0.6.2stable-1) unstable; urgency=low
-
- * New upstream Release
- * Add myself to uploaders
- * Drop patch »gcc-4.4-fixes« (applied upstream)
- * Bump standards Version 3.8.0 -> 3.8.3 (no changes)
-
- -- Christoph Egger <christoph at debian.org> Sun, 20 Dec 2009 08:34:18 +0100
-
-opencity (0.0.6.1stable-5) unstable; urgency=low
-
- * opencity-data conflicts with opencity (<< 0.0.5.1stable-2), thanks
- Goswin Brederlow (Closes: #517669)
- * Fix a typo in opencity-data description, thanks Enrico Zini and
- Steve Cotton (Closes: #517219)
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 01 Mar 2009 16:04:31 +0100
-
-opencity (0.0.6.1stable-4) unstable; urgency=low
-
- [ Gerfried Fuchs ]
- * Make opencity binNMU safe, depend on ${source:Version} of opencity-data
- instead of ${binary:Version} (Closes: #517380)
-
- [ Gonéri Le Bouder ]
- * Drop a trailing whitespace in the Architecture: field of opencity-data,
- see #517555
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Sat, 28 Feb 2009 17:07:16 +0100
-
-opencity (0.0.6.1stable-3) unstable; urgency=low
-
- * Upload in unstable
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Sat, 14 Feb 2009 15:08:29 +0100
-
-opencity (0.0.6.1stable-2) experimental; urgency=low
-
- * opencity depends on opencity-data (= binary:Version)
- (Closes: #513803)
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 01 Feb 2009 14:33:50 +0100
-
-opencity (0.0.6.1stable-1) experimental; urgency=low
-
- [ Iain Lane ]
- * 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.
-
- [ Gonéri Le Bouder ]
- * Clean debian/opencity.xpm
- * use dh_clean to clean temp files
- * upload to experimental because of Lenny freeze
- * Use the config.status target to install up to date config.{sub,guess}
- * opencity depends on opencity-data (= source:Upstream-Version) instead of
- (>= source:Version)
- * update the copyright section for the debian/* files
- * update the debian/copyright file
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Thu, 01 Jan 2009 15:51:36 +0100
-
-opencity (0.0.5.1stable-2) experimental; urgency=low
-
- [ Ansgar Burchardt ]
- * debian/control: Change XS-Vcs-* to Vcs-*
-
- [ Gonéri Le Bouder ]
- * upload to experimental because of the Lenny freeze
- * fix a little syntaxe error in the manpage
- * clean config.guess
- * add opencity-data, thanks Guillem Jover (Closes: #496237)
- * use dh_install to install the files
- - add opencity{,-data}.install
- - do some clean up around this part of the rules file
- * bump the standards version to 3.8.0. No change.
-
- [ Ansgar Burchardt ]
- * debian/control: Add Homepage field
-
- [ Cyril Brulebois ]
- * Fix FTBFS with new “3.0 (quilt)” source package format by using a
- patch level of 1 instead of 0 in the no-pedantic.diff patch and by
- adjusting the series file appropriately (i.e. by deleting the “-p0”
- option), thanks to Raphaël Hertzog for the notice (Closes: #485352).
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 24 Aug 2008 21:12:23 +0200
-
-opencity (0.0.5.1stable-1) unstable; urgency=low
-
- [ Gonéri Le Bouder ]
- * new upstream release (Closes: #462371)
- + --sysconfdir=/etc
- + use ./opencity.png instead of ./OpenCity.png
- + install the new doc
- + add no-pedantic.diff to turn of the pedantic mode
- * remove:
- + fix_gcc-4.3.diff: merged with upstream
- + fix_homedir.diff: not needed anymore
- * standard version 3.7.3, no change needed
- * update debian/copyright
- * remove the deprecated Encoding section from the desktop file
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Thu, 24 Jan 2008 21:42:56 +0100
-
-opencity (0.0.4stable-3) unstable; urgency=low
-
- [ Eddy Petrișor ]
- * added Encoding field in the desktop file
-
- [ Jon Dowland ]
- * update menu section to "Games/Action" for menu policy transition.
- Thanks Linas Žvirblis.
-
- [ Cyril Brulebois ]
- * Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
- * Fixed copyright:
- - Added missing “or any later version” to match upstream's copyright
- statement in the COPYRIGHT file (Closes: #442034).
- - Fixed public domain statement by replacing the copyright by an
- authorship statement (Closes: #442056).
-
- [ Gonéri Le Bouder ]
- * do not ignore make distclean return anymore
- * install LEGGIMI.txt and FAQ.txt in /usr/share/doc/opencity and remove some
- useless files (Closes: #442029)
- * use imagemagick's convert to create the .xpm from OpenCity.png
- - new builddep: imagemagick
- - remove debian/opencity.xpm
- * clean target removes quilt .pc directory and debian/opencity.6
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Sat, 15 Sep 2007 12:13:27 +0200
-
-opencity (0.0.4stable-2) unstable; urgency=low
-
- * datafiles in /usr/share/games/opencity (Closes: #405042)
- - add fix_homedir.diff to preinitialise this value
- - use quilt to apply the patch
- * add desktop and icon files
- * add the patch from Martin Michlmayr to fix the build with gcc-4.3
- (Closes: #421124)
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 31 Dec 2006 09:52:22 +0100
-
-opencity (0.0.4stable-1) unstable; urgency=low
-
- * new upstream release
- * The sentence "Besides you can also raise or lower the terrain." was
- two time in the desciption (Closes: #378216)
- * update of the copyright file (thanks Duong-Khang NGUYEN)
- * minor clean up in rules file
- * add libglu1-mesa-dev in builddeps
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Thu, 30 Nov 2006 16:06:21 +0100
-
-
-opencity (0.0.3stable-1) unstable; urgency=low
-
- * Initial release (Closes: #359340)
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Tue, 28 Mar 2006 00:15:33 +0200
-
Copied: packages/tags/opencity/0.0.6.4stable-1/debian/changelog (from rev 12650, packages/trunk/opencity/debian/changelog)
===================================================================
--- packages/tags/opencity/0.0.6.4stable-1/debian/changelog (rev 0)
+++ packages/tags/opencity/0.0.6.4stable-1/debian/changelog 2011-09-02 18:21:25 UTC (rev 12651)
@@ -0,0 +1,185 @@
+opencity (0.0.6.4stable-1) unstable; urgency=low
+
+ * 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, 02 Sep 2011 20:10:28 +0200
+
+opencity (0.0.6.3stable-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Christoph Egger <christoph at debian.org> Sun, 20 Dec 2009 13:08:21 +0100
+
+opencity (0.0.6.2stable-1) unstable; urgency=low
+
+ * New upstream Release
+ * Add myself to uploaders
+ * Drop patch »gcc-4.4-fixes« (applied upstream)
+ * Bump standards Version 3.8.0 -> 3.8.3 (no changes)
+
+ -- Christoph Egger <christoph at debian.org> Sun, 20 Dec 2009 08:34:18 +0100
+
+opencity (0.0.6.1stable-5) unstable; urgency=low
+
+ * opencity-data conflicts with opencity (<< 0.0.5.1stable-2), thanks
+ Goswin Brederlow (Closes: #517669)
+ * Fix a typo in opencity-data description, thanks Enrico Zini and
+ Steve Cotton (Closes: #517219)
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 01 Mar 2009 16:04:31 +0100
+
+opencity (0.0.6.1stable-4) unstable; urgency=low
+
+ [ Gerfried Fuchs ]
+ * Make opencity binNMU safe, depend on ${source:Version} of opencity-data
+ instead of ${binary:Version} (Closes: #517380)
+
+ [ Gonéri Le Bouder ]
+ * Drop a trailing whitespace in the Architecture: field of opencity-data,
+ see #517555
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Sat, 28 Feb 2009 17:07:16 +0100
+
+opencity (0.0.6.1stable-3) unstable; urgency=low
+
+ * Upload in unstable
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Sat, 14 Feb 2009 15:08:29 +0100
+
+opencity (0.0.6.1stable-2) experimental; urgency=low
+
+ * opencity depends on opencity-data (= binary:Version)
+ (Closes: #513803)
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 01 Feb 2009 14:33:50 +0100
+
+opencity (0.0.6.1stable-1) experimental; urgency=low
+
+ [ Iain Lane ]
+ * 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.
+
+ [ Gonéri Le Bouder ]
+ * Clean debian/opencity.xpm
+ * use dh_clean to clean temp files
+ * upload to experimental because of Lenny freeze
+ * Use the config.status target to install up to date config.{sub,guess}
+ * opencity depends on opencity-data (= source:Upstream-Version) instead of
+ (>= source:Version)
+ * update the copyright section for the debian/* files
+ * update the debian/copyright file
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Thu, 01 Jan 2009 15:51:36 +0100
+
+opencity (0.0.5.1stable-2) experimental; urgency=low
+
+ [ Ansgar Burchardt ]
+ * debian/control: Change XS-Vcs-* to Vcs-*
+
+ [ Gonéri Le Bouder ]
+ * upload to experimental because of the Lenny freeze
+ * fix a little syntaxe error in the manpage
+ * clean config.guess
+ * add opencity-data, thanks Guillem Jover (Closes: #496237)
+ * use dh_install to install the files
+ - add opencity{,-data}.install
+ - do some clean up around this part of the rules file
+ * bump the standards version to 3.8.0. No change.
+
+ [ Ansgar Burchardt ]
+ * debian/control: Add Homepage field
+
+ [ Cyril Brulebois ]
+ * Fix FTBFS with new “3.0 (quilt)” source package format by using a
+ patch level of 1 instead of 0 in the no-pedantic.diff patch and by
+ adjusting the series file appropriately (i.e. by deleting the “-p0”
+ option), thanks to Raphaël Hertzog for the notice (Closes: #485352).
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 24 Aug 2008 21:12:23 +0200
+
+opencity (0.0.5.1stable-1) unstable; urgency=low
+
+ [ Gonéri Le Bouder ]
+ * new upstream release (Closes: #462371)
+ + --sysconfdir=/etc
+ + use ./opencity.png instead of ./OpenCity.png
+ + install the new doc
+ + add no-pedantic.diff to turn of the pedantic mode
+ * remove:
+ + fix_gcc-4.3.diff: merged with upstream
+ + fix_homedir.diff: not needed anymore
+ * standard version 3.7.3, no change needed
+ * update debian/copyright
+ * remove the deprecated Encoding section from the desktop file
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Thu, 24 Jan 2008 21:42:56 +0100
+
+opencity (0.0.4stable-3) unstable; urgency=low
+
+ [ Eddy Petrișor ]
+ * added Encoding field in the desktop file
+
+ [ Jon Dowland ]
+ * update menu section to "Games/Action" for menu policy transition.
+ Thanks Linas Žvirblis.
+
+ [ Cyril Brulebois ]
+ * Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
+ * Fixed copyright:
+ - Added missing “or any later version” to match upstream's copyright
+ statement in the COPYRIGHT file (Closes: #442034).
+ - Fixed public domain statement by replacing the copyright by an
+ authorship statement (Closes: #442056).
+
+ [ Gonéri Le Bouder ]
+ * do not ignore make distclean return anymore
+ * install LEGGIMI.txt and FAQ.txt in /usr/share/doc/opencity and remove some
+ useless files (Closes: #442029)
+ * use imagemagick's convert to create the .xpm from OpenCity.png
+ - new builddep: imagemagick
+ - remove debian/opencity.xpm
+ * clean target removes quilt .pc directory and debian/opencity.6
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Sat, 15 Sep 2007 12:13:27 +0200
+
+opencity (0.0.4stable-2) unstable; urgency=low
+
+ * datafiles in /usr/share/games/opencity (Closes: #405042)
+ - add fix_homedir.diff to preinitialise this value
+ - use quilt to apply the patch
+ * add desktop and icon files
+ * add the patch from Martin Michlmayr to fix the build with gcc-4.3
+ (Closes: #421124)
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 31 Dec 2006 09:52:22 +0100
+
+opencity (0.0.4stable-1) unstable; urgency=low
+
+ * new upstream release
+ * The sentence "Besides you can also raise or lower the terrain." was
+ two time in the desciption (Closes: #378216)
+ * update of the copyright file (thanks Duong-Khang NGUYEN)
+ * minor clean up in rules file
+ * add libglu1-mesa-dev in builddeps
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Thu, 30 Nov 2006 16:06:21 +0100
+
+
+opencity (0.0.3stable-1) unstable; urgency=low
+
+ * Initial release (Closes: #359340)
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Tue, 28 Mar 2006 00:15:33 +0200
+
Deleted: packages/tags/opencity/0.0.6.4stable-1/debian/control
===================================================================
--- packages/trunk/opencity/debian/control 2011-07-02 07:22:21 UTC (rev 12487)
+++ packages/tags/opencity/0.0.6.4stable-1/debian/control 2011-09-02 18:21:25 UTC (rev 12651)
@@ -1,35 +0,0 @@
-Source: opencity
-Section: games
-Priority: optional
-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
-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/
-
-Package: opencity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, opencity-data (= ${source:Version})
-Description: a 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.
- OpenCity is similar in spirit to other city construction games, heading
- towards a classic SimCity feeling, although with some additional features.
- It is not intended to be a clone of any famous city simulator.
-
-Package: opencity-data
-Architecture: all
-Conflicts: opencity (<< 0.0.5.1stable-2)
-Recommends: opencity
-Description: data for opencity, a 3D city simulator game
- OpenCity is 3D city construction simulator. You can build some
- zones of housing, trading and industry, electric plant and roads.
- .
- This package contains the architecture-independent data for opencity. For more
- information, see the opencity package.
Copied: packages/tags/opencity/0.0.6.4stable-1/debian/control (from rev 12649, packages/trunk/opencity/debian/control)
===================================================================
--- packages/tags/opencity/0.0.6.4stable-1/debian/control (rev 0)
+++ packages/tags/opencity/0.0.6.4stable-1/debian/control 2011-09-02 18:21:25 UTC (rev 12651)
@@ -0,0 +1,44 @@
+Source: opencity
+Section: games
+Priority: optional
+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,
+ 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/
+
+Package: opencity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, opencity-data (= ${source:Version})
+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.
+ OpenCity is similar in spirit to other city construction games, heading
+ towards a classic SimCity feeling, although with some additional features.
+ It is not intended to be a clone of any famous city simulator.
+
+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
+ OpenCity is 3D city construction simulator. You can build some
+ zones of housing, trading and industry, electric plant and roads.
+ .
+ This package contains the architecture-independent data for opencity. For more
+ information, see the opencity package.
Copied: packages/tags/opencity/0.0.6.4stable-1/debian/patches/remove-use-of-embedded-tinyxml.patch (from rev 12649, packages/trunk/opencity/debian/patches/remove-use-of-embedded-tinyxml.patch)
===================================================================
--- packages/tags/opencity/0.0.6.4stable-1/debian/patches/remove-use-of-embedded-tinyxml.patch (rev 0)
+++ packages/tags/opencity/0.0.6.4stable-1/debian/patches/remove-use-of-embedded-tinyxml.patch 2011-09-02 18:21:25 UTC (rev 12651)
@@ -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 = \
Deleted: packages/tags/opencity/0.0.6.4stable-1/debian/patches/series
===================================================================
--- packages/trunk/opencity/debian/patches/series 2011-07-02 07:22:21 UTC (rev 12487)
+++ packages/tags/opencity/0.0.6.4stable-1/debian/patches/series 2011-09-02 18:21:25 UTC (rev 12651)
@@ -1 +0,0 @@
-
Copied: packages/tags/opencity/0.0.6.4stable-1/debian/patches/series (from rev 12649, packages/trunk/opencity/debian/patches/series)
===================================================================
--- packages/tags/opencity/0.0.6.4stable-1/debian/patches/series (rev 0)
+++ packages/tags/opencity/0.0.6.4stable-1/debian/patches/series 2011-09-02 18:21:25 UTC (rev 12651)
@@ -0,0 +1 @@
+remove-use-of-embedded-tinyxml.patch
Deleted: packages/tags/opencity/0.0.6.4stable-1/debian/rules
===================================================================
--- packages/trunk/opencity/debian/rules 2011-07-02 07:22:21 UTC (rev 12487)
+++ packages/tags/opencity/0.0.6.4stable-1/debian/rules 2011-09-02 18:21:25 UTC (rev 12651)
@@ -1,115 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-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)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- # Add here commands to configure the package.
- 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: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- docbook-to-man debian/manpage.sgml > debian/opencity.6
- convert -geometry 32x32 ./opencity.png debian/opencity.xpm
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -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
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/opencity.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- mv debian/tmp/usr/bin debian/tmp/usr/games
-
- rm -rf $(CURDIR)/debian/tmp/usr/share/games/applications/ $(CURDIR)/debian/tmp/usr/share/games/pixmaps/
-
-# rm -rf debian/opencity/usr/share/games/opencity/docs \
-# debian/opencity/usr/share/games/opencity/autopackage \
-# debian/opencity/usr/share/games/opencity/OpenCity.png \
-# debian/opencity/usr/share/games/opencity/OpenCity.desktop
-# dh_install debian/opencity.desktop usr/share/applications
-# dh_install debian/opencity.xpm usr/share/pixmaps
-
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_install -i
- dh_installchangelogs -i ChangeLog
- dh_installdocs -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_install -a
- dh_installchangelogs -a ChangeLog
- dh_installdocs -a docs/FAQ_it.txt docs/FAQ.txt docs/INSTALL_it.txt docs/README_es.txt docs/README_it.txt
- dh_installmenu -a
- dh_installman -a debian/opencity.6
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- 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
Copied: packages/tags/opencity/0.0.6.4stable-1/debian/rules (from rev 12649, packages/trunk/opencity/debian/rules)
===================================================================
--- packages/tags/opencity/0.0.6.4stable-1/debian/rules (rev 0)
+++ packages/tags/opencity/0.0.6.4stable-1/debian/rules 2011-09-02 18:21:25 UTC (rev 12651)
@@ -0,0 +1,114 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+config.status: configure
+ dh_testdir
+ [ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+ # Add here commands to configure the package.
+ 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
+ dh_testdir
+
+ # Add here commands to compile the package.
+ $(MAKE)
+ docbook-to-man debian/manpage.sgml > debian/opencity.6
+ convert -geometry 32x32 ./opencity.png debian/opencity.xpm
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
+ [ ! -f Makefile ] || $(MAKE) distclean
+ dh_clean debian/opencity.xpm config.log \
+ debian/opencity.6 config.sub config.guess config.status
+ rm -rf .pc
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/opencity.
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ mv debian/tmp/usr/bin debian/tmp/usr/games
+
+ rm -rf $(CURDIR)/debian/tmp/usr/share/games/applications/ $(CURDIR)/debian/tmp/usr/share/games/pixmaps/
+
+# rm -rf debian/opencity/usr/share/games/opencity/docs \
+# debian/opencity/usr/share/games/opencity/autopackage \
+# debian/opencity/usr/share/games/opencity/OpenCity.png \
+# debian/opencity/usr/share/games/opencity/OpenCity.desktop
+# dh_install debian/opencity.desktop usr/share/applications
+# dh_install debian/opencity.xpm usr/share/pixmaps
+
+binary-indep: build install
+ dh_testdir -i
+ dh_testroot -i
+ dh_install -i
+ dh_installchangelogs -i ChangeLog
+ dh_installdocs -i
+ dh_strip -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_shlibdeps -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary-arch: build install
+ dh_testdir -a
+ dh_testroot -a
+ dh_install -a
+ dh_installchangelogs -a ChangeLog
+ dh_installdocs -a docs/FAQ_it.txt docs/FAQ.txt docs/INSTALL_it.txt docs/README_es.txt docs/README_it.txt
+ dh_installmenu -a
+ dh_installman -a debian/opencity.6
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ 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
More information about the Pkg-games-commits
mailing list