debian/0000755000000000000000000000000012152372216007167 5ustar debian/blobby.install0000644000000000000000000000020311664140534012026 0ustar debian/blobby.desktop usr/share/applications usr/bin/blobby usr/games usr/share/blobby/config.xml usr/share/blobby/inputconfig.xml debian/blobby.desktop0000644000000000000000000000024111664140534012033 0ustar [Desktop Entry] Type=Application Version=1.0 Name=Blobby Volley 2 GenericName=Volleyball Game Icon=blobby Exec=blobby Terminal=false Categories=Game;ArcadeGame; debian/rules0000755000000000000000000000105311747725660010264 0ustar #!/usr/bin/make -f export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh $@ --parallel override_dh_install: dh_install --fail-missing convert -transparent black data/gfx/ball01.bmp \ debian/blobby/usr/share/icons/hicolor/64x64/apps/blobby.png convert -transparent black data/gfx/ball01.bmp -resize 32x32 \ debian/blobby/usr/share/icons/hicolor/32x32/apps/blobby.png convert -transparent black data/gfx/ball01.bmp -resize 32x32 \ debian/blobby/usr/share/pixmaps/blobby.xpm override_dh_installchangelogs: dh_installchangelogs ChangeLog debian/source/0000755000000000000000000000000011664140534010472 5ustar debian/source/format0000644000000000000000000000001411664140534011700 0ustar 3.0 (quilt) debian/gbp.conf0000644000000000000000000000005711742017575010620 0ustar [DEFAULT] pristine-tar = True sign-tags = True debian/menu0000644000000000000000000000022411664140534010057 0ustar ?package(blobby):needs="X11" section="Games/Action"\ icon="/usr/share/pixmaps/blobby.xpm" \ title="Blobby Volley 2" command="/usr/games/blobby" debian/blobby.60000644000000000000000000000044611664140534010536 0ustar .TH BLOBBY 6 "August 1, 2007" .SH NAME blobby \- A volleyball game with blobs .SH SYNOPSIS \fBblobby\fR .br .SH DESCRIPTION Arcarde volleyball game with jumping blobs. It contains a multiplayer mode and several bots. .SH AUTHOR This manual page was written by Felix Geyer . debian/blobby-server.60000644000000000000000000000047111664140534012040 0ustar .TH BLOBBY-SERVER 6 "August 1, 2007" .SH NAME blobby-server \- A volleyball game with blobs .SH SYNOPSIS \fBblobby-server\fR .br .SH DESCRIPTION Server for the arcarde volleyball game with jumping blobs. The port of the server is 1234. .SH AUTHOR This manual page was written by Felix Geyer . debian/blobby-server.install0000644000000000000000000000007411664140534013340 0ustar usr/bin/blobby-server usr/games usr/share/blobby/server.xml debian/compat0000644000000000000000000000000211747725665010410 0ustar 9 debian/changelog0000644000000000000000000000572712152372216011054 0ustar blobby (1.0~rc3-3) unstable; urgency=low * Fix FTBFS: 'assert' was not declared in this scope. (Closes: #710632) - Add 06_fix_ftbfs_assert_include.patch -- Felix Geyer Sat, 01 Jun 2013 15:18:00 +0200 blobby (1.0~rc3-2) unstable; urgency=low * Upload to unstable. * Bump Standards-Version to 3.9.4, no changes needed. -- Felix Geyer Wed, 08 May 2013 21:49:41 +0200 blobby (1.0~rc3-1) experimental; urgency=low * Upload to experimental due to the freeze. * New upstream release. * Refresh patches. * Drop 06_ftbfs_gcc47.patch, merged upstream. * Switch to my @debian.org email address. -- Felix Geyer Sun, 04 Nov 2012 12:05:41 +0100 blobby (1.0~rc1-2) unstable; urgency=low * Fix FTBFS with gcc 4.7. - Add 06_ftbfs_gcc47.patch * Switch to debhelper compat level v9. -- Felix Geyer Tue, 01 May 2012 12:27:19 +0200 blobby (1.0~rc1-1) unstable; urgency=low * New upstream release. * Refresh patches. * Fix Vcs-Browser url. * Install the upstream changelog. * Bump Standards-Version to 3.9.3, no changes needed. * Update copyright file. -- Felix Geyer Fri, 13 Apr 2012 16:14:15 +0200 blobby (0.9c-1) unstable; urgency=low * New upstream release. (LP: #887143) - Resolves all licensing issues, no need to repackage the upstream tarball anymore. * Drop 03_detect_endianness_glibc.patch, merged upstream. * Refresh patches. * Enable parallel building. * Switch to source format 3.0 (quilt). - Add unapply-patches and abort-on-upstream-changes to local-options. - Refresh patches. * Export build flags using /usr/share/dpkg/buildflags.mk. * Improve package description, thanks to Paul Stewart. (LP: #833458) * Bump Standards-Version to 3.9.2, no changes needed. * Move package to the pkg-games team. * Generate blobby icons during the build. * Update copyright file to latest DEP-5 spec. * Pass --fail-missing to dh_install. * Add 05_server_config_file.patch: append /usr/share/blobby to the server config search path and write the config to the user's home dir. (Closes: #648204) -- Felix Geyer Sun, 04 Dec 2011 12:45:10 +0100 blobby (0.8-dfsg-2.1) unstable; urgency=low * Non-maintainer upload. * Set DM-Upload-Allowed. -- Philipp Kern Mon, 28 Nov 2011 22:39:54 +0100 blobby (0.8-dfsg-2) unstable; urgency=low * Add 03_detect_endianness_glibc.patch to fix FTBFS on s390 and sh4. (Closes: #572025) * Add Vcs-Git and Vcs-Browser fields. * Update copyright information of the tinyxml source. * Explicitly set source format to "1.0". * Add -Wl,--as-needed to LDFLAGS. * Use the tinyxml package instead of building a local copy. -- Felix Geyer Sat, 17 Apr 2010 00:54:09 +0200 blobby (0.8-dfsg-1) unstable; urgency=low * Initial release. (Closes: #408439) -- Felix Geyer Tue, 23 Feb 2010 18:28:39 +0100 debian/blobby-data.install0000644000000000000000000000011611664140534012740 0ustar usr/share/blobby/*.zip usr/share/blobby/rules.lua usr/share/blobby/lang_*.xml debian/control0000644000000000000000000000322612142526075010600 0ustar Source: blobby Section: games Priority: optional Maintainer: Debian Games Team Uploaders: Felix Geyer Build-Depends: debhelper (>= 9), cmake, imagemagick, zip, libboost-dev, libgl1-mesa-dev | libgl-dev, liblua5.1-0-dev, libphysfs-dev, libsdl1.2-dev, libtinyxml-dev, zlib1g-dev Homepage: http://sourceforge.net/projects/blobby/ Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-games/blobby.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/blobby.git Package: blobby Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, blobby-data (>= ${source:Version}) Description: Volleyball game with blobs This package contains the client binary for Blobby Volley 2. . Blobby Volley is an arcade volleyball game with jumping blobs. It contains a multiplayer mode and several bots. Package: blobby-server Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, blobby-data (>= ${source:Version}) Description: Volleyball game with blobs (server) This package contains the server binary for Blobby Volley 2. . Blobby Volley is an arcade volleyball game with jumping blobs. It contains a multiplayer mode and several bots. Package: blobby-data Architecture: all Depends: ${misc:Depends} Description: Volleyball game with blobs (data files) This package contains the static data for Blobby Volley 2. . Blobby Volley is an arcade volleyball game with jumping blobs. It contains a multiplayer mode and several bots. debian/watch0000644000000000000000000000014112043722007010210 0ustar version=3 opts="uversionmangle=s/rc/~rc/" \ http://sf.net/blobby/ blobby2-linux-(.*)\.tar\.gz debian/copyright0000644000000000000000000001505111742026547011133 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Blobby Volley 2 Upstream-Contact: Daniel Knobe Source: http://sourceforge.net/projects/blobby/ Files: * Copyright: 2006, Jonathan Sieber 2006, Daniel Knobe License: GPL-2+ On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. Files: src/lua/* Copyright: 1994-2008, Lua.org, PUC-Rio. License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: src/raknet/* Copyright: 2003, Rakkarsoft LLC and Kevin Jenkins. License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of the nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: src/raknet/Rand.* Copyright: 1997, Makoto Matsumoto and Takuji Nishimura License: LGPL-2+ On Debian systems, the complete text of the GNU Library General Public License can be found in `/usr/share/common-licenses/LGPL-2'. Files: src/raknet/SHA1.* Copyright: Public domain License: public-domain No license as the code is in public domain. Files: src/raknet/rijndael* Copyright: 1999-2000, Enhanced Software Technologies Inc. License: BSD-4-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. All advertising materials mentioning features or use of this software must display the following acknowledgement: This product includes software developed by Enhanced Software Technologies Inc. and its contributors. 4. Neither the name of the Company nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE COMPANY AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COMPANY OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: src/tinyxml/* Copyright: 2000-2007, Lee Thomason 2002-2004, Yves Berquin License: Zlib Files: src/tinyxml/tinystr.* Copyright: 2000-2007, Lee Thomason 2002-2004, Yves Berquin 2005, Tyge Lovset License: Zlib Files: debian/* Copyright: 2009-2012, Felix Geyer License: GPL-2+ On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. License: Zlib 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. debian/blobby.manpages0000644000000000000000000000002011664140534012150 0ustar debian/blobby.6 debian/blobby.dirs0000644000000000000000000000013011664140534011320 0ustar usr/share/icons/hicolor/32x32/apps usr/share/icons/hicolor/64x64/apps usr/share/pixmaps debian/blobby-server.manpages0000644000000000000000000000002711664140534013463 0ustar debian/blobby-server.6 debian/patches/0000755000000000000000000000000012152372172010617 5ustar debian/patches/06_fix_ftbfs_assert_include.patch0000644000000000000000000000100112152372172017173 0ustar Description: Add missing #include statement to fix FTBFS. Bug: https://sourceforge.net/apps/mantisbt/blobby/view.php?id=103 Bug-Debian: http://bugs.debian.org/710632 Author: Felix Geyer --- a/src/CrossCorrelation.h +++ b/src/CrossCorrelation.h @@ -19,6 +19,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #pragma once +#include + typedef float(*timeWeightFunction)(float pdt); inline float constantWeightFunction(float ) { debian/patches/05_server_config_file.patch0000644000000000000000000000273412045445230016001 0ustar Description: Append /usr/share/blobby to the server config search path and write the config to the user's home dir. Author: Felix Geyer Bug: https://sourceforge.net/apps/mantisbt/blobby/view.php?id=33 Bug-Debian: http://bugs.debian.org/648204 --- a/src/server/DedicatedServer.cpp +++ b/src/server/DedicatedServer.cpp @@ -36,6 +36,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include +#include "config.h" + #include "InputSource.h" #include "PhysicWorld.h" #include "NetworkGame.h" @@ -131,6 +133,8 @@ int main(int argc, char** argv) try { config.loadFile("server.xml"); + // make sure the config is present in the user dir + config.saveFile("server.xml"); port = config.getInteger("port"); maxClients = config.getInteger("maximum_clients"); @@ -523,7 +527,22 @@ void wait_and_restart_child() void setup_physfs(char* argv0) { FileSystem& fs = FileSystem::getSingleton(); +#ifdef WIN32 fs.addToSearchPath("data"); + fs.setWriteDir("data"); +#else + fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby"); + + std::string userdir = fs.getUserDir(); + std::string userAppend = ".blobby"; + std::string homedir = userdir + userAppend; + /// \todo please review this code and determine if we really need to add userdir to serach path + /// only to remove it later + fs.setWriteDir(userdir); + fs.probeDir(userAppend); + fs.removeFromSearchPath(userdir); + fs.setWriteDir(homedir); +#endif } debian/patches/01_sdl_default.patch0000644000000000000000000000102012045445207014420 0ustar Description: Use SDL by default since it's faster without hardware acceleration Author: Felix Geyer --- a/src/main.cpp +++ b/src/main.cpp @@ -160,8 +160,8 @@ int main(int argc, char* argv[]) else { std::cerr << "Warning: Unknown renderer selected!"; - std::cerr << "Falling back to OpenGL" << std::endl; - rmanager = RenderManager::createRenderManagerGL2D(); + std::cerr << "Falling back to SDL" << std::endl; + rmanager = RenderManager::createRenderManagerSDL(); } // fullscreen? debian/patches/04_use_system_tinyxml.patch0000644000000000000000000000334412045445207016134 0ustar Description: Use system tinyxml library instead of building a local copy Author: Felix Geyer --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(tinyxml) add_subdirectory(raknet) add_subdirectory(blobnet) --- a/src/FileRead.cpp +++ b/src/FileRead.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #include -#include "tinyxml/tinyxml.h" +#include extern "C" { --- a/src/ReplayRecorder.cpp +++ b/src/ReplayRecorder.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include -#include "tinyxml/tinyxml.h" +#include #include "raknet/BitStream.h" --- a/src/TextManager.cpp +++ b/src/TextManager.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #include -#include "tinyxml/tinyxml.h" +#include #include "Global.h" #include "FileRead.h" --- a/src/UserConfig.cpp +++ b/src/UserConfig.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #include -#include "tinyxml/tinyxml.h" +#include #include "Global.h" #include "FileRead.h" --- a/src/state/NetworkSearchState.cpp +++ b/src/state/NetworkSearchState.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "blobnet/layer/Http.hpp" #include "blobnet/exception/HttpException.hpp" -#include "tinyxml/tinyxml.h" +#include #include "NetworkState.h" #include "TextManager.h" debian/patches/02_use_system_lua.patch0000644000000000000000000000332712045445207015210 0ustar Description: Use system lua library instead of building a local copy Author: Felix Geyer --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(lua) add_subdirectory(tinyxml) add_subdirectory(raknet) add_subdirectory(blobnet) @@ -84,11 +83,11 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows) endif (CMAKE_SYSTEM_NAME STREQUAL Windows) add_executable(blobby ${blobby_SRC}) -target_link_libraries(blobby lua raknet blobnet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${SDL_LIBRARY} ${OPENGL_LIBRARIES}) +target_link_libraries(blobby lua5.1 raknet blobnet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${SDL_LIBRARY} ${OPENGL_LIBRARIES}) if (UNIX) add_executable(blobby-server ${blobby-server_SRC}) - target_link_libraries(blobby-server lua raknet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${SDL_LIBRARY}) + target_link_libraries(blobby-server lua5.1 raknet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${SDL_LIBRARY}) endif (UNIX) if (CMAKE_SYSTEM_NAME STREQUAL Windows) --- a/src/ScriptedInputSource.cpp +++ b/src/ScriptedInputSource.cpp @@ -30,9 +30,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA extern "C" { -#include "lua/lua.h" -#include "lua/lauxlib.h" -#include "lua/lualib.h" +#include +#include +#include } #include "DuelMatch.h" --- a/src/GameLogic.cpp +++ b/src/GameLogic.cpp @@ -28,9 +28,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA extern "C" { -#include "lua/lua.h" -#include "lua/lauxlib.h" -#include "lua/lualib.h" +#include +#include +#include } #include "FileRead.h" debian/patches/series0000644000000000000000000000020712152352452012032 0ustar 01_sdl_default.patch 02_use_system_lua.patch 04_use_system_tinyxml.patch 05_server_config_file.patch 06_fix_ftbfs_assert_include.patch