r14049 - in packages/trunk/bouncy/debian: . bin patches source
Markus Koschany
apo-guest at alioth.debian.org
Sat May 11 09:42:04 UTC 2013
Author: apo-guest
Date: 2013-05-11 09:42:03 +0000 (Sat, 11 May 2013)
New Revision: 14049
Added:
packages/trunk/bouncy/debian/bin/
packages/trunk/bouncy/debian/bin/bouncy
packages/trunk/bouncy/debian/source/
packages/trunk/bouncy/debian/source/format
Removed:
packages/trunk/bouncy/debian/bouncy.dirs
packages/trunk/bouncy/debian/bouncy.links
packages/trunk/bouncy/debian/game.sh
packages/trunk/bouncy/debian/patches/data_path.patch
Modified:
packages/trunk/bouncy/debian/bouncy.desktop
packages/trunk/bouncy/debian/bouncy.install
packages/trunk/bouncy/debian/bouncy.menu
packages/trunk/bouncy/debian/changelog
packages/trunk/bouncy/debian/compat
packages/trunk/bouncy/debian/control
packages/trunk/bouncy/debian/copyright
packages/trunk/bouncy/debian/patches/env.patch
packages/trunk/bouncy/debian/patches/glvertex.patch
packages/trunk/bouncy/debian/patches/use_dejavu_fonts.patch
packages/trunk/bouncy/debian/rules
packages/trunk/bouncy/debian/watch
Log:
Update bouncy 0.6.20071104-4
See changelog.
Remove dirs and links file.
Install game.sh as bouncy to /usr/games directly.
Switch to package format 3.0 (quilt).
compat 9
use dh sequencer
build with --python2
copyright format 1.0
Added: packages/trunk/bouncy/debian/bin/bouncy
===================================================================
--- packages/trunk/bouncy/debian/bin/bouncy (rev 0)
+++ packages/trunk/bouncy/debian/bin/bouncy 2013-05-11 09:42:03 UTC (rev 14049)
@@ -0,0 +1,4 @@
+#!/bin/sh --
+
+cd /usr/share/games/bouncy/
+exec python game.py "$@"
Property changes on: packages/trunk/bouncy/debian/bin/bouncy
___________________________________________________________________
Added: svn:executable
+ *
Modified: packages/trunk/bouncy/debian/bouncy.desktop
===================================================================
--- packages/trunk/bouncy/debian/bouncy.desktop 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/bouncy.desktop 2013-05-11 09:42:03 UTC (rev 14049)
@@ -3,7 +3,9 @@
Name=Bouncy the Hungry Rabbit
GenericName=bouncy
Comment=Eat the yummy veggies in the garden (game for small kids)
+Comment[de]=Esse das leckere Gemüse im Garten (Spiel für kleine Kinder)
Icon=bouncy
Exec=bouncy
Terminal=false
Categories=Game;ArcadeGame;KidsGame;
+Keywords=kids;game;veggies;children;bunny;garden;rabbit;
Deleted: packages/trunk/bouncy/debian/bouncy.dirs
===================================================================
--- packages/trunk/bouncy/debian/bouncy.dirs 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/bouncy.dirs 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1,2 +0,0 @@
-usr/games
-
Modified: packages/trunk/bouncy/debian/bouncy.install
===================================================================
--- packages/trunk/bouncy/debian/bouncy.install 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/bouncy.install 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1,8 +1,9 @@
-*.py usr/share/games/bouncy
-pyglyph/*.py usr/share/games/bouncy/pyglyph
-data/*.obj usr/share/games/bouncy/data
-data/*.mtl usr/share/games/bouncy/data
-data/*.png usr/share/games/bouncy/data
-data/*.csv usr/share/games/bouncy/data
-debian/*.xpm usr/share/pixmaps/
-debian/*.desktop usr/share/applications/
+*.py usr/share/games/bouncy
+data/*.csv usr/share/games/bouncy/data
+data/*.mtl usr/share/games/bouncy/data
+data/*.obj usr/share/games/bouncy/data
+data/*.png usr/share/games/bouncy/data
+debian/*.desktop usr/share/applications/
+debian/*.xpm usr/share/pixmaps/
+debian/bin/bouncy usr/games
+pyglyph/*.py usr/share/games/bouncy/pyglyph
Deleted: packages/trunk/bouncy/debian/bouncy.links
===================================================================
--- packages/trunk/bouncy/debian/bouncy.links 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/bouncy.links 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1 +0,0 @@
-usr/share/games/bouncy/game.sh usr/games/bouncy
Modified: packages/trunk/bouncy/debian/bouncy.menu
===================================================================
--- packages/trunk/bouncy/debian/bouncy.menu 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/bouncy.menu 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1,3 +1,5 @@
-?package(bouncy):needs="x11" section="Games/Action" \
- title="Bouncy the Hungry Rabbit" command="/usr/games/bouncy" \
- icon="/usr/share/pixmaps/bouncy.xpm"
+?package(bouncy):needs="x11" \
+ section="Games/Action" \
+ title="Bouncy the Hungry Rabbit" \
+ command="/usr/games/bouncy" \
+ icon="/usr/share/pixmaps/bouncy.xpm"
Modified: packages/trunk/bouncy/debian/changelog
===================================================================
--- packages/trunk/bouncy/debian/changelog 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/changelog 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1,9 +1,31 @@
-bouncy (0.6.20071104-4) UNRELEASED; urgency=low
+bouncy (0.6.20071104-4) unstable; urgency=low
+ * Team upload.
+
+ [ Ansgar Burchardt ]
* debian/game.sh: Use exec when calling python.
- -- Ansgar Burchardt <ansgar at 43-1.org> Mon, 19 Jul 2010 16:11:55 +0900
+ [ Markus Koschany ]
+ * Switch to package format 3.0 (quilt).
+ * Bump compat level to 9 and require debhelper >=9.
+ * debian/control:
+ - Drop quilt build-dependency because package format 3.0 uses quilt by
+ default.
+ - Bump Standards-Version to 3.9.4, no changes needed.
+ - Replace python with ${python:Depends}.
+ - Add python, python-pygame and python-opengl to Build-Depends-Indep.
+ * Simplify debian/rules by using dh sequencer and build with --python2.
+ * Drop bouncy.dirs fils which is not necessary.
+ * Add DEP3 headers to all patches.
+ * Update debian/copyright to copyright format 1.0.
+ * Install bouncy.6 via manpages files.
+ * bouncy.desktop: Add keywords and a comment in German.
+ * Rename game.sh to bouncy, move it to the debian/bin subdirectory and
+ install it to /usr/games directly. Hence we can also drop bouncy.links.
+ * Remove data_path.patch, it was not applied anyway.
+ -- Markus Koschany <apo at gambaru.de> Sat, 11 May 2013 11:20:06 +0200
+
bouncy (0.6.20071104-3) unstable; urgency=low
[ Evgeni Golov ]
Modified: packages/trunk/bouncy/debian/compat
===================================================================
--- packages/trunk/bouncy/debian/compat 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/compat 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1 +1 @@
-5
+9
Modified: packages/trunk/bouncy/debian/control
===================================================================
--- packages/trunk/bouncy/debian/control 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/control 2013-05-11 09:42:03 UTC (rev 14049)
@@ -2,16 +2,25 @@
Section: games
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>, Ansgar Burchardt <ansgar at 43-1.org>
-Build-Depends: debhelper (>= 5), quilt
-Standards-Version: 3.8.1
+Uploaders:
+ Miriam Ruiz <little_miry at yahoo.es>,
+ Barry deFreese <bdefreese at debian.org>,
+ Ansgar Burchardt <ansgar at 43-1.org>
+Build-Depends: debhelper (>= 9)
+Build-Depends-Indep: python, python-opengl, python-pygame
+Standards-Version: 3.9.4
Homepage: http://www.pyweek.org/e/bouncy/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/bouncy/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/bouncy/?op=log
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/bouncy/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/bouncy/
Package: bouncy
Architecture: all
-Depends: ttf-dejavu-core, python, python-pygame, python-opengl, ${misc:Depends}
+Depends:
+ python-opengl,
+ python-pygame,
+ ttf-dejavu-core,
+ ${misc:Depends},
+ ${python:Depends}
Description: eat the yummy veggies in the garden - game for small kids
You play Bouncy the Hungry Rabbit. You're in a garden with yummy veggies and
a farmer who's not keen on you eating them. You can hide (and move around)
Modified: packages/trunk/bouncy/debian/copyright
===================================================================
--- packages/trunk/bouncy/debian/copyright 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/copyright 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1,135 +1,133 @@
-This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
-Wed, 30 May 2007 10:34:07 +0000.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Bouncy
+Source: http://www.pyweek.org/e/bouncy
-It was downloaded from <http://www.pyweek.org/e/bouncy/>
+Files: *
+Copyright: 2006, Richard Jones <richard at mechanicalcat.net
+License: GPL-2+
-Upstream Author: Richard Jones <richard at mechanicalcat.net>
+Files: pyglyph/*
+Copyright: 2006, Alex Holkner <Alex.Holkner at mail.google.com>
+License: Expat
-Copyright:
+Files: euclid.py
+Copyright: 2006, Alex Holkner <Alex.Holkner at mail.google.com>
+License: LGPL-2.1+
- Artwork and code: Copyright (C) 2006 Richard Jones <richard at mechanicalcat.net>
- pyglyph: Copyright (C) 2006 Alex Holkner
- euclid.py: Copyright (C) 2006 Alex Holkner
- Vera TrueType Fonts: Copyright (C) 2003 Bitstream, Inc
+Files: data/*.ttf
+Copyright: 2003, Bitstream, Inc.
+License: Bitstream-Vera-Font-License
-License:
+Files: debian/*
+Copyright: 2007-2008, Miriam Ruiz <miriam at debian.org>
+ 2007, Jon Dowland
+ 2008, Ansgar Burchardt <ansgar at 43-1.org>
+ 2007-2009, Barry deFreese <bdefreese at debian.org>
+ 2009, Gonéri Le Bouder, Evgeni Golov
+ 2013, Markus Koschany <apo at gambaru.de>
+License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; either version 2.1 of the License, or (at your
+ option) any later version.
+ .
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-euclid:
+License: Expat
+ 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.
- euclid graphics maths module
-
- Copyright (C) 2006 Alex Holkner
- Alex.Holkner at mail.google.com
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by the
- Free Software Foundation; either version 2.1 of the License, or (at your
- option) any later version.
-
- This library is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-
-pyglyph:
-
- Copyright (C) 2006 Alex Holkner
-
- 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.
-
-
-Vera TrueType Fonts:
-
- Copyright (C) 2003 Bitstream, Inc.
- All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of the fonts accompanying this license ("Fonts") and associated
- documentation files (the "Font Software"), to reproduce and distribute
- the Font Software, including without limitation the rights to use, copy,
- merge, publish, distribute, and/or sell copies of the Font Software, and
- to permit persons to whom the Font Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright and trademark notices and this permission notice
- shall be included in all copies of one or more of the Font Software
- typefaces.
-
- The Font Software may be modified, altered, or added to, and in
- particular the designs of glyphs or characters in the Fonts may be
- modified and additional glyphs or characters may be added to the Fonts,
- only if the fonts are renamed to names not containing either the words
- "Bitstream" or the word "Vera".
-
- This License becomes null and void to the extent applicable to Fonts or
- Font Software that has been modified and is distributed under the
- "Bitstream Vera" names.
-
- The Font Software may be sold as part of a larger software package but
- no copy of one or more of the Font Software typefaces may be sold by
- itself.
-
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
- BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
- OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
- OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
- SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
-
- Except as contained in this notice, the names of Gnome, the Gnome
- Foundation, and Bitstream Inc., shall not be used in advertising or
- otherwise to promote the sale, use or other dealings in this Font
- Software without prior written authorization from the Gnome Foundation
- or Bitstream Inc., respectively. For further information, contact:
- <fonts at gnome.org>.
-
-
-The Debian packaging is Copyright (C) 2007, Miriam Ruiz <little_miry at yahoo.es> and
-is licensed under the GPL, see above.
+License: Bitstream-Vera-Font-License
+ Copyright (C) 2003 Bitstream, Inc.
+ All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of the fonts accompanying this license ("Fonts") and associated
+ documentation files (the "Font Software"), to reproduce and distribute
+ the Font Software, including without limitation the rights to use, copy,
+ merge, publish, distribute, and/or sell copies of the Font Software, and
+ to permit persons to whom the Font Software is furnished to do so,
+ subject to the following conditions:
+ .
+ The above copyright and trademark notices and this permission notice
+ shall be included in all copies of one or more of the Font Software
+ typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in
+ particular the designs of glyphs or characters in the Fonts may be
+ modified and additional glyphs or characters may be added to the Fonts,
+ only if the fonts are renamed to names not containing either the words
+ "Bitstream" or the word "Vera".
+ .
+ This License becomes null and void to the extent applicable to Fonts or
+ Font Software that has been modified and is distributed under the
+ "Bitstream Vera" names.
+ .
+ The Font Software may be sold as part of a larger software package but
+ no copy of one or more of the Font Software typefaces may be sold by
+ itself.
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+ BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+ OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+ SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+ .
+ Except as contained in this notice, the names of Gnome, the Gnome
+ Foundation, and Bitstream Inc., shall not be used in advertising or
+ otherwise to promote the sale, use or other dealings in this Font
+ Software without prior written authorization from the Gnome Foundation
+ or Bitstream Inc., respectively. For further information, contact:
+ <fonts at gnome.org>.
Deleted: packages/trunk/bouncy/debian/game.sh
===================================================================
--- packages/trunk/bouncy/debian/game.sh 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/game.sh 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1,4 +0,0 @@
-#!/bin/sh --
-
-cd /usr/share/games/bouncy/
-exec python game.py "$@"
Deleted: packages/trunk/bouncy/debian/patches/data_path.patch
===================================================================
--- packages/trunk/bouncy/debian/patches/data_path.patch 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/patches/data_path.patch 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1,211 +0,0 @@
-diff -ruN bouncy-0.0.20060925.orig/farmer.py bouncy-0.0.20060925/farmer.py
---- bouncy-0.0.20060925.orig/farmer.py 2006-09-25 00:59:28.000000000 +0000
-+++ bouncy-0.0.20060925/farmer.py 2007-05-30 16:31:02.000000000 +0000
-@@ -7,7 +7,7 @@
- def load(cls):
- cls.models = {}
- for name in ['farmer', 'alert', 'question']:
-- obj = objloader.OBJ(os.path.join('data', '%s.obj'%name),
-+ obj = objloader.OBJ(os.path.join('/usr/share/games/bouncy/data', '%s.obj'%name),
- outline=objects.toon_program is not None)
- cls.models[name] = obj
- load = classmethod(load)
-diff -ruN bouncy-0.0.20060925.orig/game.py bouncy-0.0.20060925/game.py
---- bouncy-0.0.20060925.orig/game.py 2006-09-25 00:59:28.000000000 +0000
-+++ bouncy-0.0.20060925/game.py 2007-05-30 16:28:12.000000000 +0000
-@@ -115,13 +115,13 @@
- else:
- start = False
- while 1:
-- if not os.path.exists('data/level%s.csv'%level):
-+ if not os.path.exists('/usr/share/games/bouncy/data/level%s.csv'%level):
- self.ok_dialog('You finished the game!')
- level = 1
- break
- elif level > 1:
- self.ok_dialog('Level complete!')
-- map = Map(self.viewport, 'data/level%s.csv'%level)
-+ map = Map(self.viewport, '/usr/share/games/bouncy/data/level%s.csv'%level)
- if not map.play(difficulty): break
- level += 1
- timeout = 0
-@@ -177,7 +177,7 @@
- if __name__ == '__main__':
- game = Game(viewport)
- game.menu()
--# map = Map(viewport, 'data/test_level.csv')
--# map = Map(viewport, 'data/level2.csv')
-+# map = Map(viewport, '/usr/share/games/bouncy/data/test_level.csv')
-+# map = Map(viewport, '/usr/share/games/bouncy/data/level2.csv')
- # map.play(1)
-
-diff -ruN bouncy-0.0.20060925.orig/leveledit.py bouncy-0.0.20060925/leveledit.py
---- bouncy-0.0.20060925.orig/leveledit.py 2006-09-25 00:59:28.000000000 +0000
-+++ bouncy-0.0.20060925/leveledit.py 2007-05-30 16:31:11.000000000 +0000
-@@ -44,7 +44,7 @@
- self.mode = 'props'
-
- # load up fonts
-- fonts = pyglyph.font.LocalFontFactory('data')
-+ fonts = pyglyph.font.LocalFontFactory('/usr/share/games/bouncy/data')
- self.sans20 = fonts.get_font(family='bitstream vera sans',
- size=20, bold=False, italic=False)
-
-diff -ruN bouncy-0.0.20060925.orig/objects.py bouncy-0.0.20060925/objects.py
---- bouncy-0.0.20060925.orig/objects.py 2006-09-25 00:59:28.000000000 +0000
-+++ bouncy-0.0.20060925/objects.py 2007-05-30 16:28:38.000000000 +0000
-@@ -34,41 +34,41 @@
- self.hitbox.render()
-
- class Fence(MapElement):
-- file = 'data/fence.obj'
-+ file = '/usr/share/games/bouncy/data/fence.obj'
- def init(self):
- r = euclid.Matrix3.new_rotate(self.rotation * math.pi / 180)
- v = r * euclid.Vector2(1, 20)
- px, py, pz = self.position
- self.hitbox = collide.AABox((px, py+3, pz), abs(v.x), 10., abs(v.y))
- class Gate(Fence):
-- file = 'data/gate.obj'
-+ file = '/usr/share/games/bouncy/data/gate.obj'
-
- class Player(MapElement):
-- file = 'data/rabbit-sitting.obj'
-+ file = '/usr/share/games/bouncy/data/rabbit-sitting.obj'
- class Farmer(MapElement):
-- file = 'data/farmer.obj'
-+ file = '/usr/share/games/bouncy/data/farmer.obj'
- class Bucket(MapElement):
-- file = 'data/bucket.obj'
-+ file = '/usr/share/games/bouncy/data/bucket.obj'
- def init(self):
- px, py, pz = self.position
- self.hitbox = collide.AABox((px, py+1, pz), 2., 10, 2)
- class Hole(MapElement):
-- file = 'data/hole.obj'
-+ file = '/usr/share/games/bouncy/data/hole.obj'
- class Tree(MapElement):
-- file = 'data/tree.obj'
-+ file = '/usr/share/games/bouncy/data/tree.obj'
- class Hedge(MapElement):
-- file = 'data/hedge.obj'
-+ file = '/usr/share/games/bouncy/data/hedge.obj'
- class LongHedge(MapElement):
-- file = 'data/long-hedge.obj'
-+ file = '/usr/share/games/bouncy/data/long-hedge.obj'
- class Scarecrow(MapElement):
-- file = 'data/scarecrow.obj'
-+ file = '/usr/share/games/bouncy/data/scarecrow.obj'
- class Pie(MapElement):
-- file = 'data/pie.obj'
-+ file = '/usr/share/games/bouncy/data/pie.obj'
- class Row(MapElement):
-- file = 'data/row.obj'
-+ file = '/usr/share/games/bouncy/data/row.obj'
-
- class Lettuce(MapElement):
-- file = 'data/lettuce.obj'
-+ file = '/usr/share/games/bouncy/data/lettuce.obj'
- name = 'lettuce'
- is_food = True
- food_value = 1
-@@ -76,24 +76,24 @@
- px, py, pz = self.position
- self.hitbox = collide.AABox((px, py+1, pz), 2, 2., 2)
- class LettuceEat1(Lettuce):
-- file = 'data/lettuce-eat1.obj'
-+ file = '/usr/share/games/bouncy/data/lettuce-eat1.obj'
- food_value = 1
- Lettuce.next = LettuceEat1
- class LettuceEat2(Lettuce):
-- file = 'data/lettuce-eat2.obj'
-+ file = '/usr/share/games/bouncy/data/lettuce-eat2.obj'
- food_value = 1
- LettuceEat1.next = LettuceEat2
- class LettuceEat3(Lettuce):
-- file = 'data/lettuce-eat3.obj'
-+ file = '/usr/share/games/bouncy/data/lettuce-eat3.obj'
- food_value = 1
- LettuceEat2.next = LettuceEat3
- class LettuceEat4(LettuceEat3):
-- file = 'data/lettuce-eat4.obj'
-+ file = '/usr/share/games/bouncy/data/lettuce-eat4.obj'
- is_food = False
- LettuceEat3.next = LettuceEat4
-
- class Tomato(MapElement):
-- file = 'data/tomato.obj'
-+ file = '/usr/share/games/bouncy/data/tomato.obj'
- name = 'tomato'
- is_food = True
- food_value = 1
-@@ -101,25 +101,25 @@
- px, py, pz = self.position
- self.hitbox = collide.AABox((px, py+2.5, pz), 2, 5., 2)
- class TomatoEat1(Tomato):
-- file = 'data/tomato-eat1.obj'
-+ file = '/usr/share/games/bouncy/data/tomato-eat1.obj'
- food_value = 1
- Tomato.next = TomatoEat1
- class TomatoEat2(Tomato):
-- file = 'data/tomato-eat2.obj'
-+ file = '/usr/share/games/bouncy/data/tomato-eat2.obj'
- food_value = 1
- TomatoEat1.next = TomatoEat2
- class TomatoEat3(Tomato):
-- file = 'data/tomato-eat3.obj'
-+ file = '/usr/share/games/bouncy/data/tomato-eat3.obj'
- food_value = 1
- TomatoEat2.next = TomatoEat3
- class TomatoEat4(TomatoEat3):
-- file = 'data/tomato-eat4.obj'
-+ file = '/usr/share/games/bouncy/data/tomato-eat4.obj'
- is_food = False
- next = None
- TomatoEat3.next = TomatoEat4
-
- class Carrot(MapElement):
-- file = 'data/carrot.obj'
-+ file = '/usr/share/games/bouncy/data/carrot.obj'
- name = 'carrot'
- is_food = True
- food_value = 2
-@@ -127,7 +127,7 @@
- px, py, pz = self.position
- self.hitbox = collide.AABox((px, py, pz), 1, 1, 1)
- class CarrotEat1(Carrot):
-- file = 'data/carrot-eat1.obj'
-+ file = '/usr/share/games/bouncy/data/carrot-eat1.obj'
- food_value = 2
- next = None
- Carrot.next = CarrotEat1
-diff -ruN bouncy-0.0.20060925.orig/rabbit.py bouncy-0.0.20060925/rabbit.py
---- bouncy-0.0.20060925.orig/rabbit.py 2006-09-25 00:59:28.000000000 +0000
-+++ bouncy-0.0.20060925/rabbit.py 2007-05-30 16:31:23.000000000 +0000
-@@ -8,7 +8,7 @@
- cls.models = {}
- for name in ['rabbit-sitting', 'rabbit-hopping', 'rabbit-landing',
- 'bump', 'rabbit-dig1', 'rabbit-dig2']:
-- obj = objloader.OBJ(os.path.join('data', '%s.obj'%name),
-+ obj = objloader.OBJ(os.path.join('/usr/share/games/bouncy/data', '%s.obj'%name),
- outline=objects.toon_program is not None)
- cls.models[name] = obj
- load = classmethod(load)
-diff -ruN bouncy-0.0.20060925.orig/textures.py bouncy-0.0.20060925/textures.py
---- bouncy-0.0.20060925.orig/textures.py 2006-09-25 00:59:28.000000000 +0000
-+++ bouncy-0.0.20060925/textures.py 2007-05-30 16:29:25.000000000 +0000
-@@ -12,11 +12,11 @@
- def load():
- for name, args in textures.items():
- if args:
-- image1 = pygame.image.load(os.path.join('data', name + '.png'))
-- image2 = pygame.image.load(os.path.join('data', name + '-grey.png'))
-+ image1 = pygame.image.load(os.path.join('/usr/share/games/bouncy/data', name + '.png'))
-+ image2 = pygame.image.load(os.path.join('/usr/share/games/bouncy/data', name + '-grey.png'))
- textures[name] = MixedTextureSurf(image1, image2, args)
- else:
-- image = pygame.image.load(os.path.join('data', name + '.png'))
-+ image = pygame.image.load(os.path.join('/usr/share/games/bouncy/data', name + '.png'))
- textures[name] = TextureSurf(image)
-
- class TextureSurf:
Modified: packages/trunk/bouncy/debian/patches/env.patch
===================================================================
--- packages/trunk/bouncy/debian/patches/env.patch 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/patches/env.patch 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1,5 +1,15 @@
---- bouncy-0.0.20060925/pyglyph/ttf.py.orig 2006-09-25 00:59:28.000000000 +0000
-+++ bouncy-0.0.20060925/pyglyph/ttf.py 2007-05-30 18:17:29.000000000 +0000
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sat, 11 May 2013 01:04:32 +0200
+Subject: env
+
+---
+ pyglyph/ttf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyglyph/ttf.py b/pyglyph/ttf.py
+index 820e3ef..9f0ff49 100644
+--- a/pyglyph/ttf.py
++++ b/pyglyph/ttf.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
Modified: packages/trunk/bouncy/debian/patches/glvertex.patch
===================================================================
--- packages/trunk/bouncy/debian/patches/glvertex.patch 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/patches/glvertex.patch 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1,8 +1,21 @@
-Index: bouncy-0.6.20071104/farmer.py
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sat, 11 May 2013 01:04:32 +0200
+Subject: glvertex
+
===================================================================
---- bouncy-0.6.20071104.orig/farmer.py 2009-03-20 15:23:58.000000000 -0400
-+++ bouncy-0.6.20071104/farmer.py 2009-03-20 15:24:22.000000000 -0400
-@@ -189,7 +189,7 @@
+---
+ farmer.py | 2 +-
+ leveledit.py | 8 ++++----
+ map.py | 32 ++++++++++++++++----------------
+ pyglyph/font.py | 8 ++++----
+ ui.py | 8 ++++----
+ 5 files changed, 29 insertions(+), 29 deletions(-)
+
+diff --git a/farmer.py b/farmer.py
+index 7c1a3a3..56af30a 100644
+--- a/farmer.py
++++ b/farmer.py
+@@ -189,7 +189,7 @@ class Farmer:
glColor(1, 0, 0)
glBegin(GL_LINE_STRIP)
for node in self.path.nodes:
@@ -11,11 +24,11 @@
glEnd()
glEnable(GL_DEPTH_TEST)
-Index: bouncy-0.6.20071104/leveledit.py
-===================================================================
---- bouncy-0.6.20071104.orig/leveledit.py 2009-03-20 15:24:52.000000000 -0400
-+++ bouncy-0.6.20071104/leveledit.py 2009-03-20 15:25:21.000000000 -0400
-@@ -292,11 +292,11 @@
+diff --git a/leveledit.py b/leveledit.py
+index 49b4b21..3b6364c 100644
+--- a/leveledit.py
++++ b/leveledit.py
+@@ -292,11 +292,11 @@ class LevelEditor:
glColor(1., 1., 1., .3)
glBegin(GL_LINES)
for x in range(left, left + self.width + 4*scale, 4*scale):
@@ -31,11 +44,11 @@
glEnd()
glPopMatrix()
glDisable(GL_BLEND)
-Index: bouncy-0.6.20071104/map.py
-===================================================================
---- bouncy-0.6.20071104.orig/map.py 2009-03-20 15:25:28.000000000 -0400
-+++ bouncy-0.6.20071104/map.py 2009-03-20 15:26:10.000000000 -0400
-@@ -99,10 +99,10 @@
+diff --git a/map.py b/map.py
+index e4d204f..1cbfb5c 100644
+--- a/map.py
++++ b/map.py
+@@ -99,10 +99,10 @@ class Map(ui.UserInterface):
glPushMatrix()
glTranslate(x+s, 0, z+s)
glBegin(GL_QUADS)
@@ -50,7 +63,7 @@
glEnd()
glPopMatrix()
-@@ -112,10 +112,10 @@
+@@ -112,10 +112,10 @@ class Map(ui.UserInterface):
self.rabbit.position.z)
glTranslate(x+s, 0, z+s)
glBegin(GL_QUADS)
@@ -65,7 +78,7 @@
glEnd()
glPopMatrix()
-@@ -126,10 +126,10 @@
+@@ -126,10 +126,10 @@ class Map(ui.UserInterface):
self.farmer.position.z)
glTranslate(x+s, 0, z+s)
glBegin(GL_QUADS)
@@ -80,7 +93,7 @@
glEnd()
glPopMatrix()
glEnable(GL_LIGHTING)
-@@ -338,10 +338,10 @@
+@@ -338,10 +338,10 @@ class Map(ui.UserInterface):
glColor4f(.5, .5, .5, .5)
glBegin(GL_QUADS)
@@ -95,11 +108,11 @@
glEnd()
glPushMatrix()
-Index: bouncy-0.6.20071104/pyglyph/font.py
-===================================================================
---- bouncy-0.6.20071104.orig/pyglyph/font.py 2009-03-20 15:26:47.000000000 -0400
-+++ bouncy-0.6.20071104/pyglyph/font.py 2009-03-20 15:27:34.000000000 -0400
-@@ -369,13 +369,13 @@
+diff --git a/pyglyph/font.py b/pyglyph/font.py
+index 586d071..da41f2e 100644
+--- a/pyglyph/font.py
++++ b/pyglyph/font.py
+@@ -369,13 +369,13 @@ class FontInstance:
glBegin(GL_QUADS)
for renderbox, texbox in boxes:
glTexCoord2f(texbox[0], texbox[1])
@@ -117,11 +130,11 @@
glEnd()
def _pow2(n):
-Index: bouncy-0.6.20071104/ui.py
-===================================================================
---- bouncy-0.6.20071104.orig/ui.py 2009-03-20 15:27:49.000000000 -0400
-+++ bouncy-0.6.20071104/ui.py 2009-03-20 15:28:09.000000000 -0400
-@@ -71,9 +71,9 @@
+diff --git a/ui.py b/ui.py
+index 2460cd0..768406a 100644
+--- a/ui.py
++++ b/ui.py
+@@ -71,9 +71,9 @@ class UserInterface:
glColor(0, 0, 0, min(1, float(ts)/ts_max))
else:
glColor(0, 0, 0, max(0, 1 - float(ts)/ts_max))
Modified: packages/trunk/bouncy/debian/patches/use_dejavu_fonts.patch
===================================================================
--- packages/trunk/bouncy/debian/patches/use_dejavu_fonts.patch 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/patches/use_dejavu_fonts.patch 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1,7 +1,19 @@
-Index: bouncy-0.6.20071104/fonts.py
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sat, 11 May 2013 01:04:32 +0200
+Subject: use_dejavu_fonts
+
===================================================================
---- bouncy-0.6.20071104.orig/fonts.py
-+++ bouncy-0.6.20071104/fonts.py
+---
+ fonts.py | 8 ++++----
+ game.py | 4 ++--
+ leveledit.py | 9 +++------
+ pyglyph/html.py | 2 +-
+ 4 files changed, 10 insertions(+), 13 deletions(-)
+
+diff --git a/fonts.py b/fonts.py
+index beeb28a..a1bb32e 100644
+--- a/fonts.py
++++ b/fonts.py
@@ -1,13 +1,13 @@
import pyglyph
@@ -20,11 +32,11 @@
+mono20 = fonts.get_font(family='DejaVu sans mono',
size=20, bold=False, italic=False)
-Index: bouncy-0.6.20071104/game.py
-===================================================================
---- bouncy-0.6.20071104.orig/game.py
-+++ bouncy-0.6.20071104/game.py
-@@ -44,7 +44,7 @@
+diff --git a/game.py b/game.py
+index 04dc6e0..ab6dcac 100644
+--- a/game.py
++++ b/game.py
+@@ -44,7 +44,7 @@ class Game(ui.UserInterface):
def menu(self):
instructions = pyglyph.layout_html('''
@@ -33,7 +45,7 @@
(I)nstructions <br>
(E)asy <br>
(N)ormal <br>
-@@ -132,7 +132,7 @@
+@@ -132,7 +132,7 @@ class Game(ui.UserInterface):
def instructions(self):
instructions = pyglyph.layout_html('''
@@ -42,17 +54,17 @@
<b>Bouncy the Rabbit by Richard Jones</b>
<br>
Written for the 3rd PyWeek Challenge: http://www.pyweek.org/
-Index: bouncy-0.6.20071104/leveledit.py
-===================================================================
---- bouncy-0.6.20071104.orig/leveledit.py
-+++ bouncy-0.6.20071104/leveledit.py
+diff --git a/leveledit.py b/leveledit.py
+index 7dcca1a..49b4b21 100644
+--- a/leveledit.py
++++ b/leveledit.py
@@ -1,4 +1,5 @@
import sys, pygame, csv, shutil, os
+import fonts
from pygame.locals import *
from pygame.constants import *
-@@ -44,12 +45,8 @@
+@@ -44,12 +45,8 @@ class LevelEditor:
self.mode = 'props'
# load up fonts
@@ -67,11 +79,11 @@
# button labels and callback funcs
self.buttons = [
-Index: bouncy-0.6.20071104/pyglyph/html.py
-===================================================================
---- bouncy-0.6.20071104.orig/pyglyph/html.py
-+++ bouncy-0.6.20071104/pyglyph/html.py
-@@ -131,7 +131,7 @@
+diff --git a/pyglyph/html.py b/pyglyph/html.py
+index 18714b1..a792e3b 100644
+--- a/pyglyph/html.py
++++ b/pyglyph/html.py
+@@ -131,7 +131,7 @@ class StylePrototype:
self._attrs[Attribute.Bold] = False
self._attrs[Attribute.Italic] = False
self._attrs[Attribute.FontSize] = 12
Modified: packages/trunk/bouncy/debian/rules
===================================================================
--- packages/trunk/bouncy/debian/rules 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/rules 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1,59 +1,4 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/quilt/quilt.make
-
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
- dh_testdir
- touch $@
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- chmod +x $(CURDIR)/euclid.py
- chmod +x $(CURDIR)/pyglyph/__init__.py
- chmod +x $(CURDIR)/pyglyph/font.py
- chmod +x $(CURDIR)/pyglyph/html.py
- chmod +x $(CURDIR)/pyglyph/layout.py
- chmod +x $(CURDIR)/pyglyph/ttf.py
- install -m 755 debian/game.sh $(CURDIR)/debian/bouncy/usr/games/bouncy
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installmenu
- dh_installman debian/bouncy.6
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch:
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+ dh $@ --with python2
Added: packages/trunk/bouncy/debian/source/format
===================================================================
--- packages/trunk/bouncy/debian/source/format (rev 0)
+++ packages/trunk/bouncy/debian/source/format 2013-05-11 09:42:03 UTC (rev 14049)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: packages/trunk/bouncy/debian/watch
===================================================================
--- packages/trunk/bouncy/debian/watch 2013-05-10 13:02:29 UTC (rev 14048)
+++ packages/trunk/bouncy/debian/watch 2013-05-11 09:42:03 UTC (rev 14049)
@@ -1,8 +1,4 @@
-# Watch control file for uscan
-# See uscan(1) for format
-
version=3
-
opts=uversionmangle=s/^/0./,dversionmangle=s/\.200.*// \
http://www.pyweek.org/e/bouncy/ \
http://media\.pyweek\.org/dl/3/bouncy/bouncy-post-r(.*)\.tgz
More information about the Pkg-games-commits
mailing list