Author: pabs Date: 2013-06-02 06:44:15 +0000 (Sun, 02 Jun 2013) New Revision: 14207
Added: packages/tags/cultivation/9+dfsg1-2/ packages/tags/cultivation/9+dfsg1-2/debian/changelog packages/tags/cultivation/9+dfsg1-2/debian/compat packages/tags/cultivation/9+dfsg1-2/debian/control packages/tags/cultivation/9+dfsg1-2/debian/copyright packages/tags/cultivation/9+dfsg1-2/debian/cultivation.desktop packages/tags/cultivation/9+dfsg1-2/debian/install packages/tags/cultivation/9+dfsg1-2/debian/patches/portaudio19.patch packages/tags/cultivation/9+dfsg1-2/debian/rules Removed: packages/tags/cultivation/9+dfsg1-2/debian/changelog packages/tags/cultivation/9+dfsg1-2/debian/compat packages/tags/cultivation/9+dfsg1-2/debian/control packages/tags/cultivation/9+dfsg1-2/debian/copyright packages/tags/cultivation/9+dfsg1-2/debian/cultivation.desktop packages/tags/cultivation/9+dfsg1-2/debian/install packages/tags/cultivation/9+dfsg1-2/debian/patches/portaudio19.patch packages/tags/cultivation/9+dfsg1-2/debian/rules Log: [svn-buildpackage] Tagging cultivation 9+dfsg1-2 Deleted: packages/tags/cultivation/9+dfsg1-2/debian/changelog =================================================================== --- packages/trunk/cultivation/debian/changelog 2013-06-02 01:25:12 UTC (rev 14197) +++ packages/tags/cultivation/9+dfsg1-2/debian/changelog 2013-06-02 06:44:15 UTC (rev 14207) @@ -1,89 +0,0 @@ -cultivation (9+dfsg1-2) UNRELEASED; urgency=low - - [ Barry deFreese ] - * Patch for portaudio19. (Closes: #594015). - * Add hardening flags: - + Clean up rules file to pass options not sed the makefiles. - + Add dpkg-dev build dep for buildflags. - * Bump Standards Version to 3.9.4. - - -- Barry deFreese <[email protected]> Sat, 01 Jun 2013 16:54:56 -0400 - -cultivation (9+dfsg1-1) unstable; urgency=low - - * New upstream release - - Needs libpng, build against it - * Switch to dpkg-source v3 format - * Refresh, clean patches - - Drop rng_64bit.patch, merged upstream - - Drop mouse_pos.patch, issue fixed in mesa - - Drop cflags.patch, using sed is better - - Merge build.patch into portaudio.patch - * Switch to debhelper dh rules.tiny style - * Keep upstream capitalization, add symlinks - * Split up Build-Depends field - * Build & use a large transparent icon from the MacOS icon & mask - * Improve the menu files - * Install the upstream changelog file - * Change the patches to use DEP-3 headers - * Add myself to Uploaders - * Drop README.Debian, it is not useful to users - * Bump Standards-Version, no changes needed - * Slightly improve the copyright file - * Don't link against libX11, it isn't used - * Fix a crash when restarting the game (Closes: #597851) - - -- Paul Wise <[email protected]> Wed, 09 Feb 2011 21:53:07 +0800 - -cultivation (8.20070809.dfsg1-3) unstable; urgency=medium - - [ Miriam Ruiz ] - * Fixed bashism: Replaced "{build,configure}-stamp" - by "build-stamp configure-stamp" in debian/rules. - - [ Jon Dowland ] - * remove a bashism in debian/rules (Closes: #478368) - - [ Ansgar Burchardt ] - * Remove deprecated Encoding key from .desktop file - * debian/control: Change XS-Vcs-* to Vcs-* - * Remove Homepage semi-field from description - - [ Peter De Wachter ] - * rng_64bit.patch: fix for 64-bit systems from upstream CVS (Closes: #501933) - * debian/rules: call dh_desktop - * debian/control: add myself to uploaders - - -- Peter De Wachter <[email protected]> Tue, 14 Oct 2008 00:02:25 +0200 - -cultivation (8.20070809.dfsg1-2) unstable; urgency=low - - [ Miriam Ruiz ] - * Added hacky patch to fix wrong mouse behaviour. See #440137 - Thanks to David Martinez Marti <[email protected]> - - [ Jon Dowland ] - * add Homepage: control field to source stanza - - -- Jon Dowland <[email protected]> Mon, 03 Dec 2007 17:47:53 +0000 - -cultivation (8.20070809.dfsg1-1) unstable; urgency=low - - [ Miriam Ruiz ] - * New upstream version. - * Replaced icon by upstream's. - * Added XS-Vcs-Svn and XS-Vcs-Browser to debian/control. - - -- Miriam Ruiz <[email protected]> Tue, 28 Aug 2007 14:36:38 +0000 - -cultivation (7.20061227.dfsg1-1) unstable; urgency=low - - [ Miriam Ruiz ] - * Initial release (Closes: #428078) - - [ Jon Dowland ] - * update menu section to "Games/Action" for menu transition - (thanks Linas Žvirblis) - - -- Miriam Ruiz <[email protected]> Fri, 08 Jun 2007 14:04:02 +0000 - Copied: packages/tags/cultivation/9+dfsg1-2/debian/changelog (from rev 14206, packages/trunk/cultivation/debian/changelog) =================================================================== --- packages/tags/cultivation/9+dfsg1-2/debian/changelog (rev 0) +++ packages/tags/cultivation/9+dfsg1-2/debian/changelog 2013-06-02 06:44:15 UTC (rev 14207) @@ -0,0 +1,95 @@ +cultivation (9+dfsg1-2) unstable; urgency=low + + [ Barry deFreese ] + * Patch for portaudio19. (Closes: #594015). + * Add hardening flags: + + Clean up rules file to pass options not sed the makefiles. + + Add dpkg-dev build dep for buildflags. + * Bump Standards Version to 3.9.4. + + [ Paul Wise ] + * Use the canonical and working URLs for Vcs-* + * Upgrade to debhelper compat 9, add hardening + * Drop unneeded duplicate png file + * Add some keywords to the desktop file + + -- Paul Wise <[email protected]> Sun, 02 Jun 2013 14:24:36 +0800 + +cultivation (9+dfsg1-1) unstable; urgency=low + + * New upstream release + - Needs libpng, build against it + * Switch to dpkg-source v3 format + * Refresh, clean patches + - Drop rng_64bit.patch, merged upstream + - Drop mouse_pos.patch, issue fixed in mesa + - Drop cflags.patch, using sed is better + - Merge build.patch into portaudio.patch + * Switch to debhelper dh rules.tiny style + * Keep upstream capitalization, add symlinks + * Split up Build-Depends field + * Build & use a large transparent icon from the MacOS icon & mask + * Improve the menu files + * Install the upstream changelog file + * Change the patches to use DEP-3 headers + * Add myself to Uploaders + * Drop README.Debian, it is not useful to users + * Bump Standards-Version, no changes needed + * Slightly improve the copyright file + * Don't link against libX11, it isn't used + * Fix a crash when restarting the game (Closes: #597851) + + -- Paul Wise <[email protected]> Wed, 09 Feb 2011 21:53:07 +0800 + +cultivation (8.20070809.dfsg1-3) unstable; urgency=medium + + [ Miriam Ruiz ] + * Fixed bashism: Replaced "{build,configure}-stamp" + by "build-stamp configure-stamp" in debian/rules. + + [ Jon Dowland ] + * remove a bashism in debian/rules (Closes: #478368) + + [ Ansgar Burchardt ] + * Remove deprecated Encoding key from .desktop file + * debian/control: Change XS-Vcs-* to Vcs-* + * Remove Homepage semi-field from description + + [ Peter De Wachter ] + * rng_64bit.patch: fix for 64-bit systems from upstream CVS (Closes: #501933) + * debian/rules: call dh_desktop + * debian/control: add myself to uploaders + + -- Peter De Wachter <[email protected]> Tue, 14 Oct 2008 00:02:25 +0200 + +cultivation (8.20070809.dfsg1-2) unstable; urgency=low + + [ Miriam Ruiz ] + * Added hacky patch to fix wrong mouse behaviour. See #440137 + Thanks to David Martinez Marti <[email protected]> + + [ Jon Dowland ] + * add Homepage: control field to source stanza + + -- Jon Dowland <[email protected]> Mon, 03 Dec 2007 17:47:53 +0000 + +cultivation (8.20070809.dfsg1-1) unstable; urgency=low + + [ Miriam Ruiz ] + * New upstream version. + * Replaced icon by upstream's. + * Added XS-Vcs-Svn and XS-Vcs-Browser to debian/control. + + -- Miriam Ruiz <[email protected]> Tue, 28 Aug 2007 14:36:38 +0000 + +cultivation (7.20061227.dfsg1-1) unstable; urgency=low + + [ Miriam Ruiz ] + * Initial release (Closes: #428078) + + [ Jon Dowland ] + * update menu section to "Games/Action" for menu transition + (thanks Linas Žvirblis) + + -- Miriam Ruiz <[email protected]> Fri, 08 Jun 2007 14:04:02 +0000 + Deleted: packages/tags/cultivation/9+dfsg1-2/debian/compat =================================================================== --- packages/trunk/cultivation/debian/compat 2013-06-02 01:25:12 UTC (rev 14197) +++ packages/tags/cultivation/9+dfsg1-2/debian/compat 2013-06-02 06:44:15 UTC (rev 14207) @@ -1 +0,0 @@ -7 Copied: packages/tags/cultivation/9+dfsg1-2/debian/compat (from rev 14201, packages/trunk/cultivation/debian/compat) =================================================================== --- packages/tags/cultivation/9+dfsg1-2/debian/compat (rev 0) +++ packages/tags/cultivation/9+dfsg1-2/debian/compat 2013-06-02 06:44:15 UTC (rev 14207) @@ -0,0 +1 @@ +9 Deleted: packages/tags/cultivation/9+dfsg1-2/debian/control =================================================================== --- packages/trunk/cultivation/debian/control 2013-06-02 01:25:12 UTC (rev 14197) +++ packages/tags/cultivation/9+dfsg1-2/debian/control 2013-06-02 06:44:15 UTC (rev 14207) @@ -1,32 +0,0 @@ -Source: cultivation -Section: games -Priority: extra -Maintainer: Debian Games Team <[email protected]> -Uploaders: Miriam Ruiz <[email protected]>, - Peter De Wachter <[email protected]>, - Paul Wise <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), - imagemagick, - libpng-dev, - freeglut3-dev, - libgl1-mesa-dev | libgl-dev, - libglu1-mesa-dev | libglu-dev, - portaudio19-dev -Standards-Version: 3.9.4 -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/cultivation/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/cultivation/?op=log -Homepage: http://cultivation.sourceforge.net/ - -Package: cultivation -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: game about the interactions within a gardening community - Cultivation is a game about a community of gardeners growing food for - themselves in a shared space. - . - Cultivation is quite different from most other games. It is a social - simulation, and the primary form of conflict is over land and plant - resources. There is no shooting, but there are plenty of angry looks. It is - also an evolution simulation. Within the world of Cultivation, you can - explore a virtually infinite spectrum of different plant and gardener - varieties. Copied: packages/tags/cultivation/9+dfsg1-2/debian/control (from rev 14201, packages/trunk/cultivation/debian/control) =================================================================== --- packages/tags/cultivation/9+dfsg1-2/debian/control (rev 0) +++ packages/tags/cultivation/9+dfsg1-2/debian/control 2013-06-02 06:44:15 UTC (rev 14207) @@ -0,0 +1,37 @@ +Source: cultivation +Section: games +Priority: extra +Maintainer: Debian Games Team <[email protected]> +Uploaders: + Miriam Ruiz <[email protected]>, + Peter De Wachter <[email protected]>, + Paul Wise <[email protected]> +Build-Depends: + debhelper (>= 9), + dpkg-dev (>= 1.16.1~), + freeglut3-dev, + imagemagick, + libgl1-mesa-dev | libgl-dev, + libglu1-mesa-dev | libglu-dev, + libpng-dev, + portaudio19-dev +Standards-Version: 3.9.4 +Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/cultivation/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/cultivation/ +Homepage: http://cultivation.sourceforge.net/ + +Package: cultivation +Architecture: any +Depends: + ${misc:Depends}, + ${shlibs:Depends} +Description: game about the interactions within a gardening community + Cultivation is a game about a community of gardeners growing food for + themselves in a shared space. + . + Cultivation is quite different from most other games. It is a social + simulation, and the primary form of conflict is over land and plant + resources. There is no shooting, but there are plenty of angry looks. It is + also an evolution simulation. Within the world of Cultivation, you can + explore a virtually infinite spectrum of different plant and gardener + varieties. Deleted: packages/tags/cultivation/9+dfsg1-2/debian/copyright =================================================================== --- packages/trunk/cultivation/debian/copyright 2013-06-02 01:25:12 UTC (rev 14197) +++ packages/tags/cultivation/9+dfsg1-2/debian/copyright 2013-06-02 06:44:15 UTC (rev 14207) @@ -1,99 +0,0 @@ -This package was debianized by Miriam Ruiz <[email protected]> on -Fri, 08 Jun 2007 14:04:02 +0000. - -It was downloaded from http://sourceforge.net/projects/cultivation - -Upstream Author: - - Jason Rohrer <[email protected]> - -Copyright: - - Cultivation is in the public domain. - - minorGems/crypto/hashes/sha*.h: No Copyright. It is in the public domain - minorGems/io/file/win32/dirent.*: Copyright 1997 Kevlin Henney - minorGems/io/serialPort/win32/COMPort.*: Copyright 2000 UAB BBDSoft - -License: - - Cultivation is Free - - I have placed Cultivation, and the underlying source code, in the public - domain. You are free to do whatever you want with it. - - However, I spent many months working on it, and my family and I do need to - eat. If you got some enjoyment out of Cultivation, and you can afford it, - please stuff a few dollars in an envelope and send it to: - - Jason Rohrer - 93 Elm St. - Potsdam, NY 13676 - - You can also donate online, and read about my family's simple lifestyle (my - wife, child, and I live on less than $10,000 per year), here: - - http://hcsoftware.sourceforge.net/jason-rohrer/supportMyWork.php - - -The Debian packaging is Copyright 2007, Miriam Ruiz <[email protected]> and -is licensed under the GPL. - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-*'. - - -sha1: - - Originally witten by Steve Reid <[email protected]> - - Modified by Aaron D. Gifford <[email protected]> - - NO COPYRIGHT - THIS IS 100% IN THE PUBLIC DOMAIN - - The original unmodified version is available at: - ftp://ftp.funet.fi/pub/crypt/hash/sha/sha1.c - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) 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 AUTHOR(S) 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. - -dirent: - - POSIX directory browsing functions and types for Win32. - - Kevlin Henney (mailto:[email protected]), March 1997. - - Copyright Kevlin Henney, 1997. All rights reserved. - - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose is hereby granted without fee, provided - that this copyright and permissions notice appear in all copies and - derivatives, and that no charge may be made for the software and its - documentation except to cover cost of distribution. - - This software is supplied "as is" without express or implied warranty. - -COMPort: - - General component library for WIN32 - Copyright (C) 2000, UAB BBDSoft ( http://www.bbdsoft.com/ ) - - This material is provided "as is", with absolutely no warranty expressed - or implied. Any use is at your own risk. - - Permission to use or copy this software for any purpose is hereby granted - without fee, provided the above notices are retained on all copies. - Permission to modify the code and to distribute modified code is granted, - provided the above notices are retained, and a notice that the code was - modified is included with the above copyright notice. - - The author of this program may be contacted at [email protected] Copied: packages/tags/cultivation/9+dfsg1-2/debian/copyright (from rev 14199, packages/trunk/cultivation/debian/copyright) =================================================================== --- packages/tags/cultivation/9+dfsg1-2/debian/copyright (rev 0) +++ packages/tags/cultivation/9+dfsg1-2/debian/copyright 2013-06-02 06:44:15 UTC (rev 14207) @@ -0,0 +1,99 @@ +This package was debianized by Miriam Ruiz <[email protected]> on +Fri, 08 Jun 2007 14:04:02 +0000. + +It was downloaded from http://sourceforge.net/projects/cultivation + +Upstream Author: + + Jason Rohrer <[email protected]> + +Copyright: + + Cultivation is in the public domain. + + minorGems/crypto/hashes/sha*.h: No Copyright. It is in the public domain + minorGems/io/file/win32/dirent.*: Copyright 1997 Kevlin Henney + minorGems/io/serialPort/win32/COMPort.*: Copyright 2000 UAB BBDSoft + +License: + + Cultivation is Free + + I have placed Cultivation, and the underlying source code, in the public + domain. You are free to do whatever you want with it. + + However, I spent many months working on it, and my family and I do need to + eat. If you got some enjoyment out of Cultivation, and you can afford it, + please stuff a few dollars in an envelope and send it to: + + Jason Rohrer + 93 Elm St. + Potsdam, NY 13676 + + You can also donate online, and read about my family's simple lifestyle (my + wife, child, and I live on less than $10,000 per year), here: + + http://hcsoftware.sourceforge.net/jason-rohrer/supportMyWork.php + + +The Debian packaging is Copyright 2007, Miriam Ruiz <[email protected]> and +is licensed under the GPL. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-*'. + + +sha1: + + Originally witten by Steve Reid <[email protected]> + + Modified by Aaron D. Gifford <[email protected]> + + NO COPYRIGHT - THIS IS 100% IN THE PUBLIC DOMAIN + + The original unmodified version is available at: + ftp://ftp.funet.fi/pub/crypt/hash/sha/sha1.c + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) 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 AUTHOR(S) 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. + +dirent: + + POSIX directory browsing functions and types for Win32. + + Kevlin Henney (mailto:[email protected]), March 1997. + + Copyright Kevlin Henney, 1997. All rights reserved. + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose is hereby granted without fee, provided + that this copyright and permissions notice appear in all copies and + derivatives, and that no charge may be made for the software and its + documentation except to cover cost of distribution. + + This software is supplied "as is" without express or implied warranty. + +COMPort: + + General component library for WIN32 + Copyright (C) 2000, UAB BBDSoft ( http://www.bbdsoft.com/ ) + + This material is provided "as is", with absolutely no warranty expressed + or implied. Any use is at your own risk. + + Permission to use or copy this software for any purpose is hereby granted + without fee, provided the above notices are retained on all copies. + Permission to modify the code and to distribute modified code is granted, + provided the above notices are retained, and a notice that the code was + modified is included with the above copyright notice. + + The author of this program may be contacted at [email protected] Deleted: packages/tags/cultivation/9+dfsg1-2/debian/cultivation.desktop =================================================================== --- packages/trunk/cultivation/debian/cultivation.desktop 2013-06-02 01:25:12 UTC (rev 14197) +++ packages/tags/cultivation/9+dfsg1-2/debian/cultivation.desktop 2013-06-02 06:44:15 UTC (rev 14207) @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Cultivation -GenericName=Gardening game -Comment=Game about the interactions within a gardening community -Icon=cultivation -Exec=cultivation -Terminal=false -Categories=Game;ArcadeGame; Copied: packages/tags/cultivation/9+dfsg1-2/debian/cultivation.desktop (from rev 14203, packages/trunk/cultivation/debian/cultivation.desktop) =================================================================== --- packages/tags/cultivation/9+dfsg1-2/debian/cultivation.desktop (rev 0) +++ packages/tags/cultivation/9+dfsg1-2/debian/cultivation.desktop 2013-06-02 06:44:15 UTC (rev 14207) @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=Cultivation +GenericName=Gardening game +Comment=Game about the interactions within a gardening community +Icon=cultivation +Exec=cultivation +Terminal=false +Categories=Game;ArcadeGame; +Keywords=Gardening;Social dynamics;Community; Deleted: packages/tags/cultivation/9+dfsg1-2/debian/install =================================================================== --- packages/trunk/cultivation/debian/install 2013-06-02 01:25:12 UTC (rev 14197) +++ packages/tags/cultivation/9+dfsg1-2/debian/install 2013-06-02 06:44:15 UTC (rev 14207) @@ -1,10 +0,0 @@ -game2/gameSource/Cultivation usr/games -game2/gameSource/features.txt usr/share/games/cultivation -game2/gameSource/language.txt usr/share/games/cultivation -game2/gameSource/font.tga usr/share/games/cultivation -game2/gameSource/languages/*.txt usr/share/games/cultivation/languages -debian/*.desktop usr/share/applications/ -cultivation.png usr/share/icons/hicolor/128x128/apps -32x32/cultivation.png usr/share/icons/hicolor/32x32/apps -32x32/cultivation.png usr/share/pixmaps -32x32/cultivation.xpm usr/share/pixmaps Copied: packages/tags/cultivation/9+dfsg1-2/debian/install (from rev 14202, packages/trunk/cultivation/debian/install) =================================================================== --- packages/tags/cultivation/9+dfsg1-2/debian/install (rev 0) +++ packages/tags/cultivation/9+dfsg1-2/debian/install 2013-06-02 06:44:15 UTC (rev 14207) @@ -0,0 +1,9 @@ +32x32/cultivation.png usr/share/icons/hicolor/32x32/apps +32x32/cultivation.xpm usr/share/pixmaps +cultivation.png usr/share/icons/hicolor/128x128/apps +debian/*.desktop usr/share/applications/ +game2/gameSource/Cultivation usr/games +game2/gameSource/features.txt usr/share/games/cultivation +game2/gameSource/font.tga usr/share/games/cultivation +game2/gameSource/language.txt usr/share/games/cultivation +game2/gameSource/languages/*.txt usr/share/games/cultivation/languages Deleted: packages/tags/cultivation/9+dfsg1-2/debian/patches/portaudio19.patch =================================================================== --- packages/trunk/cultivation/debian/patches/portaudio19.patch 2013-06-02 01:25:12 UTC (rev 14197) +++ packages/tags/cultivation/9+dfsg1-2/debian/patches/portaudio19.patch 2013-06-02 06:44:15 UTC (rev 14207) @@ -1,65 +0,0 @@ -Author: Barry deFreese <[email protected]> -Description: Patch system to utilize portaudio v19. Debian Bug: #594015. -Index: cultivation-9+dfsg1/game2/gameSource/sound/SoundPlayer.h -=================================================================== ---- cultivation-9+dfsg1.orig/game2/gameSource/sound/SoundPlayer.h 2013-06-01 16:54:16.000000000 -0400 -+++ cultivation-9+dfsg1/game2/gameSource/sound/SoundPlayer.h 2013-06-01 17:11:19.000000000 -0400 -@@ -239,7 +239,7 @@ - char mFadingIn; - int mNumFadeFramesRemaining; - -- PortAudioStream *mAudioStream; -+ PaStream *mAudioStream; - - // realtime sounds that should be mixed into the next to-speaker call - SimpleVector<PlayableSound *> *mRealtimeSounds; -Index: cultivation-9+dfsg1/game2/gameSource/sound/SoundPlayer.cpp -=================================================================== ---- cultivation-9+dfsg1.orig/game2/gameSource/sound/SoundPlayer.cpp 2006-10-02 18:29:43.000000000 -0400 -+++ cultivation-9+dfsg1/game2/gameSource/sound/SoundPlayer.cpp 2013-06-01 17:16:30.000000000 -0400 -@@ -52,9 +52,11 @@ - - - // callback passed into portaudio --static int portaudioCallback( void *inputBuffer, void *outputBuffer, -+int portaudioCallback( const void *inputBuffer, void *outputBuffer, - unsigned long framesPerBuffer, -- PaTimestamp outTime, void *userData ) { -+ const PaStreamCallbackTimeInfo *outTime, -+ PaStreamCallbackFlags statusFlags, -+ void *userData ) { - - - SoundPlayer *player = (SoundPlayer *)userData; -@@ -157,28 +159,20 @@ - - if( error == paNoError ) { - -- error = Pa_OpenStream( -+ error = Pa_OpenDefaultStream( - &mAudioStream, -- paNoDevice,// default input device - 0, // no input -- paFloat32, // 32 bit floating point input -- NULL, -- Pa_GetDefaultOutputDeviceID(), - 2, // stereo output - paFloat32, // 32 bit floating point output -- NULL, - mSampleRate, - 1024, // frames per buffer -- 0, // number of buffers, if zero then use default minimum -- paClipOff, // we won't output out of range samples so -- // don't bother clipping them - portaudioCallback, - (void *)this ); // pass self-pointer to callback function -- -+ - if( error == paNoError ) { - - error = Pa_StartStream( mAudioStream ); -- -+ - if( error == paNoError ) { - mAudioInitialized = true; - } Copied: packages/tags/cultivation/9+dfsg1-2/debian/patches/portaudio19.patch (from rev 14205, packages/trunk/cultivation/debian/patches/portaudio19.patch) =================================================================== --- packages/tags/cultivation/9+dfsg1-2/debian/patches/portaudio19.patch (rev 0) +++ packages/tags/cultivation/9+dfsg1-2/debian/patches/portaudio19.patch 2013-06-02 06:44:15 UTC (rev 14207) @@ -0,0 +1,78 @@ +Author: Barry deFreese <[email protected]> +Description: Patch system to utilize portaudio v19 +Bug-Debian: http://bugs.debian.org/594015 +Last-Update: 2013-06-01 +--- a/game2/gameSource/sound/SoundPlayer.h ++++ b/game2/gameSource/sound/SoundPlayer.h +@@ -239,7 +239,7 @@ + char mFadingIn; + int mNumFadeFramesRemaining; + +- PortAudioStream *mAudioStream; ++ PaStream *mAudioStream; + + // realtime sounds that should be mixed into the next to-speaker call + SimpleVector<PlayableSound *> *mRealtimeSounds; +--- a/game2/gameSource/sound/SoundPlayer.cpp ++++ b/game2/gameSource/sound/SoundPlayer.cpp +@@ -52,9 +52,11 @@ + + + // callback passed into portaudio +-static int portaudioCallback( void *inputBuffer, void *outputBuffer, ++int portaudioCallback( const void *inputBuffer, void *outputBuffer, + unsigned long framesPerBuffer, +- PaTimestamp outTime, void *userData ) { ++ const PaStreamCallbackTimeInfo *outTime, ++ PaStreamCallbackFlags statusFlags, ++ void *userData ) { + + + SoundPlayer *player = (SoundPlayer *)userData; +@@ -157,21 +159,13 @@ + + if( error == paNoError ) { + +- error = Pa_OpenStream( ++ error = Pa_OpenDefaultStream( + &mAudioStream, +- paNoDevice,// default input device + 0, // no input +- paFloat32, // 32 bit floating point input +- NULL, +- Pa_GetDefaultOutputDeviceID(), + 2, // stereo output + paFloat32, // 32 bit floating point output +- NULL, + mSampleRate, + 1024, // frames per buffer +- 0, // number of buffers, if zero then use default minimum +- paClipOff, // we won't output out of range samples so +- // don't bother clipping them + portaudioCallback, + (void *)this ); // pass self-pointer to callback function + +--- a/game2/gameSource/sound/MusicPlayer.cpp ++++ b/game2/gameSource/sound/MusicPlayer.cpp +@@ -112,13 +112,14 @@ + + // get parts and positions of gardeners + int numParts = 0; +- Vector3D **positions = +- globalWorld->getAllGardenerPositions( &numParts ); +- MusicPart **musicParts = +- globalWorld->getAllGardenerMusicParts( &numParts ); +- double *volumeModifiers = +- globalWorld->getAllGardenerMusicVolumeModifiers( &numParts ); +- ++ Vector3D **positions = NULL; ++ MusicPart **musicParts = NULL; ++ double *volumeModifiers = NULL; ++ if ( globalWorld ){ ++ positions = globalWorld->getAllGardenerPositions( &numParts ); ++ musicParts = globalWorld->getAllGardenerMusicParts( &numParts ); ++ volumeModifiers = globalWorld->getAllGardenerMusicVolumeModifiers( &numParts ); ++ } + + // get center position from current player position + Vector3D *centerPosition = new Vector3D( &globalPlayerCurrentPosition ); Deleted: packages/tags/cultivation/9+dfsg1-2/debian/rules =================================================================== --- packages/trunk/cultivation/debian/rules 2013-06-02 01:25:12 UTC (rev 14197) +++ packages/tags/cultivation/9+dfsg1-2/debian/rules 2013-06-02 06:44:15 UTC (rev 14207) @@ -1,54 +0,0 @@ -#!/usr/bin/make -f - -%: - dh --parallel $@ - -override_dh_auto_configure: - chmod u+x game2/configure - cd game2 && ./configure --linux - -override_dh_auto_build: - convert -type Grayscale -negate ./game2/build/macOSX/icon128_mask.png mask.png - composite -compose CopyOpacity mask.png ./game2/build/macOSX/icon128_color.png cultivation.png - mkdir -p 32x32 - convert -scale 32x32 cultivation.png 32x32/cultivation.png - convert 32x32/cultivation.png 32x32/cultivation.xpm - sed -i -e 's/-lX11//' game2/gameSource/Makefile - sed -i -e 's/^DEBUG_FLAG = .*/DEBUG_FLAG = /' game2/gameSource/Makefile - sed -i -e 's/^OPTIMIZE_FLAG = .*/OPTIMIZE_FLAG = /' game2/gameSource/Makefile - sed -i -e 's/^COMPILE_FLAGS = /COMPILE_FLAGS = $$(CFLAGS) /' game2/gameSource/Makefile - $(MAKE) -C game2/gameSource CFLAGS="$(CFLAGS) -DDATADIR=\\\"/usr/share/games/cultivation\\\"" - -override_dh_auto_clean: - [ ! -f game2/gameSource/Makefile ] || $(MAKE) -C game2/gameSource clean - rm -f game2/gameSource/Makefile - rm -f game2/gameSource/Makefile.minorGems_dependencies - rm -rf mask.png cultivation.png 32x32 - -override_dh_installchangelogs: - dh_installchangelogs game2/documentation/changeLog.txt - -V=9 -P=Cultivation -p=cultivation -sfp=cultivation/cultivation - -get-orig-source: - wget -c http://downloads.sourceforge.net/project/$(sfp)/v$(V)/$(P)_$(V)_UnixSource.tar.gz - tar zxf $(P)_$(V)_UnixSource.tar.gz - # Embedded code copies - rm -r $(P)_$(V)_UnixSource/minorGems/sound/portaudio - # Embedded code copies, unused - rm -r $(P)_$(V)_UnixSource/minorGems/network/upnp/miniupnpc - rm $(P)_$(V)_UnixSource/minorGems/graphics/converters/lodepng.* - # Pre-built PDF, unused - rm $(P)_$(V)_UnixSource/game2/documentation/futurePlay/poster.pdf - # Pre-built Windows libraries, unused - rm $(P)_$(V)_UnixSource/game2/build/win32/*.dll - # non-free, unused - rm -r $(P)_$(V)_UnixSource/minorGems/util/development/fortify - rm $(P)_$(V)_UnixSource/minorGems/graphics/openGL/tga.* - rm $(P)_$(V)_UnixSource/minorGems/graphics/openGL/texture.* - mv $(P)_$(V)_UnixSource $(p)-$(V)+dfsg1.orig - tar zcf ../$(p)_$(V)+dfsg1.orig.tar.gz $(p)-$(V)+dfsg1.orig - rm -r $(P)_$(V)_UnixSource.tar.gz $(p)-$(V)+dfsg1.orig Copied: packages/tags/cultivation/9+dfsg1-2/debian/rules (from rev 14201, packages/trunk/cultivation/debian/rules) =================================================================== --- packages/tags/cultivation/9+dfsg1-2/debian/rules (rev 0) +++ packages/tags/cultivation/9+dfsg1-2/debian/rules 2013-06-02 06:44:15 UTC (rev 14207) @@ -0,0 +1,57 @@ +#!/usr/bin/make -f + +export DEB_BUILD_MAINT_OPTIONS=hardening=+all + +%: + dh $@ --parallel + +override_dh_auto_configure: + chmod u+x game2/configure + cd game2 && ./configure --linux + +override_dh_auto_build: + convert -type Grayscale -negate ./game2/build/macOSX/icon128_mask.png mask.png + composite -compose CopyOpacity mask.png ./game2/build/macOSX/icon128_color.png cultivation.png + mkdir -p 32x32 + convert -scale 32x32 cultivation.png 32x32/cultivation.png + convert 32x32/cultivation.png 32x32/cultivation.xpm + sed -i -e 's/-lX11//' game2/gameSource/Makefile + sed -i -e 's/^DEBUG_FLAG = .*/DEBUG_FLAG = /' game2/gameSource/Makefile + sed -i -e 's/^OPTIMIZE_FLAG = .*/OPTIMIZE_FLAG = /' game2/gameSource/Makefile + sed -i -e 's/^COMPILE_FLAGS = /COMPILE_FLAGS = $$(CFLAGS) $$(CPPFLAGS) /' game2/gameSource/Makefile + sed -i -e 's/^LINK_FLAGS = /LINK_FLAGS = $$(LDFLAGS) /' game2/gameSource/Makefile + $(MAKE) -C game2/gameSource LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS) -DDATADIR=\\\"/usr/share/games/cultivation\\\"" + +override_dh_auto_clean: + [ ! -f game2/gameSource/Makefile ] || $(MAKE) -C game2/gameSource clean + rm -f game2/gameSource/Makefile + rm -f game2/gameSource/Makefile.minorGems_dependencies + rm -rf mask.png cultivation.png 32x32 + +override_dh_installchangelogs: + dh_installchangelogs game2/documentation/changeLog.txt + +V=9 +P=Cultivation +p=cultivation +sfp=cultivation/cultivation + +get-orig-source: + wget -c http://downloads.sourceforge.net/project/$(sfp)/v$(V)/$(P)_$(V)_UnixSource.tar.gz + tar zxf $(P)_$(V)_UnixSource.tar.gz + # Embedded code copies + rm -r $(P)_$(V)_UnixSource/minorGems/sound/portaudio + # Embedded code copies, unused + rm -r $(P)_$(V)_UnixSource/minorGems/network/upnp/miniupnpc + rm $(P)_$(V)_UnixSource/minorGems/graphics/converters/lodepng.* + # Pre-built PDF, unused + rm $(P)_$(V)_UnixSource/game2/documentation/futurePlay/poster.pdf + # Pre-built Windows libraries, unused + rm $(P)_$(V)_UnixSource/game2/build/win32/*.dll + # non-free, unused + rm -r $(P)_$(V)_UnixSource/minorGems/util/development/fortify + rm $(P)_$(V)_UnixSource/minorGems/graphics/openGL/tga.* + rm $(P)_$(V)_UnixSource/minorGems/graphics/openGL/texture.* + mv $(P)_$(V)_UnixSource $(p)-$(V)+dfsg1.orig + tar zcf ../$(p)_$(V)+dfsg1.orig.tar.gz $(p)-$(V)+dfsg1.orig + rm -r $(P)_$(V)_UnixSource.tar.gz $(p)-$(V)+dfsg1.orig _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
