Author: pabs Date: 2011-08-13 09:43:33 +0000 (Sat, 13 Aug 2011) New Revision: 12579
Added: packages/trunk/funguloids/ packages/trunk/funguloids/debian/ packages/trunk/funguloids/debian/README.Debian packages/trunk/funguloids/debian/changelog packages/trunk/funguloids/debian/compat packages/trunk/funguloids/debian/control packages/trunk/funguloids/debian/copyright packages/trunk/funguloids/debian/funguloids.6 packages/trunk/funguloids/debian/funguloids.desktop packages/trunk/funguloids/debian/funguloids.install packages/trunk/funguloids/debian/funguloids.menu packages/trunk/funguloids/debian/patches/ packages/trunk/funguloids/debian/patches/alc_error.patch packages/trunk/funguloids/debian/patches/disable_mouse_capture.patch packages/trunk/funguloids/debian/patches/g++4.3_fix.patch packages/trunk/funguloids/debian/patches/makefile_modifications.diff packages/trunk/funguloids/debian/patches/ogre-1.6.1.patch packages/trunk/funguloids/debian/patches/series packages/trunk/funguloids/debian/patches/size_chunks_reverse.patch packages/trunk/funguloids/debian/rules packages/trunk/funguloids/debian/source/ packages/trunk/funguloids/debian/source/format packages/trunk/funguloids/debian/watch Log: Move funguloids to SVN since the git setup had code in it Added: packages/trunk/funguloids/debian/README.Debian =================================================================== --- packages/trunk/funguloids/debian/README.Debian (rev 0) +++ packages/trunk/funguloids/debian/README.Debian 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,8 @@ +ogre-plugins-cgprogrammanager +=============================================================================== + +Funguloids can be played with or without the Ogre Cg plugin (provided by the +ogre-plugins-cgprogrammanager package). Without the Ogre Cg plugin, the game's +visual quality will be slightly diminished. Funguloids will use a symlink +pointing to /etc/OGRE/plugins.cfg to determine if the Ogre Cg plugin is +available. Added: packages/trunk/funguloids/debian/changelog =================================================================== --- packages/trunk/funguloids/debian/changelog (rev 0) +++ packages/trunk/funguloids/debian/changelog 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,125 @@ +funguloids (1.06-9) UNRELEASED; urgency=low + + * Team upload. + * Improve the menu file + * Wrap the build-deps and deps one per line + * Switch to dpkg-source v3 format + + -- Paul Wise <[email protected]> Sat, 02 Apr 2011 13:12:20 +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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Fri, 10 Aug 2007 00:56:31 -0400 + +funguloids (1.06-1) unstable; urgency=low + + * New upstream release (Closes: #428718) + + -- Andres Mejia <[email protected]> Sun, 08 Jul 2007 02:38:08 -0400 Added: packages/trunk/funguloids/debian/compat =================================================================== --- packages/trunk/funguloids/debian/compat (rev 0) +++ packages/trunk/funguloids/debian/compat 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1 @@ +5 Added: packages/trunk/funguloids/debian/control =================================================================== --- packages/trunk/funguloids/debian/control (rev 0) +++ packages/trunk/funguloids/debian/control 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,32 @@ +Source: funguloids +Priority: extra +Section: contrib/games +Maintainer: Debian Games Team <[email protected]> +Uploaders: Michael Koch <[email protected]> +Build-Depends: debhelper (>= 5), + tofrodos, + automake, + pkg-config, + liblua5.1-0-dev, + libois-dev, + libogre-dev (>= 1.4.9), + libalut-dev, + libopenal-dev, + libogg-dev, + libvorbis-dev, + libmad0-dev +Standards-Version: 3.8.3 +Vcs-Git: git://git.debian.org/git/pkg-games/funguloids.git +Vcs-Browser: http://git.debian.org/?p=pkg-games/funguloids.git +Homepage: http://funguloids.sourceforge.net +DM-Upload-Allowed: yes + +Package: funguloids +Architecture: any +Depends: ${shlibs:Depends}, + ogre-plugins-cgprogrammanager [amd64 i386] +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! Added: packages/trunk/funguloids/debian/copyright =================================================================== --- packages/trunk/funguloids/debian/copyright (rev 0) +++ packages/trunk/funguloids/debian/copyright 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,47 @@ +This package was debianized by Andres Mejia <[email protected]> on +Sat, 23 Jun 2007 15:59:37 -0400. + +It was downloaded from +<http://downloads.sourceforge.net/funguloids/funguloids-linux-1.06-4.tar.bz2>. +The (sources + data) tarball was downloaded. Files that are generated by +autotools are removed from original tarball. + +Credits: + +Code: Mika Halttunen <[email protected]> +Game Design: Teemu Ruokolainen +Artwork: Mika Halttunen +Sound Design & Music: Teemu Ruokolainen + +We're using Ogre graphics engine for visuals, OIS for input, Lua for scripting +and OpenAL for audio output. SimpleIni is used for the configuration +reading/writing. Hosted by SourceForge. + +Comments, ideas, patches, bug reports, etc. are always welcome and +appreciated! :) Use the SourceForge trackers, or just mail me at the e-mail +address above. And be sure to check out Funguloids website at +http://funguloids.sourceforge.net for the latest stuff! + +Copyright and License: + +"Those Funny Funguloids!" is licensed under the zlib/libpng license. +Copyright © 2006-2007, Mika Halttunen & Teemu Ruokolainen + +This software is provided 'as-is', without any express or implied warranty. In +no event will the authors be held liable for any damages arising from the use +of this software. + +Permission is granted to anyone to use this software for any purpose, including +commercial applications, and to alter it and redistribute it freely, subject to +the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software in a + product, an acknowledgment in the product documentation would be appreciated + but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +The Debian packaging is (C) 2007, Andres Mejia <[email protected]> and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. Added: packages/trunk/funguloids/debian/funguloids.6 =================================================================== --- packages/trunk/funguloids/debian/funguloids.6 (rev 0) +++ packages/trunk/funguloids/debian/funguloids.6 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,63 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH FUNGULOIDS 6 "July 10, 2007" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +funguloids \- "Those Funny Funguloids!" +.SH SYNOPSIS +.B funguloids +.SH DESCRIPTION +This manual page documents briefly the +.B funguloids +command. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBfunguloids\fP is a the command to run and play the game "Those Funny Funguloids!". +.SH SEE ALSO +.BR /usr/share/doc/funguloids +.br +.BR http://funguloids.sourceforge.net +.SH CREDITS +"Those Funny Funguloids!" was primarily developed by: +.br +.br +\fBCode:\fP Mika Halttunen <[email protected]> +.br +\fBGame Design:\fP Teemu Ruokolainen +.br +\fBArtwork:\fP Mika Halttunen +.br +\fBSound Design & Music:\fP Teemu Ruokolainen +.SH LICENSE +"Those Funny Funguloids!" is licensed under the zlib/libpng license. +Copyright (C) 2006-2007, Mika Halttunen & Teemu Ruokolainen + +This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a product, an + acknowledgment in the product documentation would be appreciated but is not + required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +This manual page was written by Andres Mejia <[email protected]>, +for the Debian project (but may be used by others). Added: packages/trunk/funguloids/debian/funguloids.desktop =================================================================== --- packages/trunk/funguloids/debian/funguloids.desktop (rev 0) +++ packages/trunk/funguloids/debian/funguloids.desktop 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Funguloids +Comment=space-flying-mushroom-picking-simulator +Icon=funguloids +Exec=/usr/games/funguloids >/dev/null 2>&1 +Terminal=false +Type=Application +Categories=Game;ArcadeGame; Added: packages/trunk/funguloids/debian/funguloids.install =================================================================== --- packages/trunk/funguloids/debian/funguloids.install (rev 0) +++ packages/trunk/funguloids/debian/funguloids.install 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,4 @@ +usr/games/* +usr/share/games/* +usr/share/pixmaps/* +../funguloids.desktop usr/share/applications Added: packages/trunk/funguloids/debian/funguloids.menu =================================================================== --- packages/trunk/funguloids/debian/funguloids.menu (rev 0) +++ packages/trunk/funguloids/debian/funguloids.menu 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,5 @@ +?package(funguloids):needs="X11" \ + section="Games/Action" \ + title="Funguloids" \ + longtitle="Those Funny Funguloids!" \ + command="/usr/games/funguloids >/dev/null 2>&1" Added: packages/trunk/funguloids/debian/patches/alc_error.patch =================================================================== --- packages/trunk/funguloids/debian/patches/alc_error.patch (rev 0) +++ packages/trunk/funguloids/debian/patches/alc_error.patch 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,21 @@ +Check ALC errors instead of AL errors. +===================================================================== +--- a/src/openalsoundsystem.cpp.bak 2008-05-04 16:41:32.000000000 -0400 ++++ b/src/openalsoundsystem.cpp 2008-05-04 16:20:52.000000000 -0400 +@@ -266,14 +266,14 @@ + + int attributes[] = { 0 }; + mContext = alcCreateContext(mDevice, attributes); +- if ( (err = alGetError()) != AL_NO_ERROR) { ++ if ( (err = alcGetError(mDevice)) != ALC_NO_ERROR) { + LogManager::getSingleton().logMessage("OpanAL: error creating context: " + lastALError(err) ); + return 1; + } + // check_alc_error("Couldn't create audio context: "); + alcMakeContextCurrent(mContext); + // check_alc_error("Couldn't select audio context: "); +- if ( (err = alGetError()) != AL_NO_ERROR) { ++ if ( (err = alcGetError(mDevice)) != ALC_NO_ERROR) { + LogManager::getSingleton().logMessage("OpanAL: error making context current: " + lastALError(err) ); + return 2; + } Added: packages/trunk/funguloids/debian/patches/disable_mouse_capture.patch =================================================================== --- packages/trunk/funguloids/debian/patches/disable_mouse_capture.patch (rev 0) +++ packages/trunk/funguloids/debian/patches/disable_mouse_capture.patch 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,26 @@ +Support disabling of keyboard and mouse capture for debugging. +===================================================================== +--- a/src/input.cpp.bak 2008-05-04 14:51:35.000000000 -0400 ++++ b/src/input.cpp 2008-05-04 14:35:00.000000000 -0400 +@@ -37,6 +37,21 @@ + OIS::ParamList pl; + pl.insert(OIS::ParamList::value_type("WINDOW", Ogre::StringConverter::toString(hWnd))); + ++ // Disable mouse capture for debugging. ++ #ifdef DISABLE_MOUSE_CAPTURE ++ #if defined OIS_WIN32_PLATFORM ++ pl.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_FOREGROUND" ))); ++ pl.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_NONEXCLUSIVE"))); ++ pl.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_FOREGROUND"))); ++ pl.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_NONEXCLUSIVE"))); ++ #elif defined OIS_LINUX_PLATFORM ++ pl.insert(std::make_pair(std::string("x11_mouse_grab"), std::string("false"))); ++ pl.insert(std::make_pair(std::string("x11_mouse_hide"), std::string("false"))); ++ pl.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("false"))); ++ pl.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true"))); ++ #endif ++ #endif ++ + mHWnd = hWnd; + mInputManager = OIS::InputManager::createInputSystem(pl); + mMouse = static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true)); Added: packages/trunk/funguloids/debian/patches/g++4.3_fix.patch =================================================================== --- packages/trunk/funguloids/debian/patches/g++4.3_fix.patch (rev 0) +++ packages/trunk/funguloids/debian/patches/g++4.3_fix.patch 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,12 @@ +Fix for compiling with g++4.3 +===================================================================== +--- a/src/mp3stream.cpp.bak 2008-07-22 00:26:28.000000000 -0400 ++++ b/src/mp3stream.cpp 2008-07-22 00:26:38.000000000 -0400 +@@ -35,6 +35,7 @@ + #include <sys/stat.h> + #include <sstream> + #include "Ogre.h" ++#include <limits.h> + + #include "mp3stream.h" + Added: packages/trunk/funguloids/debian/patches/makefile_modifications.diff =================================================================== --- packages/trunk/funguloids/debian/patches/makefile_modifications.diff (rev 0) +++ packages/trunk/funguloids/debian/patches/makefile_modifications.diff 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,41 @@ +Some modifications to get some of the data files installed in the correct +places. This is mainly for the purpose of building Debian packages. +========================================================================== +--- a/bin/music/Makefile.am~ 2007-06-23 18:03:05.000000000 -0400 ++++ b/bin/music/Makefile.am 2007-06-23 18:04:00.000000000 -0400 +@@ -1,12 +1,10 @@ +-musicinstall_DATA = playlist.lua ++musicinstall_DATA = playlist.lua MarylandInMay.ogg + + EXTRA_DIST = playlist.lua.in + + playlist.lua: playlist.lua.in + cat playlist.lua.in | sed 's,%%musicinstalldir%%,@musicinstalldir@,' > playlist.lua + +-install-data-hook: +- if test -r MarylandInMay.ogg; then cp MarylandInMay.ogg "@musicinstalldir@"; fi; + + + distclean: clean +--- a/bin/Makefile.am~ 2007-06-23 18:36:56.000000000 -0400 ++++ b/bin/Makefile.am 2007-06-23 18:39:50.000000000 -0400 +@@ -4,7 +4,7 @@ + dist_pixmapinstall_DATA = funguloids.png + dist_gameinstall_DATA = gamesettings.cfg + dist_docinstall_DATA = readme.html +-gameinstall_DATA = plugins.cfg resources.cfg ++gameinstall_DATA = plugins.cfg resources.cfg bootstrap.mpk funguloids.mpk + + plugins.cfg: plugins.cfg.in + cat plugins.cfg.in | sed 's,%%ogreplugindir%%,@ogreplugindir@/,' > plugins.cfg +@@ -22,9 +22,7 @@ + if test ! -e "@highscoredir@/hiscore.lst"; then cp hiscore.lst.in "@highscoredir@/hiscore.lst"; fi; \ + chgrp -R @highscoregroup@ "@highscoredir@"; \ + chmod -R g+w "@highscoredir@"; \ +- fi; \ +- if test -r bootstrap.mpk; then cp bootstrap.mpk "@gameinstalldir@"; fi; \ +- if test -r funguloids.mpk; then cp funguloids.mpk "@gameinstalldir@"; fi ++ fi + + uninstall-hook: + rm -rf "@docinstalldir@" Added: packages/trunk/funguloids/debian/patches/ogre-1.6.1.patch =================================================================== --- packages/trunk/funguloids/debian/patches/ogre-1.6.1.patch (rev 0) +++ packages/trunk/funguloids/debian/patches/ogre-1.6.1.patch 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,42 @@ +--- funguloids-1.06.orig/include/mpakogre.h ++++ funguloids-1.06/include/mpakogre.h +@@ -56,6 +56,7 @@ + FileInfoListPtr findFileInfo(const String &pattern, bool recursive, bool dirs = false); + + bool exists(const String &filename); ++ time_t getModifiedTime(const String& filename); + }; + + +--- funguloids-1.06.orig/src/mpakogre.cpp ++++ funguloids-1.06/src/mpakogre.cpp +@@ -198,6 +198,11 @@ + return (i != -1); + } + ++time_t MPakArchive::getModifiedTime(const String& filename) { ++ // TODO: This is currently only a dummy implementation. ++ return 0; ++} ++ + const String &MPakArchiveFactory::getType(void) const { + static String name = "MPK"; + return name; +--- funguloids-1.06.orig/src/scriptsystem.cpp ++++ funguloids-1.06/src/scriptsystem.cpp +@@ -137,7 +137,6 @@ + Asteroid *roid = new Asteroid(String(name), ScriptSystem::getSingleton().getSceneMgr(), String(mesh), String(mat), pos); + roid->setScale(scale, scale, scale); + roid->setMass(scale * 10.0f); +- roid->getEntity()->setNormaliseNormals(true); + return 0; + } + +@@ -435,6 +434,7 @@ + ScriptSystem::ScriptSystem(SceneManager *mgr, const char *startup_file) { + assert(mgr); + mSceneMgr = mgr; ++ mgr->setNormaliseNormalsOnScale(true); + scriptLights.clear(); + + LogManager::getSingleton().logMessage("Using " + String(LUA_VERSION)); Added: packages/trunk/funguloids/debian/patches/series =================================================================== --- packages/trunk/funguloids/debian/patches/series (rev 0) +++ packages/trunk/funguloids/debian/patches/series 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,6 @@ +makefile_modifications.diff +size_chunks_reverse.patch +disable_mouse_capture.patch +alc_error.patch +g++4.3_fix.patch +ogre-1.6.1.patch Added: packages/trunk/funguloids/debian/patches/size_chunks_reverse.patch =================================================================== --- packages/trunk/funguloids/debian/patches/size_chunks_reverse.patch (rev 0) +++ packages/trunk/funguloids/debian/patches/size_chunks_reverse.patch 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,14 @@ +Correction for MPakDataStream::read(). This reflects what's done in the +FileHandleDataStream::read() method in OgreDataStream.cpp in the Ogre library. +===================================================================== +--- a/src/mpakogre.cpp.bak 2008-05-04 01:05:10.000000000 -0400 ++++ b/src/mpakogre.cpp 2008-05-04 00:56:05.000000000 -0400 +@@ -219,7 +219,7 @@ + } + + size_t MPakDataStream::read(void *buf, size_t count) { +- return fread(buf, count, 1, mFileHandle); ++ return fread(buf, 1, count, mFileHandle); + } + + void MPakDataStream::skip(long count) { Added: packages/trunk/funguloids/debian/rules =================================================================== --- packages/trunk/funguloids/debian/rules (rev 0) +++ packages/trunk/funguloids/debian/rules 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,150 @@ +#! /usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are from the autotools-dev package documentation. +# /usr/share/doc/autotools-dev/README.Debian.gz +# from the section titled "Calling GNU configure properly" +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +# FOR AUTOCONF 2.52 AND NEWER ONLY +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) +else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + DEB_CXXFLAGS += -O0 -g -Wall +else + DEB_CXXFLAGS += -O2 -g -Wall +endif + +# Specify extra option to build funguliods while disabling keyboard and mouse +# capture +ifneq (,$(findstring nomousecapture,$(DEB_BUILD_OPTIONS))) + DEB_CXXFLAGS += -DDISABLE_MOUSE_CAPTURE +endif + +fromdos: fromdos-stamp +fromdos-stamp: + dh_testdir + fromdos -e include/mpakogre.h + fromdos -e src/mpakogre.cpp + fromdos -e src/input.cpp + fromdos -e src/openalsoundsystem.cpp + fromdos -e src/scriptsystem.cpp + +configure: configure-stamp +configure-stamp: + dh_testdir +# Some strange issue happened where the build-aux directory was never imported +# using git-import-orig, thus the next line ensures that it's there + [ -d build-aux ] || mkdir build-aux + aclocal + autoheader -f + automake --add-missing --force-missing --copy + autoconf -f + CXXFLAGS="$(DEB_CXXFLAGS)" \ + ./configure $(confflags) --prefix=/usr --with-fmod=no + touch configure-stamp + +build: configure build-stamp +build-stamp: + dh_testdir + $(MAKE) + touch build-stamp + +clean: clean-stamp todos +clean-stamp: + dh_testdir + dh_testroot + [ ! -f Makefile ] || $(MAKE) clean distclean + [ -d build-aux ] && rm -f build-aux/* + [ ! -f configure-stamp ] || rm configure-stamp + [ ! -f build-stamp ] || rm build-stamp + rm -f aclocal.m4 configure + rm -f bin/music/playlist.lua + find . -name Makefile -delete + find . -name Makefile.in -delete + rm -rf .pc + dh_clean + +todos: + dh_testdir + todos -e include/mpakogre.h + todos -e src/mpakogre.cpp + todos -e src/input.cpp + todos -e src/openalsoundsystem.cpp + todos -e src/scriptsystem.cpp + +install: build + dh_testdir + dh_testroot + dh_clean -k + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + +# Build architecture-independent files here. +binary-indep: +# Nothing to do for binary-indep + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_install --sourcedir=debian/tmp -Xplugins.cfg + dh_link /etc/OGRE/plugins.cfg usr/share/games/funguloids/plugins.cfg + dh_installchangelogs + dh_installman debian/funguloids.6 + dh_installdocs debian/tmp/usr/share/docs/funguloids/* + dh_installmenu + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Common variables used to ease maintenance of the get-orig-source target. +FUNGULOIDS_TARBALL = funguloids-linux-1.06-4.tar.bz2 +FUNGULOIDS_VERSION = 1.06 +CORRECT_CHECKSUM = 1d9d92b08f58715d3dcb59c2ebcb7db7 +COMPUTED_CHECKSUM = $(shell md5sum $(FUNGULOIDS_TARBALL) | cut -d ' ' -f 1) +get-orig-source: + [ -e $(FUNGULOIDS_TARBALL) ] || \ + wget http://downloads.sourceforge.net/funguloids/$(FUNGULOIDS_TARBALL) +ifeq ($(CORRECT_CHECKSUM),$(COMPUTED_CHECKSUM)) + @echo Generating orig tarball + tar -xjf $(FUNGULOIDS_TARBALL) + mv funguloids funguloids-$(FUNGULOIDS_VERSION).orig +# This next part shouldn't have been done. It won't be done on next release +# or next time the orig tarball is reuploaded. + rm funguloids-$(FUNGULOIDS_VERSION).orig/build-aux/install-sh + rm funguloids-$(FUNGULOIDS_VERSION).orig/build-aux/missing + rm funguloids-$(FUNGULOIDS_VERSION).orig/build-aux/depcomp + rm funguloids-$(FUNGULOIDS_VERSION).orig/bin/music/Makefile.in + rm funguloids-$(FUNGULOIDS_VERSION).orig/bin/Makefile.in + rm funguloids-$(FUNGULOIDS_VERSION).orig/bin/icon/Makefile.in + rm funguloids-$(FUNGULOIDS_VERSION).orig/bin/docs/Makefile.in + rm funguloids-$(FUNGULOIDS_VERSION).orig/Makefile.in + rm funguloids-$(FUNGULOIDS_VERSION).orig/include/Makefile.in + rm funguloids-$(FUNGULOIDS_VERSION).orig/src/Makefile.in + rm funguloids-$(FUNGULOIDS_VERSION).orig/configure + rm funguloids-$(FUNGULOIDS_VERSION).orig/aclocal.m4 + tar -czf funguloids_$(FUNGULOIDS_VERSION).orig.tar.gz funguloids-$(FUNGULOIDS_VERSION).orig + rm -rf funguloids-$(FUNGULOIDS_VERSION).orig + rm $(FUNGULOIDS_TARBALL) + @echo done. +else + @echo Checksum mismatch. Correct checksum is $(CORRECT_CHECKSUM). + @echo Computed checksum was $(COMPUTED_CHECKSUM). + exit 1 +endif + +binary: binary-arch binary-indep +.PHONY: unpack configure build clean binary-indep binary-arch binary install Property changes on: packages/trunk/funguloids/debian/rules ___________________________________________________________________ Added: svn:executable + * Added: packages/trunk/funguloids/debian/source/format =================================================================== --- packages/trunk/funguloids/debian/source/format (rev 0) +++ packages/trunk/funguloids/debian/source/format 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1 @@ +3.0 (quilt) Added: packages/trunk/funguloids/debian/watch =================================================================== --- packages/trunk/funguloids/debian/watch (rev 0) +++ packages/trunk/funguloids/debian/watch 2011-08-13 09:43:33 UTC (rev 12579) @@ -0,0 +1,11 @@ +version=3 + +# Use qa.debian.org +http://sf.net/funguloids/funguloids-linux-([^(src)].+)\.tar\.bz2 \ + 1.06-4. + +# Scan sourceforge directly +#opts=uversionmangle=s/\.\?.*// \ +# http://downloads.sourceforge.net/funguloids \ +# http://downloads.sourceforge.net/funguloids/funguloids-linux-([^(src)].+)\.tar\.bz2(.*) \ +# 1.06-4 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
