Author: ansgar-guest
Date: 2008-02-19 18:25:13 +0000 (Tue, 19 Feb 2008)
New Revision: 5862
Added:
packages/trunk/bouncy/debian/bouncy.dirs
packages/trunk/bouncy/debian/patches/use_dejavu_fonts.patch
Removed:
packages/trunk/bouncy/debian/patches/fonts_path.patch
Modified:
packages/trunk/bouncy/debian/bouncy.install
packages/trunk/bouncy/debian/changelog
packages/trunk/bouncy/debian/control
packages/trunk/bouncy/debian/patches/series
packages/trunk/bouncy/debian/rules
Log:
by "build-stamp configure-stamp" in debian/rules.
* debian/rules:
+ Add call to dh_desktop.
+ Do not call dh_link, dh_strip. We have no binaries.
+ Include /usr/share/quilt/quilt.make instead of calling it
* debian/control:
+ Change XS-Vcs-* to Vcs-*
+ Bump Debian Standards version to 3.7.3
+ Add myself to Uploaders
+ Remove homepage URL from description
* Use DejaVu fonts instead of Bitstream Vera (Closes: #461275).
+ drop fonts_path.patch, new patch use_dejavu_fonts.patch includes this
* Install start script to /usr/games (makes menu entries work)
Added: packages/trunk/bouncy/debian/bouncy.dirs
===================================================================
--- packages/trunk/bouncy/debian/bouncy.dirs (rev 0)
+++ packages/trunk/bouncy/debian/bouncy.dirs 2008-02-19 18:25:13 UTC (rev
5862)
@@ -0,0 +1,2 @@
+usr/games
+
Modified: packages/trunk/bouncy/debian/bouncy.install
===================================================================
--- packages/trunk/bouncy/debian/bouncy.install 2008-02-19 16:24:01 UTC (rev
5861)
+++ packages/trunk/bouncy/debian/bouncy.install 2008-02-19 18:25:13 UTC (rev
5862)
@@ -1,5 +1,4 @@
*.py usr/share/games/bouncy
-debian/game.sh 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
Modified: packages/trunk/bouncy/debian/changelog
===================================================================
--- packages/trunk/bouncy/debian/changelog 2008-02-19 16:24:01 UTC (rev
5861)
+++ packages/trunk/bouncy/debian/changelog 2008-02-19 18:25:13 UTC (rev
5862)
@@ -2,10 +2,24 @@
[ Miriam Ruiz ]
* Fixed bashism: Replaced "{build,configure}-stamp"
- by "build-stamp configure-stamp" in debian/rules.
+ by "build-stamp configure-stamp" in debian/rules.
- -- Miriam Ruiz <[EMAIL PROTECTED]> Fri, 04 Jan 2008 17:20:50 +0000
+ [ Ansgar Burchardt ]
+ * debian/rules:
+ + Add call to dh_desktop.
+ + Do not call dh_link, dh_strip. We have no binaries.
+ + Include /usr/share/quilt/quilt.make instead of calling it
+ * debian/control:
+ + Change XS-Vcs-* to Vcs-*
+ + Bump Debian Standards version to 3.7.3
+ + Add myself to Uploaders
+ + Remove homepage URL from description
+ * Use DejaVu fonts instead of Bitstream Vera (Closes: #461275).
+ + drop fonts_path.patch, new patch use_dejavu_fonts.patch includes this
+ * Install start script to /usr/games (makes menu entries work)
+ -- Ansgar Burchardt <[EMAIL PROTECTED]> Tue, 19 Feb 2008 19:21:41 +0100
+
bouncy (0.6.20071104-1) unstable; urgency=low
[ Miriam Ruiz ]
Modified: packages/trunk/bouncy/debian/control
===================================================================
--- packages/trunk/bouncy/debian/control 2008-02-19 16:24:01 UTC (rev
5861)
+++ packages/trunk/bouncy/debian/control 2008-02-19 18:25:13 UTC (rev
5862)
@@ -2,16 +2,16 @@
Section: games
Priority: extra
Maintainer: Debian Games Team <[EMAIL PROTECTED]>
-Uploaders: Miriam Ruiz <[EMAIL PROTECTED]>, Barry deFreese <[EMAIL PROTECTED]>
+Uploaders: Miriam Ruiz <[EMAIL PROTECTED]>, Barry deFreese <[EMAIL
PROTECTED]>, Ansgar Burchardt <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5), quilt
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Homepage: http://www.pyweek.org/e/bouncy/
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/bouncy/
-XS-Vcs-Browser:
http://svn.debian.org/wsvn/pkg-games/packages/trunk/bouncy/?op=log
+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
Package: bouncy
Architecture: all
-Depends: ttf-bitstream-vera, python, python-pygame, python-opengl,
${misc:Depends}
+Depends: ttf-dejavu-core, python, python-pygame, python-opengl, ${misc: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)
@@ -20,5 +20,3 @@
Bouncy was written so it could be enjoyed by the author's daughter, who was
about to turn 3, and by older gamers. Hence it's not a violent game and "easy"
is really, really easy, and "hard" is challenging.
- .
- http://www.pyweek.org/e/bouncy/
Deleted: packages/trunk/bouncy/debian/patches/fonts_path.patch
===================================================================
--- packages/trunk/bouncy/debian/patches/fonts_path.patch 2008-02-19
16:24:01 UTC (rev 5861)
+++ packages/trunk/bouncy/debian/patches/fonts_path.patch 2008-02-19
18:25:13 UTC (rev 5862)
@@ -1,12 +0,0 @@
-diff -ruN bouncy-0.0.20060925.orig/fonts.py bouncy-0.0.20060925/fonts.py
---- bouncy-0.0.20060925.orig/fonts.py 2006-09-25 00:59:28.000000000 +0000
-+++ bouncy-0.0.20060925/fonts.py 2007-05-30 16:33:52.000000000 +0000
-@@ -1,7 +1,7 @@
- import pyglyph
-
- # load up fonts
--fonts = pyglyph.font.LocalFontFactory('data')
-+fonts =
pyglyph.font.LocalFontFactory('/usr/share/fonts/truetype/ttf-bitstream-vera')
- sans20 = fonts.get_font(family='bitstream vera sans',
- size=20, bold=False, italic=False)
-
Modified: packages/trunk/bouncy/debian/patches/series
===================================================================
--- packages/trunk/bouncy/debian/patches/series 2008-02-19 16:24:01 UTC (rev
5861)
+++ packages/trunk/bouncy/debian/patches/series 2008-02-19 18:25:13 UTC (rev
5862)
@@ -1,2 +1,2 @@
env.patch
-fonts_path.patch
+use_dejavu_fonts.patch
Added: packages/trunk/bouncy/debian/patches/use_dejavu_fonts.patch
===================================================================
--- packages/trunk/bouncy/debian/patches/use_dejavu_fonts.patch
(rev 0)
+++ packages/trunk/bouncy/debian/patches/use_dejavu_fonts.patch 2008-02-19
18:25:13 UTC (rev 5862)
@@ -0,0 +1,82 @@
+Index: bouncy-0.6.20071104/fonts.py
+===================================================================
+--- bouncy-0.6.20071104.orig/fonts.py
++++ bouncy-0.6.20071104/fonts.py
+@@ -1,13 +1,13 @@
+ import pyglyph
+
+ # load up fonts
+-fonts = pyglyph.font.LocalFontFactory('data')
+-sans20 = fonts.get_font(family='bitstream vera sans',
++fonts = pyglyph.font.LocalFontFactory('/usr/share/fonts/truetype/ttf-dejavu')
++sans20 = fonts.get_font(family='DejaVu sans',
+ size=20, bold=False, italic=False)
+
+-sans40 = fonts.get_font(family='bitstream vera sans',
++sans40 = fonts.get_font(family='DejaVu sans',
+ size=40, bold=False, italic=False)
+
+-mono20 = fonts.get_font(family='bitstream vera sans mono',
++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 @@
+ def menu(self):
+
+ instructions = pyglyph.layout_html('''
+- <font face="bitstream vera sans" size="40">
++ <font face="DejaVu sans" size="40">
+ (I)nstructions <br>
+ (E)asy <br>
+ (N)ormal <br>
+@@ -132,7 +132,7 @@
+
+ def instructions(self):
+ instructions = pyglyph.layout_html('''
+- <font face="bitstream vera sans" size="20">
++ <font face="DejaVu sans" size="20">
+ <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
+@@ -1,4 +1,5 @@
+ import sys, pygame, csv, shutil, os
++import fonts
+ from pygame.locals import *
+ from pygame.constants import *
+
+@@ -44,12 +45,8 @@
+ self.mode = 'props'
+
+ # load up fonts
+- fonts = pyglyph.font.LocalFontFactory('data')
+- self.sans20 = fonts.get_font(family='bitstream vera sans',
+- size=20, bold=False, italic=False)
+-
+- self.sans40 = fonts.get_font(family='bitstream vera sans',
+- size=40, bold=False, italic=False)
++ self.sans20 = fonts.sans20
++ self.sans40 = fonts.sans40
+
+ # 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 @@
+ self._attrs[Attribute.Bold] = False
+ self._attrs[Attribute.Italic] = False
+ self._attrs[Attribute.FontSize] = 12
+- self._attrs[Attribute.FontName] = 'bitstream vera serif'
++ self._attrs[Attribute.FontName] = 'DejaVu serif'
+ self._attrs[Attribute.Color] = (0, 0, 0, 1)
+
+ def set_attribute(self, attribute, value):
Modified: packages/trunk/bouncy/debian/rules
===================================================================
--- packages/trunk/bouncy/debian/rules 2008-02-19 16:24:01 UTC (rev 5861)
+++ packages/trunk/bouncy/debian/rules 2008-02-19 18:25:13 UTC (rev 5862)
@@ -3,18 +3,11 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-CFLAGS = -Wall -g
+include /usr/share/quilt/quilt.make
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
configure: configure-stamp
-configure-stamp:
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
- $(MAKE) -f /usr/share/quilt/quilt.make patch
touch $@
build: build-stamp
@@ -22,25 +15,24 @@
dh_testdir
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- $(MAKE) -f /usr/share/quilt/quilt.make unpatch
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
- chmod +x debian/game.sh
+ 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
- dh_installdirs
+ install -m 755 debian/game.sh $(CURDIR)/debian/bouncy/usr/games/bouncy
# Build architecture-independent files here.
binary-indep: build install
@@ -52,8 +44,7 @@
dh_install
dh_installmenu
dh_installman debian/bouncy.6
- dh_link
- dh_strip
+ dh_desktop
dh_compress
dh_fixperms
dh_installdeb
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
