r15301 - in packages/tags/funguloids: . 1.06-12/debian 1.06-12/debian/patches
Paul Wise
pabs at moszumanska.debian.org
Thu Oct 16 04:38:29 UTC 2014
Author: pabs
Date: 2014-10-16 04:38:29 +0000 (Thu, 16 Oct 2014)
New Revision: 15301
Added:
packages/tags/funguloids/1.06-12/
packages/tags/funguloids/1.06-12/debian/changelog
packages/tags/funguloids/1.06-12/debian/control
packages/tags/funguloids/1.06-12/debian/patches/ogre-1.9.patch
packages/tags/funguloids/1.06-12/debian/patches/series
packages/tags/funguloids/1.06-12/debian/rules
Removed:
packages/tags/funguloids/1.06-12/debian/changelog
packages/tags/funguloids/1.06-12/debian/control
packages/tags/funguloids/1.06-12/debian/patches/series
packages/tags/funguloids/1.06-12/debian/rules
Log:
[svn-buildpackage] Tagging funguloids 1.06-12
Deleted: packages/tags/funguloids/1.06-12/debian/changelog
===================================================================
--- packages/trunk/funguloids/debian/changelog 2014-10-14 04:01:10 UTC (rev 15296)
+++ packages/tags/funguloids/1.06-12/debian/changelog 2014-10-16 04:38:29 UTC (rev 15301)
@@ -1,187 +0,0 @@
-funguloids (1.06-12) UNRELEASED; urgency=low
-
- * Team upload.
- * Add menu icon in xpm format (Closes: #726223).
- * Add keywords to desktop file.
-
- -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 14 Oct 2013 14:05:05 +0200
-
-funguloids (1.06-11) unstable; urgency=low
-
- [ Evgeni Golov ]
- * Correct Vcs-* URLs to point to anonscm.debian.org
-
- [ Fabian Greffrath ]
- * Build against Ogre-1.8 with a little help from another patch courtesy
- of openSUSE Build Service (Closes: #704785).
- * Add a "Build-Conflicts: libboost-date-time1.49-dev (<< 1.49.0-4~)"
- to avoid the notorious TIME_UTC bug.
-
- -- Fabian Greffrath <fabian+debian at greffrath.com> Fri, 07 Jun 2013 10:44:45 +0200
-
-funguloids (1.06-10) unstable; urgency=low
-
- * Team upload.
- * Fix Vcs-Browser field in debian/control.
- * Move the plugins.cfg file from funguloids-data to funguloids, as it
- contains a hard-coded architecture-specific path (Closes: #693134).
- * Run "wrap-and-sort -asb".
- * No need to second-guess dh_auto_clean.
-
- -- Fabian Greffrath <fabian+debian at greffrath.com> Tue, 13 Nov 2012 15:01:58 +0100
-
-funguloids (1.06-9) unstable; urgency=low
-
- [ Paul Wise ]
- * Improve the menu file
- * Wrap the build-deps and deps one per line
- * Switch to dpkg-source v3 format
- * Switch to debhelper 7 dh & dh-autoreconf
- * Fix FTBFS due to newer GCC (Closes: #633297)
- * Drop use of ogre-plugins-cgprogrammanager and move the
- package to main instead of contrib.
- - Add the OpenSUSE patch to make it optional (Closes: #578089)
- * Drop Micheal Koch from uploaders since he seems inactive
- and add myself in his place (Closes: #654144)
- * Use the same long description in the FreeDesktop menu as in
- the Debian menu
- * Don't use reserved characters outside of quotes in the menu file
- * Clean up the watch file
- * Add DEP-3 headers to the patches
- * Use ${misc:Depends} since debhelper might need it
- * Use Copyright instead of (C) in since the latter is not
- legally valid
- * Bump Standards-Version, no changes needed
- * Add Pre-Depends to ensure an xz-capable dpkg is installed
-
- [ Fabian Greffrath ]
- * Fix compilation with g++-4.7.
- * Add MPAK package handling utility from upstream, licensed under the
- MIT license, to fix broken data packages during package building.
- - fixes crash due to Ogre update (Closes: #564547)
- * Fix install location of documentation and add an architecture-
- independent funguloids-data package for all the game data
- (Closes: #602735).
- * Compress binary packages with xz.
- * Bump debhelper compat to 9 to build with hardening flags.
- * Fix linking order against liblua5.1.
- * Avoid unnecessary package dependencies.
-
- -- Paul Wise <pabs at debian.org> Sun, 14 Oct 2012 13:03:29 +0800
-
-funguloids (1.06-8) unstable; urgency=low
-
- * Added debian/patches/ogre-1.6.1.patch to work with newer ogre
- (Closes: #546353).
- * Improve clean target to delete files generated by autotools.
- * Comment out unused entry in watch file.
- * Added debian debian/README.source.
- * Added myself to Uploaders.
- * Updated Standards-Version to 3.8.3.
-
- -- Michael Koch <konqueror at gmx.de> Tue, 15 Sep 2009 21:04:00 +0200
-
-funguloids (1.06-7) unstable; urgency=low
-
- * Fix compiling error with g++-4.3. Closes: #482649
- * Ensure that funguloids is built with libogre-dev 1.4.9 or higher.
- * Bumped Standards-Version to 3.8.0.
- * Make sure build-aux directory is there.
-
- -- Andres Mejia <mcitadel at gmail.com> Tue, 22 Jul 2008 00:31:14 -0400
-
-funguloids (1.06-6) unstable; urgency=low
-
- [ Andres Mejia ]
- * Fix problem with running funguloids with ogre-1.4.7.
- Closes: #478105
- * Fix up patches and rules file.
- * Support disabling of keyboard and mouse capture for debugging.
- * Fix check where AL errors were being checked while working with AL contexts
- instead of ALC errors.
- * Move packaging from svn to git.
- * Add DM-Upload-Allowed: yes field in control file.
- * Need build dependency of pkg-config.
-
- -- Andres Mejia <mcitadel at gmail.com> Mon, 19 May 2008 19:22:00 -0400
-
-funguloids (1.06-5) unstable; urgency=low
-
- [ Barry deFreese ]
- * Add watch file.
-
- [ Andres Mejia ]
- * Removing XS- prefix for Vcs-* fields.
- * Bumped Standards-Version to 3.7.3.
- * Moved Homepage field to source package stanza.
- * Changed Priority to extra.
- + nvidia-cg-toolkit and ogre-plugins-cgprogrammanager will be Priority
- extra in the future.
- * Allowing funguloids to degrade gracefully if ogre cg plugin is not
- installed.
- + Uses a symlink to /etc/OGRE/plugins.cfg.
- + No longer need to patch included plugins.cfg.
- + No longer need Build-Depends of tofrodos.
- + Updated README.Debian.
- + Closes: #449330
- * Removed autoconf as Build-Depends, it's a dependency of automake.
- * Fixed up debian/rules.
- + Leave files generate by autotools alone.
- + Use $(MAKE) clean distclean.
- + No need to make temporary directory debian/tmp.
- + Set proper tests in debian/rules so as to not depend on --force option
- for rm.
- + Adding option to use noopt.
- + Adding proper CXXFLAGS.
- + Adding option to use nostrip.
- + Calling GNU configure properly (from autotools-dev documentation).
- + Don't use CXX variable.
- + Provide binary-indep to comply with Debian policy.
- * Providing another scan for watchfile.
- * Give exact link used to download upstream tarball in copyright file.
- * Provide get-orig-source rule.
- * Switch from dpatch to quilt.
- * Removed deprecated Encoding field for desktop file.
-
- -- Andres Mejia <mcitadel at gmail.com> Mon, 14 Jan 2008 02:06:40 -0500
-
-funguloids (1.06-4) unstable; urgency=low
-
- [ Andres Mejia ]
- * Addressing lintian debian-rules-ignores-make-clean-error warning.
- * Added --force-missing option in automake.
- * Added -f option in autoheader and autoconf.
- * Repacked tarball to remove files that are added by --force-missing option.
-
- -- Andres Mejia <mcitadel at gmail.com> Thu, 16 Aug 2007 16:47:16 -0400
-
-funguloids (1.06-3) unstable; urgency=low
-
- [ Jon Dowland ]
- * update menu section to "Games/Action" for menu transition
- (thanks Linas Žvirblis)
-
- [ Cyril Brulebois ]
- * Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
-
- -- Andres Mejia <mcitadel at gmail.com> Sun, 12 Aug 2007 12:58:58 -0400
-
-funguloids (1.06-2) unstable; urgency=low
-
- * Repacked orig tarball to take out tar-in-tar method.
- + Modified debian/rules and patches for this change.
- + Also took out files that are generated by autotools.
- * Added dependency of tofrodos for patching files using DOS carraige return.
- + Added to-dos and from-dos targets in debian/rules to use this.
- + Removed message about Newline convention in README.Debian.
- * Corrected some mistakes in patches where incorrect files would be cleaned.
- * Ensured text in README.Debian and debian/copyright didn't exceed 80
- columns.
-
- -- Andres Mejia <mcitadel at gmail.com> Fri, 10 Aug 2007 00:56:31 -0400
-
-funguloids (1.06-1) unstable; urgency=low
-
- * New upstream release (Closes: #428718)
-
- -- Andres Mejia <mcitadel at gmail.com> Sun, 08 Jul 2007 02:38:08 -0400
Copied: packages/tags/funguloids/1.06-12/debian/changelog (from rev 15300, packages/trunk/funguloids/debian/changelog)
===================================================================
--- packages/tags/funguloids/1.06-12/debian/changelog (rev 0)
+++ packages/tags/funguloids/1.06-12/debian/changelog 2014-10-16 04:38:29 UTC (rev 15301)
@@ -0,0 +1,193 @@
+funguloids (1.06-12) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * Team upload.
+ * Add menu icon in xpm format (Closes: #726223).
+ * Add keywords to desktop file.
+
+ [ Paul Wise ]
+ * Add patch to use the OGRE 1.9 (Closes: #732722).
+ Thanks to Hans de Goede <hdegoede at redhat.com>
+ * Work around build failure due to boost issues.
+
+ -- Paul Wise <pabs at debian.org> Thu, 16 Oct 2014 12:04:03 +0800
+
+funguloids (1.06-11) unstable; urgency=low
+
+ [ Evgeni Golov ]
+ * Correct Vcs-* URLs to point to anonscm.debian.org
+
+ [ Fabian Greffrath ]
+ * Build against Ogre-1.8 with a little help from another patch courtesy
+ of openSUSE Build Service (Closes: #704785).
+ * Add a "Build-Conflicts: libboost-date-time1.49-dev (<< 1.49.0-4~)"
+ to avoid the notorious TIME_UTC bug.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Fri, 07 Jun 2013 10:44:45 +0200
+
+funguloids (1.06-10) unstable; urgency=low
+
+ * Team upload.
+ * Fix Vcs-Browser field in debian/control.
+ * Move the plugins.cfg file from funguloids-data to funguloids, as it
+ contains a hard-coded architecture-specific path (Closes: #693134).
+ * Run "wrap-and-sort -asb".
+ * No need to second-guess dh_auto_clean.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Tue, 13 Nov 2012 15:01:58 +0100
+
+funguloids (1.06-9) unstable; urgency=low
+
+ [ Paul Wise ]
+ * Improve the menu file
+ * Wrap the build-deps and deps one per line
+ * Switch to dpkg-source v3 format
+ * Switch to debhelper 7 dh & dh-autoreconf
+ * Fix FTBFS due to newer GCC (Closes: #633297)
+ * Drop use of ogre-plugins-cgprogrammanager and move the
+ package to main instead of contrib.
+ - Add the OpenSUSE patch to make it optional (Closes: #578089)
+ * Drop Micheal Koch from uploaders since he seems inactive
+ and add myself in his place (Closes: #654144)
+ * Use the same long description in the FreeDesktop menu as in
+ the Debian menu
+ * Don't use reserved characters outside of quotes in the menu file
+ * Clean up the watch file
+ * Add DEP-3 headers to the patches
+ * Use ${misc:Depends} since debhelper might need it
+ * Use Copyright instead of (C) in since the latter is not
+ legally valid
+ * Bump Standards-Version, no changes needed
+ * Add Pre-Depends to ensure an xz-capable dpkg is installed
+
+ [ Fabian Greffrath ]
+ * Fix compilation with g++-4.7.
+ * Add MPAK package handling utility from upstream, licensed under the
+ MIT license, to fix broken data packages during package building.
+ - fixes crash due to Ogre update (Closes: #564547)
+ * Fix install location of documentation and add an architecture-
+ independent funguloids-data package for all the game data
+ (Closes: #602735).
+ * Compress binary packages with xz.
+ * Bump debhelper compat to 9 to build with hardening flags.
+ * Fix linking order against liblua5.1.
+ * Avoid unnecessary package dependencies.
+
+ -- Paul Wise <pabs at debian.org> Sun, 14 Oct 2012 13:03:29 +0800
+
+funguloids (1.06-8) unstable; urgency=low
+
+ * Added debian/patches/ogre-1.6.1.patch to work with newer ogre
+ (Closes: #546353).
+ * Improve clean target to delete files generated by autotools.
+ * Comment out unused entry in watch file.
+ * Added debian debian/README.source.
+ * Added myself to Uploaders.
+ * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de> Tue, 15 Sep 2009 21:04:00 +0200
+
+funguloids (1.06-7) unstable; urgency=low
+
+ * Fix compiling error with g++-4.3. Closes: #482649
+ * Ensure that funguloids is built with libogre-dev 1.4.9 or higher.
+ * Bumped Standards-Version to 3.8.0.
+ * Make sure build-aux directory is there.
+
+ -- Andres Mejia <mcitadel at gmail.com> Tue, 22 Jul 2008 00:31:14 -0400
+
+funguloids (1.06-6) unstable; urgency=low
+
+ [ Andres Mejia ]
+ * Fix problem with running funguloids with ogre-1.4.7.
+ Closes: #478105
+ * Fix up patches and rules file.
+ * Support disabling of keyboard and mouse capture for debugging.
+ * Fix check where AL errors were being checked while working with AL contexts
+ instead of ALC errors.
+ * Move packaging from svn to git.
+ * Add DM-Upload-Allowed: yes field in control file.
+ * Need build dependency of pkg-config.
+
+ -- Andres Mejia <mcitadel at gmail.com> Mon, 19 May 2008 19:22:00 -0400
+
+funguloids (1.06-5) unstable; urgency=low
+
+ [ Barry deFreese ]
+ * Add watch file.
+
+ [ Andres Mejia ]
+ * Removing XS- prefix for Vcs-* fields.
+ * Bumped Standards-Version to 3.7.3.
+ * Moved Homepage field to source package stanza.
+ * Changed Priority to extra.
+ + nvidia-cg-toolkit and ogre-plugins-cgprogrammanager will be Priority
+ extra in the future.
+ * Allowing funguloids to degrade gracefully if ogre cg plugin is not
+ installed.
+ + Uses a symlink to /etc/OGRE/plugins.cfg.
+ + No longer need to patch included plugins.cfg.
+ + No longer need Build-Depends of tofrodos.
+ + Updated README.Debian.
+ + Closes: #449330
+ * Removed autoconf as Build-Depends, it's a dependency of automake.
+ * Fixed up debian/rules.
+ + Leave files generate by autotools alone.
+ + Use $(MAKE) clean distclean.
+ + No need to make temporary directory debian/tmp.
+ + Set proper tests in debian/rules so as to not depend on --force option
+ for rm.
+ + Adding option to use noopt.
+ + Adding proper CXXFLAGS.
+ + Adding option to use nostrip.
+ + Calling GNU configure properly (from autotools-dev documentation).
+ + Don't use CXX variable.
+ + Provide binary-indep to comply with Debian policy.
+ * Providing another scan for watchfile.
+ * Give exact link used to download upstream tarball in copyright file.
+ * Provide get-orig-source rule.
+ * Switch from dpatch to quilt.
+ * Removed deprecated Encoding field for desktop file.
+
+ -- Andres Mejia <mcitadel at gmail.com> Mon, 14 Jan 2008 02:06:40 -0500
+
+funguloids (1.06-4) unstable; urgency=low
+
+ [ Andres Mejia ]
+ * Addressing lintian debian-rules-ignores-make-clean-error warning.
+ * Added --force-missing option in automake.
+ * Added -f option in autoheader and autoconf.
+ * Repacked tarball to remove files that are added by --force-missing option.
+
+ -- Andres Mejia <mcitadel at gmail.com> Thu, 16 Aug 2007 16:47:16 -0400
+
+funguloids (1.06-3) unstable; urgency=low
+
+ [ Jon Dowland ]
+ * update menu section to "Games/Action" for menu transition
+ (thanks Linas Žvirblis)
+
+ [ Cyril Brulebois ]
+ * Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
+
+ -- Andres Mejia <mcitadel at gmail.com> Sun, 12 Aug 2007 12:58:58 -0400
+
+funguloids (1.06-2) unstable; urgency=low
+
+ * Repacked orig tarball to take out tar-in-tar method.
+ + Modified debian/rules and patches for this change.
+ + Also took out files that are generated by autotools.
+ * Added dependency of tofrodos for patching files using DOS carraige return.
+ + Added to-dos and from-dos targets in debian/rules to use this.
+ + Removed message about Newline convention in README.Debian.
+ * Corrected some mistakes in patches where incorrect files would be cleaned.
+ * Ensured text in README.Debian and debian/copyright didn't exceed 80
+ columns.
+
+ -- Andres Mejia <mcitadel at gmail.com> Fri, 10 Aug 2007 00:56:31 -0400
+
+funguloids (1.06-1) unstable; urgency=low
+
+ * New upstream release (Closes: #428718)
+
+ -- Andres Mejia <mcitadel at gmail.com> Sun, 08 Jul 2007 02:38:08 -0400
Deleted: packages/tags/funguloids/1.06-12/debian/control
===================================================================
--- packages/trunk/funguloids/debian/control 2014-10-14 04:01:10 UTC (rev 15296)
+++ packages/tags/funguloids/1.06-12/debian/control 2014-10-16 04:38:29 UTC (rev 15301)
@@ -1,60 +0,0 @@
-Source: funguloids
-Priority: extra
-Section: games
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders:
- Paul Wise <pabs at debian.org>
-Build-Depends:
- autoconf-archive,
- debhelper (>= 9),
- dh-autoreconf,
- libalut-dev,
- liblua5.1-0-dev,
- libmad0-dev,
- libogg-dev,
- libogre-1.8-dev,
- libois-dev,
- libopenal-dev,
- libvorbis-dev,
- pkg-config,
- python
-Build-Conflicts:
- libboost-date-time1.49-dev (<< 1.49.0-4~)
-Standards-Version: 3.9.4
-Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/funguloids/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/funguloids/
-Homepage: http://funguloids.sourceforge.net
-
-Package: funguloids
-Architecture: any
-Pre-Depends:
- dpkg (>= 1.15.6~)
-Depends:
- funguloids-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Breaks:
- funguloids-data (<< 1.06-10~)
-Replaces:
- funguloids-data (<< 1.06-10~)
-Description: space-flying-mushroom-picking-simulator game
- "Those Funny Funguloids!" is actually a nice little piece of entertainment.
- You collect mushrooms, bring them back to your home base and profit! That's
- the basic idea in a nutshell. It has smooth, appealing 3d graphics and nice
- atmospheric sound effects. Go ahead and try it out - it has sounds too!
-
-Package: funguloids-data
-Architecture: all
-Pre-Depends:
- dpkg (>= 1.15.6~)
-Depends:
- ${misc:Depends}
-Breaks:
- funguloids (<< 1.06-9~)
-Replaces:
- funguloids (<< 1.06-9~)
-Description: space-flying-mushroom-picking-simulator game (data files)
- This package contains data files for "Those Funny Funguloids!".
- .
- It contains music, sound effects, textures, models, bitmap fonts,
- shaders, backgrounds, graphics and documentation.
Copied: packages/tags/funguloids/1.06-12/debian/control (from rev 15297, packages/trunk/funguloids/debian/control)
===================================================================
--- packages/tags/funguloids/1.06-12/debian/control (rev 0)
+++ packages/tags/funguloids/1.06-12/debian/control 2014-10-16 04:38:29 UTC (rev 15301)
@@ -0,0 +1,60 @@
+Source: funguloids
+Priority: extra
+Section: games
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders:
+ Paul Wise <pabs at debian.org>
+Build-Depends:
+ autoconf-archive,
+ debhelper (>= 9),
+ dh-autoreconf,
+ libalut-dev,
+ liblua5.1-0-dev,
+ libmad0-dev,
+ libogg-dev,
+ libogre-1.9-dev,
+ libois-dev,
+ libopenal-dev,
+ libvorbis-dev,
+ pkg-config,
+ python
+Build-Conflicts:
+ libboost-date-time1.49-dev (<< 1.49.0-4~)
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/funguloids/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/funguloids/
+Homepage: http://funguloids.sourceforge.net
+
+Package: funguloids
+Architecture: any
+Pre-Depends:
+ dpkg (>= 1.15.6~)
+Depends:
+ funguloids-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks:
+ funguloids-data (<< 1.06-10~)
+Replaces:
+ funguloids-data (<< 1.06-10~)
+Description: space-flying-mushroom-picking-simulator game
+ "Those Funny Funguloids!" is actually a nice little piece of entertainment.
+ You collect mushrooms, bring them back to your home base and profit! That's
+ the basic idea in a nutshell. It has smooth, appealing 3d graphics and nice
+ atmospheric sound effects. Go ahead and try it out - it has sounds too!
+
+Package: funguloids-data
+Architecture: all
+Pre-Depends:
+ dpkg (>= 1.15.6~)
+Depends:
+ ${misc:Depends}
+Breaks:
+ funguloids (<< 1.06-9~)
+Replaces:
+ funguloids (<< 1.06-9~)
+Description: space-flying-mushroom-picking-simulator game (data files)
+ This package contains data files for "Those Funny Funguloids!".
+ .
+ It contains music, sound effects, textures, models, bitmap fonts,
+ shaders, backgrounds, graphics and documentation.
Copied: packages/tags/funguloids/1.06-12/debian/patches/ogre-1.9.patch (from rev 15298, packages/trunk/funguloids/debian/patches/ogre-1.9.patch)
===================================================================
--- packages/tags/funguloids/1.06-12/debian/patches/ogre-1.9.patch (rev 0)
+++ packages/tags/funguloids/1.06-12/debian/patches/ogre-1.9.patch 2014-10-16 04:38:29 UTC (rev 15301)
@@ -0,0 +1,176 @@
+From: Hans de Goede <hdegoede at redhat.com>
+Subject: Port funguloids to OGRE 1.9
+Date: Sun, 8 Jun 2014 14:52:54 +0200
+Bug-Debian: http://bugs.debian.org/732722
+Applied-Upstream: http://sourceforge.net/p/funguloids/code/ci/088a645f906277303bcb38939de4b20483825ec6/
+--- a/configure.ac 2014-06-08 17:51:44.423179835 +0200
++++ b/configure.ac 2014-06-08 14:52:54.384959442 +0200
+@@ -31,7 +31,7 @@
+ AC_CHECK_HEADERS([stdlib.h string.h sys/param.h wchar.h])
+
+ # OGRE ----------------------------------------------------
+-PKG_CHECK_MODULES(OGRE, [OGRE >= 1.4])
++PKG_CHECK_MODULES(OGRE, [OGRE >= 1.9 OGRE-Overlay >= 1.9])
+ AC_SUBST(OGRE_CFLAGS)
+ AC_SUBST(OGRE_LIBS)
+
+--- a/include/game.h 2007-04-20 13:19:40.000000000 +0200
++++ b/include/game.h 2014-06-08 14:52:54.385959417 +0200
+@@ -27,6 +27,9 @@
+ #define GAME_H
+
+ #include "ogreapp.h"
++#include <Overlay/OgreOverlay.h>
++#include <Overlay/OgreOverlayManager.h>
++
+ #include "menu.h"
+ #include "SimpleIni.h"
+
+--- a/include/menu.h 2007-03-11 16:37:32.000000000 +0100
++++ b/include/menu.h 2014-06-08 14:52:54.385959417 +0200
+@@ -27,7 +27,8 @@
+ #define MENU_H
+
+ #include "ogreapp.h"
+-#include <OgreTextAreaOverlayElement.h>
++#include <Overlay/OgreOverlay.h>
++#include <Overlay/OgreTextAreaOverlayElement.h>
+
+ class HiscoreList;
+
+--- a/include/mpakogre.h 2014-06-08 17:51:44.448178885 +0200
++++ b/include/mpakogre.h 2014-06-08 14:52:54.385959417 +0200
+@@ -79,7 +79,7 @@
+ virtual ~MPakArchiveFactory() {}
+ const String &getType(void) const;
+
+- Archive *createInstance(const String &name) {
++ Archive *createInstance(const String &name, bool readOnly) {
+ return new MPakArchive(name, "MPK");
+ }
+
+--- a/include/ogreapp.h 2007-03-11 16:35:44.000000000 +0100
++++ b/include/ogreapp.h 2014-06-08 17:48:54.510790299 +0200
+@@ -28,6 +28,9 @@
+
+ #include <Ogre.h>
+ #include <OgreConfigFile.h>
++#include <Overlay/OgreOverlay.h>
++#include <Overlay/OgreOverlaySystem.h>
++
+ #include "ogrelistener.h"
+
+ using namespace Ogre;
+@@ -39,6 +42,7 @@
+ OgreApplication() {
+ mFrameListener = 0;
+ mRoot = 0;
++ mOverlaySystem = 0;
+ }
+ virtual ~OgreApplication();
+
+@@ -65,6 +69,7 @@
+
+ protected:
+ Root *mRoot;
++ OverlaySystem* mOverlaySystem;
+ Camera *mCamera;
+ SceneManager *mSceneMgr;
+ RenderWindow *mWindow;
+--- a/include/ogrelistener.h 2007-03-11 16:29:00.000000000 +0100
++++ b/include/ogrelistener.h 2014-06-08 14:52:54.386959392 +0200
+@@ -29,6 +29,7 @@
+ #include <Ogre.h>
+ #include <OgreStringConverter.h>
+ #include <OgreException.h>
++#include <Overlay/OgreOverlay.h>
+
+ #include "input.h"
+
+--- a/include/player.h 2007-04-16 01:31:39.000000000 +0200
++++ b/include/player.h 2014-06-08 14:52:54.386959392 +0200
+@@ -27,7 +27,8 @@
+ #define PLAYER_H
+
+ #include <Ogre.h>
+-#include <OgreTextAreaOverlayElement.h>
++#include <Overlay/OgreOverlay.h>
++#include <Overlay/OgreTextAreaOverlayElement.h>
+ #include "movingobject.h"
+ #include "mushroom.h"
+ #include "soundsystem.h"
+--- a/include/soundsystem.h 2007-04-24 19:30:32.000000000 +0200
++++ b/include/soundsystem.h 2014-06-08 14:52:54.386959392 +0200
+@@ -66,7 +66,7 @@
+ if(!grp)
+ OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, "Cannot locate a resource group called 'General'", "ResourceGroupManager::openResource");
+
+- OGRE_LOCK_MUTEX(grp->OGRE_AUTO_MUTEX_NAME) // lock group mutex
++ OGRE_LOCK_MUTEX(grp->OGRE_AUTO_MUTEX_NAME); // lock group mutex
+ ResourceLocationIndex::iterator rit = grp->resourceIndexCaseSensitive.find(filename);
+ if(rit != grp->resourceIndexCaseSensitive.end()) {
+ // Found in the index
+--- a/src/hiscore.cpp 2007-05-04 12:56:12.000000000 +0200
++++ b/src/hiscore.cpp 2014-06-08 17:47:39.772663131 +0200
+@@ -28,7 +28,7 @@
+ #include <stdio.h>
+ #include "game.h"
+ #include "hiscore.h"
+-#include <OgreTextAreaOverlayElement.h>
++#include <Overlay/OgreTextAreaOverlayElement.h>
+
+ // Global high score list
+ HiscoreList hiscoreList;
+--- a/src/menu.cpp 2007-05-04 12:53:37.000000000 +0200
++++ b/src/menu.cpp 2014-06-08 17:47:39.772663131 +0200
+@@ -28,7 +28,6 @@
+ #include "objectsystem.h"
+ #include "soundsystem.h"
+ #include "hiscore.h"
+-#include <OgreTextAreaOverlayElement.h>
+
+
+ // Version string
+--- a/src/ogreapp.cpp 2014-06-08 17:51:44.431179531 +0200
++++ b/src/ogreapp.cpp 2014-06-08 17:51:13.035451662 +0200
+@@ -72,6 +72,8 @@
+ OGRE_CONFIG_AND_LOG_PATH + "Ogre.log"
+ );
+
++ mOverlaySystem = new OverlaySystem();
++
+ ConfigFile cfg;
+ cfg.load(String(OGRE_PLUGINS_AND_RESOURCES_PATH) + "plugins.cfg");
+ String pluginDir = cfg.getSetting("PluginFolder");
+@@ -161,6 +163,9 @@
+ if(mFrameListener)
+ delete mFrameListener;
+
++ if (mOverlaySystem)
++ delete mOverlaySystem;
++
+ if(mRoot)
+ delete mRoot;
+
+--- a/src/scriptsystem.cpp 2014-06-08 17:51:44.455178619 +0200
++++ b/src/scriptsystem.cpp 2014-06-08 17:47:39.772663131 +0200
+@@ -67,7 +67,7 @@
+ if(!grp)
+ OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, "Cannot locate a resource group called 'General'", "ResourceGroupManager::openResource");
+
+- OGRE_LOCK_MUTEX(grp->OGRE_AUTO_MUTEX_NAME) // lock group mutex
++ OGRE_LOCK_MUTEX(grp->OGRE_AUTO_MUTEX_NAME); // lock group mutex
+ ResourceLocationIndex::iterator rit = grp->resourceIndexCaseSensitive.find(filename);
+ if(rit != grp->resourceIndexCaseSensitive.end()) {
+ // Found in the index
+--- a/src/game.cpp~ 2007-05-04 12:56:29.000000000 +0200
++++ a/src/game.cpp 2014-06-08 20:35:50.365150966 +0200
+@@ -206,6 +206,8 @@ void GameApplication::createScene() {
+ // Create the menus and go to the title screen
+ mMenu = new Menu(mSceneMgr);
+ mMenu->setMenu("TitleScreen");
++
++ mSceneMgr->addRenderQueueListener(mOverlaySystem);
+ }
+
+
Deleted: packages/tags/funguloids/1.06-12/debian/patches/series
===================================================================
--- packages/trunk/funguloids/debian/patches/series 2014-10-14 04:01:10 UTC (rev 15296)
+++ packages/tags/funguloids/1.06-12/debian/patches/series 2014-10-16 04:38:29 UTC (rev 15301)
@@ -1,12 +0,0 @@
-makefile_modifications.diff
-size_chunks_reverse.patch
-disable_mouse_capture.patch
-alc_error.patch
-g++4.3_fix.patch
-ogre-1.6.1.patch
-g++4.6.patch
-optional_cg.patch
-g++4.7.patch
-doc_path.patch
-libs_lua5.1.patch
-ogre-1.8.patch
Copied: packages/tags/funguloids/1.06-12/debian/patches/series (from rev 15297, packages/trunk/funguloids/debian/patches/series)
===================================================================
--- packages/tags/funguloids/1.06-12/debian/patches/series (rev 0)
+++ packages/tags/funguloids/1.06-12/debian/patches/series 2014-10-16 04:38:29 UTC (rev 15301)
@@ -0,0 +1,13 @@
+makefile_modifications.diff
+size_chunks_reverse.patch
+disable_mouse_capture.patch
+alc_error.patch
+g++4.3_fix.patch
+ogre-1.6.1.patch
+g++4.6.patch
+optional_cg.patch
+g++4.7.patch
+doc_path.patch
+libs_lua5.1.patch
+ogre-1.8.patch
+ogre-1.9.patch
Deleted: packages/tags/funguloids/1.06-12/debian/rules
===================================================================
--- packages/trunk/funguloids/debian/rules 2014-10-14 04:01:10 UTC (rev 15296)
+++ packages/tags/funguloids/1.06-12/debian/rules 2014-10-16 04:38:29 UTC (rev 15301)
@@ -1,55 +0,0 @@
-#! /usr/bin/make -f
-#export DH_VERBOSE=1
-
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-
-ifneq (,$(findstring nomousecapture,$(DEB_BUILD_OPTIONS)))
- CXXFLAGS += -DDISABLE_MOUSE_CAPTURE
-endif
-
-debian/funguloids.xpm: bin/funguloids.png
- convert $^ -resize 32x32 $@
-
-%:
- dh $@ --parallel --with autoreconf
-
-override_dh_auto_configure:
- CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- --with-fmod=no
-
- chmod +x debian/mpak.py
-
- if test ! -e bin/bootstrap.mpk.orig ; then \
- cp bin/bootstrap.mpk bin/bootstrap.mpk.orig ; \
- ./debian/mpak.py -e -f bin/bootstrap.mpk -p _bootstrap ; \
- sed -ri '/^[A-Z]/ s/(.*)/overlay \1/' _bootstrap/*.overlay ; \
- ./debian/mpak.py -c -f bin/bootstrap.mpk _bootstrap/* ; \
- rm -rf _bootstrap ; \
- fi
-
- if test ! -e bin/funguloids.mpk.orig ; then \
- cp bin/funguloids.mpk bin/funguloids.mpk.orig ; \
- ./debian/mpak.py -e -f bin/funguloids.mpk -p _gamedata ; \
- sed -ri '/^[A-Z]/ s/(.*)/overlay \1/' _gamedata/*.overlay ; \
- sed -ri '/^[A-Z]/ s/(.*)/particle_system \1/' _gamedata/*.particle ; \
- sed -ri 's/^(\t\t\t)(texture_unit) 1/\1\2\n\1{\n\1}\n\1\2/' _gamedata/materials.material ; \
- ./debian/mpak.py -c -f bin/funguloids.mpk _gamedata/* ; \
- rm -rf _gamedata ; \
- fi
-
-override_dh_auto_clean:
- dh_auto_clean
-
- if test -e bin/bootstrap.mpk.orig ; then \
- mv bin/bootstrap.mpk.orig bin/bootstrap.mpk ; \
- fi
-
- if test -e bin/funguloids.mpk.orig ; then \
- mv bin/funguloids.mpk.orig bin/funguloids.mpk ; \
- fi
-
-override_dh_install:
- dh_install -a /usr/share/games/funguloids/plugins.cfg
- dh_install -Xplugins.cfg --list-missing
-
-override_dh_builddeb:
- dh_builddeb -- -Zxz
Copied: packages/tags/funguloids/1.06-12/debian/rules (from rev 15299, packages/trunk/funguloids/debian/rules)
===================================================================
--- packages/tags/funguloids/1.06-12/debian/rules (rev 0)
+++ packages/tags/funguloids/1.06-12/debian/rules 2014-10-16 04:38:29 UTC (rev 15301)
@@ -0,0 +1,56 @@
+#! /usr/bin/make -f
+#export DH_VERBOSE=1
+
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+LIBS += -lboost_system
+
+ifneq (,$(findstring nomousecapture,$(DEB_BUILD_OPTIONS)))
+ CXXFLAGS += -DDISABLE_MOUSE_CAPTURE
+endif
+
+debian/funguloids.xpm: bin/funguloids.png
+ convert $^ -resize 32x32 $@
+
+%:
+ dh $@ --parallel --with autoreconf
+
+override_dh_auto_configure:
+ LIBS="$(LIBS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- --with-fmod=no
+
+ chmod +x debian/mpak.py
+
+ if test ! -e bin/bootstrap.mpk.orig ; then \
+ cp bin/bootstrap.mpk bin/bootstrap.mpk.orig ; \
+ ./debian/mpak.py -e -f bin/bootstrap.mpk -p _bootstrap ; \
+ sed -ri '/^[A-Z]/ s/(.*)/overlay \1/' _bootstrap/*.overlay ; \
+ ./debian/mpak.py -c -f bin/bootstrap.mpk _bootstrap/* ; \
+ rm -rf _bootstrap ; \
+ fi
+
+ if test ! -e bin/funguloids.mpk.orig ; then \
+ cp bin/funguloids.mpk bin/funguloids.mpk.orig ; \
+ ./debian/mpak.py -e -f bin/funguloids.mpk -p _gamedata ; \
+ sed -ri '/^[A-Z]/ s/(.*)/overlay \1/' _gamedata/*.overlay ; \
+ sed -ri '/^[A-Z]/ s/(.*)/particle_system \1/' _gamedata/*.particle ; \
+ sed -ri 's/^(\t\t\t)(texture_unit) 1/\1\2\n\1{\n\1}\n\1\2/' _gamedata/materials.material ; \
+ ./debian/mpak.py -c -f bin/funguloids.mpk _gamedata/* ; \
+ rm -rf _gamedata ; \
+ fi
+
+override_dh_auto_clean:
+ dh_auto_clean
+
+ if test -e bin/bootstrap.mpk.orig ; then \
+ mv bin/bootstrap.mpk.orig bin/bootstrap.mpk ; \
+ fi
+
+ if test -e bin/funguloids.mpk.orig ; then \
+ mv bin/funguloids.mpk.orig bin/funguloids.mpk ; \
+ fi
+
+override_dh_install:
+ dh_install -a /usr/share/games/funguloids/plugins.cfg
+ dh_install -Xplugins.cfg --list-missing
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz
More information about the Pkg-games-commits
mailing list