[Python-apps-commits] r7346 - in packages/lightyears/trunk/debian (28 files)
sgevatter at users.alioth.debian.org
sgevatter at users.alioth.debian.org
Thu Jul 21 23:57:53 UTC 2011
Date: Thursday, July 21, 2011 @ 23:57:51
Author: sgevatter
Revision: 7346
* New upstream version. Some of the changes are:
- Added a Peaceful mode.
- Added an in-game option to mute audio.
* Update packaging to 3.0 (quilt) and dh7 and bump Standards-Version.
* Drop python-pysco from Suggests, since upstream no longer recommends it.
* Drop most patches since they have been incorporated upstream, update the
remaining ones (doc_image_path.patch, remove_startup_checks.patch) and
add snd_disabled_typo.patch and hardcode-code-dir.patch.
* Update debian/copyright, debian/watch and debian/docs.
* debian/lightyears.6:
- Document the new --safe option.
* debian/lightyears.desktop:
- Add "StrategyGame" category.
Added:
packages/lightyears/trunk/debian/docs
packages/lightyears/trunk/debian/manpages
packages/lightyears/trunk/debian/patches/hardcode-code-dir.patch
packages/lightyears/trunk/debian/patches/series
packages/lightyears/trunk/debian/patches/snd_disabled_typo.patch
Modified:
packages/lightyears/trunk/debian/changelog
packages/lightyears/trunk/debian/compat
packages/lightyears/trunk/debian/control
packages/lightyears/trunk/debian/copyright
packages/lightyears/trunk/debian/lightyears.6
packages/lightyears/trunk/debian/lightyears.desktop
packages/lightyears/trunk/debian/patches/doc_image_path.patch
packages/lightyears/trunk/debian/patches/remove_startup_checks.patch
packages/lightyears/trunk/debian/rules
packages/lightyears/trunk/debian/source/format
packages/lightyears/trunk/debian/watch
Deleted:
packages/lightyears/trunk/debian/README.source
packages/lightyears/trunk/debian/patches/add_fullscreen_flag.patch
packages/lightyears/trunk/debian/patches/fix_crash_in_sound_py.patch
packages/lightyears/trunk/debian/patches/fix_icon_path.patch
packages/lightyears/trunk/debian/patches/fix_manual_url.patch
packages/lightyears/trunk/debian/patches/font_usage.patch
packages/lightyears/trunk/debian/patches/only_show_valid_resolutions.patch
packages/lightyears/trunk/debian/patches/remove_shabang_intercept_py.patch
packages/lightyears/trunk/debian/patches/start_windowed.patch
packages/lightyears/trunk/debian/patches/work_with_no_sound.patch
packages/lightyears/trunk/debian/pycompat
packages/lightyears/trunk/debian/pyversions
Deleted: packages/lightyears/trunk/debian/README.source
===================================================================
--- packages/lightyears/trunk/debian/README.source 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/README.source 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,5 +0,0 @@
-This package uses CDBS' simple-patchsys for its patch management.
-Read cdbs-edit-patch(1) if you wish to add or edit any patches.
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run `./debian/rules patch`
Modified: packages/lightyears/trunk/debian/changelog
===================================================================
--- packages/lightyears/trunk/debian/changelog 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/changelog 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,3 +1,21 @@
+lightyears (1.4-1) unstable; urgency=low
+
+ * New upstream version. Some of the changes are:
+ - Added a Peaceful mode.
+ - Added an in-game option to mute audio.
+ * Update packaging to 3.0 (quilt) and dh7 and bump Standards-Version.
+ * Drop python-pysco from Suggests, since upstream no longer recommends it.
+ * Drop most patches since they have been incorporated upstream, update the
+ remaining ones (doc_image_path.patch, remove_startup_checks.patch) and
+ add snd_disabled_typo.patch and hardcode-code-dir.patch.
+ * Update debian/copyright, debian/watch and debian/docs.
+ * debian/lightyears.6:
+ - Document the new --safe option.
+ * debian/lightyears.desktop:
+ - Add "StrategyGame" category.
+
+ -- Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com> Fri, 22 Jul 2011 01:28:23 +0200
+
lightyears (1.3a-6) unstable; urgency=low
[ Piotr Ożarowski ]
Modified: packages/lightyears/trunk/debian/compat
===================================================================
--- packages/lightyears/trunk/debian/compat 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/compat 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1 +1 @@
-5
+8
Modified: packages/lightyears/trunk/debian/control
===================================================================
--- packages/lightyears/trunk/debian/control 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/control 2011-07-21 23:57:51 UTC (rev 7346)
@@ -6,20 +6,22 @@
Homepage: http://www.jwhitham.org.uk/20kly/
Vcs-Svn: svn://svn.debian.org/python-apps/packages/lightyears/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/lightyears/trunk/
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1)
-Build-Depends-Indep: python-support (>= 0.5.3)
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 8~),
+ python (>= 2.6.6-3~)
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.4
Package: lightyears
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-pygame (>= 1.7), ttf-dejavu-core
-Suggests: python-psyco
-XB-Python-Version: ${python:Versions}
+Depends: ${misc:Depends},
+ ${python:Depends},
+ python-pygame (>= 1.7),
+ ttf-dejavu-core
Description: single player real-time strategy game with steampunk sci-fi
You have to build and maintain a steam distribution network on an alien
planet, while under attack from aliens and other hazards. The game has
three difficulty levels, an interactive tutorial, and a scoring system.
.
- "20.000 Light Years Into Space" is written in Python using pygame and
- it was rewarded with the second place in the Pyweek March 2006 Individual
+ "20.000 Light Years Into Space" is written in Python using pygame.
+ It was rewarded with the second place in the Pyweek March 2006 Individual
Entries category.
Modified: packages/lightyears/trunk/debian/copyright
===================================================================
--- packages/lightyears/trunk/debian/copyright 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/copyright 2011-07-21 23:57:51 UTC (rev 7346)
@@ -6,6 +6,7 @@
Upstream Author:
Jack Whitham <jack at jwhitham.org.uk>
+ 2011 Cris Grada
Indirect authors:
@@ -17,7 +18,7 @@
Licenses:
20,000 Light-Years Into Space, a computer game
- Copyright (C) 2006-07 Jack Whitham
+ Copyright © 2006-2011 Jack Whitham
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2,
@@ -31,10 +32,43 @@
On Debian systems, the complete text of the GNU General Public
License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+ The code includes minor patches that are:
+ Copyright © 2007-2009 Siegfried-A. Gevatter
+ Copyright © Matthew Marshall
+ Copyright © Josh Holland
+
----------------------------------------------------------------
+ Copyright © 2011 Cris Grada
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2,
+ as published by the Free Software Foundation.
+
+ This program 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.
+
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+ Files:
+ - ./data/bricks.png
+ - ./data/bricks2.png
+ - ./data/city1.png
+ - ./data/destroy.png
+ - ./data/maker.png
+ - ./data/maker_u.png
+ - ./data/node.png
+ - ./data/node_u.png
+ - ./data/upgrade.png
+ - ./data/well.png
+
+ ----------------------------------------------------------------
+
License:
- Copyright (C) 2003 Bitstream, Inc.
+ Copyright © 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
@@ -85,7 +119,7 @@
----------------------------------------------------------------
- Copyright (C) NASA
+ Copyright © NASA
In the US, works created by the government are not copyrightable,
so this is expected to be in the public domain.
(Source: http://www.apolloexplorer.co.uk/hires/lunar_surface/)
@@ -95,7 +129,7 @@
----------------------------------------------------------------
- Copyright (C) Accustudio
+ Copyright © Accustudio
The Terms & Conditions of Accustudio state that everything
downloadable from this site should be free of copyright and
trademarks unless specifically noted otherwise.
@@ -103,8 +137,6 @@
Files:
- ./data/006metal.jpg
- - ./data/bricks.png
- - ./data/bricks2.png
- ./data/greenrust.jpg
- ./data/rivets.jpg
@@ -112,7 +144,7 @@
License:
XSane, a graphical scanning frontend
- Copyright (C) 1998-2007 Oliver Rauch
+ Copyright © 1998-2007 Oliver Rauch
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License (GPL)
@@ -137,5 +169,5 @@
Source:
http://simplythebest.net/sounds/WAV/sound_effects_WAV/nature_wavs.html
-The Debian packaging is (C) 2007-2008, Siegfried-A. Gevatter <rainct at ubuntu.com>
+The Debian packaging is © 2007-2011, Siegfried-A. Gevatter <rainct at ubuntu.com>
and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: packages/lightyears/trunk/debian/docs
===================================================================
--- packages/lightyears/trunk/debian/docs (rev 0)
+++ packages/lightyears/trunk/debian/docs 2011-07-21 23:57:51 UTC (rev 7346)
@@ -0,0 +1 @@
+THANKS.txt
Modified: packages/lightyears/trunk/debian/lightyears.6
===================================================================
--- packages/lightyears/trunk/debian/lightyears.6 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/lightyears.6 2011-07-21 23:57:51 UTC (rev 7346)
@@ -16,6 +16,9 @@
.TP
.B \-\-no\-sound
Mute all sounds.
+.TP
+.B \-\-safe
+Restore default configuration (any existing configuration will be deleted).
.SH DESCRIPTION
\fBlightyears\fP is a strategy game with steampunk elements. You are
@@ -49,4 +52,4 @@
.SH AUTHOR
\fBlightyears\fP was written by Jack Whitham <jack at jwhitham.org.uk> and this
-manual page by Siegfried-A. Gevatter <rainct at ubuntu.com>.
+manual page by Siegfried-A. Gevatter <siegfried at gevatter.com>.
Modified: packages/lightyears/trunk/debian/lightyears.desktop
===================================================================
--- packages/lightyears/trunk/debian/lightyears.desktop 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/lightyears.desktop 2011-07-21 23:57:51 UTC (rev 7346)
@@ -7,4 +7,4 @@
Icon=lightyears
Exec=lightyears
Terminal=false
-Categories=Game;
+Categories=Game;StrategyGame;
Added: packages/lightyears/trunk/debian/manpages
===================================================================
--- packages/lightyears/trunk/debian/manpages (rev 0)
+++ packages/lightyears/trunk/debian/manpages 2011-07-21 23:57:51 UTC (rev 7346)
@@ -0,0 +1 @@
+debian/lightyears.6
Deleted: packages/lightyears/trunk/debian/patches/add_fullscreen_flag.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/add_fullscreen_flag.patch 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/patches/add_fullscreen_flag.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,12 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' lightyears-1.3a/code/main.py lightyears-1.3a.new/code/main.py
---- lightyears-1.3a/code/main.py 2009-06-20 21:05:38.000000000 +0200
-+++ lightyears-1.3a.new/code/main.py 2009-06-20 21:08:55.424826126 +0200
-@@ -29,7 +29,7 @@
- default_flags = 0
- flags = default_flags
- if ( config.cfg.fullscreen
-- and ( not "--window" in sys.argv )):
-+ and ( not "--window" in sys.argv )) or "--fullscreen" in sys.argv:
- flags |= FULLSCREEN
-
- bufsize = 2048
Modified: packages/lightyears/trunk/debian/patches/doc_image_path.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/doc_image_path.patch 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/patches/doc_image_path.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,6 +1,13 @@
-diff -Nur lightyears-1.3a/manual/about.html lightyears-1.3a.new/manual/about.html
---- lightyears-1.3a/manual/about.html 2007-11-13 22:54:44.000000000 +0100
-+++ lightyears-1.3a.new/manual/about.html 2007-12-06 13:00:22.000000000 +0100
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Description: Fix paths in HTML documentation to use Debian paths
+Author: Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com>
+
+Index: lightyears-1.4/manual/about.html
+===================================================================
+--- lightyears-1.4.orig/manual/about.html 2011-07-22 01:48:51.000000000 +0200
++++ lightyears-1.4/manual/about.html 2011-07-22 01:48:52.000000000 +0200
@@ -3,9 +3,9 @@
<head>
<title>20,000 Light Years Into Space</title></head>
@@ -10,12 +17,32 @@
-<center><img src="../data/header.jpg" alt="20,000 Light Years Into Space"><br><br>
+<center><img src="/usr/share/games/lightyears/data/header.jpg" alt="20,000 Light Years Into Space"><br><br>
- Produced by <a href="http://www.jwhitham.org.uk/">Jack Whitham</a>.<br><br>
+ Produced by <a href="http://www.jwhitham.org/">Jack Whitham</a>.<br><br>
<font size="+1">
<a href="story.html">The Story</a> -
-diff -Nur lightyears-1.3a/manual/hints.html lightyears-1.3a.new/manual/hints.html
---- lightyears-1.3a/manual/hints.html 2007-11-13 22:53:05.000000000 +0100
-+++ lightyears-1.3a.new/manual/hints.html 2007-12-06 13:00:27.000000000 +0100
+@@ -25,8 +25,7 @@
+
+ <h3>Legal stuff</h3>
+
+-<p>The game includes assets from a variety of sources; please see
+-<a href="../README.txt">README.txt</a> for a complete list.
++<p>See <em>/usr/share/doc/lightyears/copyright</em>.</p>
+
+ <h3>About the Author</h3>
+
+@@ -35,7 +34,7 @@
+ <h3>License</h3>
+ <pre>
+ 20,000 Light-Years Into Space, a computer game
+- Copyright (C) 2006-07 Jack Whitham
++ Copyright (C) 2006-11 Jack Whitham
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2,
+Index: lightyears-1.4/manual/hints.html
+===================================================================
+--- lightyears-1.4.orig/manual/hints.html 2011-07-22 01:48:51.000000000 +0200
++++ lightyears-1.4/manual/hints.html 2011-07-22 01:48:52.000000000 +0200
@@ -3,9 +3,9 @@
<head>
<title>20,000 Light Years Into Space</title></head>
@@ -25,12 +52,13 @@
-<center><img src="../data/header.jpg" alt="20,000 Light Years Into Space"><br><br>
+<center><img src="/usr/share/games/lightyears/data/header.jpg" alt="20,000 Light Years Into Space"><br><br>
- Produced by <a href="http://www.jwhitham.org.uk/">Jack Whitham</a>.<br><br>
+ Produced by <a href="http://www.jwhitham.org/">Jack Whitham</a>.<br><br>
<font size="+1">
<a href="story.html">The Story</a> -
-diff -Nur lightyears-1.3a/manual/index.html lightyears-1.3a.new/manual/index.html
---- lightyears-1.3a/manual/index.html 2007-12-06 00:10:21.000000000 +0100
-+++ lightyears-1.3a.new/manual/index.html 2007-12-06 13:00:30.000000000 +0100
+Index: lightyears-1.4/manual/index.html
+===================================================================
+--- lightyears-1.4.orig/manual/index.html 2011-07-22 01:48:51.000000000 +0200
++++ lightyears-1.4/manual/index.html 2011-07-22 01:48:52.000000000 +0200
@@ -3,9 +3,9 @@
<head>
<title>20,000 Light Years Into Space</title></head>
@@ -40,12 +68,13 @@
-<center><img src="../data/header.jpg" alt="20,000 Light Years Into Space"><br><br>
+<center><img src="/usr/share/games/lightyears/data/header.jpg" alt="20,000 Light Years Into Space"><br><br>
- Produced by <a href="http://www.jwhitham.org.uk/">Jack Whitham</a>.<br><br>
+ Produced by <a href="http://www.jwhitham.org/">Jack Whitham</a>.<br><br>
<h2>Online Manual</h2><br>
<font size="+1">
-diff -Nur lightyears-1.3a/manual/instructions.html lightyears-1.3a.new/manual/instructions.html
---- lightyears-1.3a/manual/instructions.html 2007-11-13 22:52:59.000000000 +0100
-+++ lightyears-1.3a.new/manual/instructions.html 2007-12-06 13:00:34.000000000 +0100
+Index: lightyears-1.4/manual/instructions.html
+===================================================================
+--- lightyears-1.4.orig/manual/instructions.html 2011-07-22 01:48:51.000000000 +0200
++++ lightyears-1.4/manual/instructions.html 2011-07-22 01:48:52.000000000 +0200
@@ -3,9 +3,9 @@
<head>
<title>20,000 Light Years Into Space</title></head>
@@ -55,7 +84,7 @@
-<center><img src="../data/header.jpg" alt="20,000 Light Years Into Space"><br><br>
+<center><img src="/usr/share/games/lightyears/data/header.jpg" alt="20,000 Light Years Into Space"><br><br>
- Produced by <a href="http://www.jwhitham.org.uk/">Jack Whitham</a>.<br><br>
+ Produced by <a href="http://www.jwhitham.org/">Jack Whitham</a>.<br><br>
<font size="+1">
<a href="story.html">The Story</a> -
@@ -17,7 +17,7 @@
@@ -63,7 +92,7 @@
<table align=right cellspacing=10><tr><td align=center>
-<img src="../data/html1.jpg" align=center></td></tr>
-+<img src="./images/html1.jpg" align=center></td></tr>
++<img src="images/html1.jpg" align=center></td></tr>
<tr><td align=center>Figure 1. Main menu screen.</td></tr></table>
<p>The objective of "20,000 Light Years Into Space" is to upgrade a City to
@@ -72,7 +101,7 @@
<table align=left cellspacing=10><tr><td align=center>
-<img src="../data/html2.jpg" align=center></td></tr>
-+<img src="./images/html2.jpg" align=center></td></tr>
++<img src="images/html2.jpg" align=center></td></tr>
<tr><td align=center>Figure 2.
The City, a Pipe, and a Steam Maker.</td></tr></table>
@@ -81,7 +110,7 @@
<table align=right cellspacing=10><tr><td align=center>
-<img src="../data/html3.jpg" align=center></td></tr>
-+<img src="./images/html3.jpg" align=center></td></tr>
++<img src="images/html3.jpg" align=center></td></tr>
<tr><td align=center>Figure 3.
Game controls.</td></tr></table>
@@ -90,7 +119,7 @@
<table align=left cellspacing=10><tr><td align=center>
-<img src="../data/html5.jpg" align=center></td></tr>
-+<img src="./images/html5.jpg" align=center></td></tr>
++<img src="images/html5.jpg" align=center></td></tr>
<tr><td align=center>Figure 4.
Upgrade in progress.</td></tr></table>
@@ -99,13 +128,14 @@
<table align=right cellspacing=10><tr><td align=center>
-<img src="../data/html4.jpg" align=center></td></tr>
-+<img src="./images/html4.jpg" align=center></td></tr>
++<img src="images/html4.jpg" align=center></td></tr>
<tr><td align=center>Figure 5.
Primary and secondary routes.</td></tr></table>
-diff -Nur lightyears-1.3a/manual/story.html lightyears-1.3a.new/manual/story.html
---- lightyears-1.3a/manual/story.html 2007-11-13 22:52:56.000000000 +0100
-+++ lightyears-1.3a.new/manual/story.html 2007-12-06 13:00:38.000000000 +0100
+Index: lightyears-1.4/manual/story.html
+===================================================================
+--- lightyears-1.4.orig/manual/story.html 2011-07-22 01:49:38.000000000 +0200
++++ lightyears-1.4/manual/story.html 2011-07-22 01:49:35.000000000 +0200
@@ -3,9 +3,9 @@
<head>
<title>20,000 Light Years Into Space</title></head>
@@ -115,7 +145,7 @@
-<center><img src="../data/header.jpg" alt="20,000 Light Years Into Space"><br><br>
+<center><img src="/usr/share/games/lightyears/data/header.jpg" alt="20,000 Light Years Into Space"><br><br>
- Produced by <a href="http://www.jwhitham.org.uk/">Jack Whitham</a>.<br><br>
+ Produced by <a href="http://www.jwhitham.org/">Jack Whitham</a>.<br><br>
<font size="+1">
<a href="story.html">The Story</a> -
@@ -47,7 +47,7 @@
@@ -123,7 +153,7 @@
<center>
<table cellspacing=10><tr><td align=center>
-<img src="../data/html1.jpg" align=center></td></tr>
-+<img src="./images/html1.jpg" align=center></td></tr>
++<img src="images/html1.jpg" align=center></td></tr>
<tr><td align=center>Figure 1. Main menu screen, showing
the letter from Captain Verne.</td></tr></table>
</center>
Deleted: packages/lightyears/trunk/debian/patches/fix_crash_in_sound_py.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/fix_crash_in_sound_py.patch 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/patches/fix_crash_in_sound_py.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,14 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' lightyears-1.3a/code/sound.py lightyears-1.3a.new/code/sound.py
---- lightyears-1.3a/code/sound.py 2008-07-22 16:09:25.000000000 +0200
-+++ lightyears-1.3a.new/code/sound.py 2008-07-22 16:10:14.000000000 +0200
-@@ -43,8 +43,8 @@
- or ( not ( self.schan.get_sound()
- in [ self.sobj , self.sobj2 ] ))):
- self.schan = self.sobj.play()
--
-- self.schan.queue(self.sobj2)
-+ if self.schan:
-+ self.schan.queue(self.sobj2)
-
- def Fade_Out(self):
- if (( self.sobj == None )
Deleted: packages/lightyears/trunk/debian/patches/fix_icon_path.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/fix_icon_path.patch 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/patches/fix_icon_path.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,14 +0,0 @@
-diff -Nur lightyears-1.3/code/main.py lightyears-1.3.new/code/main.py
---- lightyears-1.3/code/main.py 2007-11-13 23:34:28.000000000 +0100
-+++ lightyears-1.3.new/code/main.py 2007-11-17 17:43:29.000000000 +0100
-@@ -52,7 +52,9 @@
- width = screen.get_rect().width
-
- # Icon
-- pygame.display.set_icon(resource.Load_Image("32.png"))
-+ # The icon provided in the Debian package is different than the original one
-+ # (size and location changed)
-+ pygame.display.set_icon(resource.Load_Image('/usr/share/pixmaps/lightyears.xpm'))
-
-
- # Game begins.. show loading image
Deleted: packages/lightyears/trunk/debian/patches/fix_manual_url.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/fix_manual_url.patch 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/patches/fix_manual_url.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,15 +0,0 @@
-diff -Nur lightyears-1.3/code/main.py lightyears-1.3.new/code/main.py
---- lightyears-1.3/code/main.py 2007-11-13 23:34:28.000000000 +0100
-+++ lightyears-1.3.new/code/main.py 2007-11-17 16:48:06.000000000 +0100
-@@ -197,9 +197,8 @@
-
- elif ( cmd == MENU_MANUAL ):
- pygame.display.iconify()
-- url = os.path.abspath(os.path.join(resource.DATA_DIR, '..',
-- 'manual', 'index.html'))
-- url = 'file://' + url
-+ # Note: The manual has a different location in Debian
-+ url = 'file:///usr/share/doc/lightyears/html/index.html'
-
- try:
- webbrowser.open(url, True, True)
Deleted: packages/lightyears/trunk/debian/patches/font_usage.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/font_usage.patch 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/patches/font_usage.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,31 +0,0 @@
-diff -Nur lightyears-1.3/code/resource.py lightyears-1.3.new/code/resource.py
---- lightyears-1.3/code/resource.py 2007-11-17 17:50:24.000000000 +0100
-+++ lightyears-1.3.new/code/resource.py 2007-11-17 17:51:23.000000000 +0100
-@@ -50,17 +50,16 @@
-
-
- def Load_Font(size):
-- fname = Path("Vera.ttf")
-- try:
-- f = pygame.font.Font(fname, size)
-- except Exception, x:
-- print ""
-- print "WARNING: Error loading custom font - falling back to system font"
-- print repr(x) + " " + str(x)
-- print ""
-- f = pygame.font.SysFont(None, size)
--
-- return f
-+ # ----------------------------------------------------------
-+ # This function was modified by Siegfried Gevatter, the
-+ # maintainer of "lighyears" in Debian, to let lightyears
-+ # use the font from package "ttf-dejavu-core" instead of
-+ # it's own copy of it.
-+ #
-+ # Note: pygame.font.Font is used instead of pygame.font.SysFont
-+ # because with this last one the size of the text changed unexpectedly
-+ return pygame.font.Font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", size)
-+ # ----------------------------------------------------------
-
- def Load_Sound(name):
- global __snd_cache, __snd_disabled, __printed_sound_warning
Added: packages/lightyears/trunk/debian/patches/hardcode-code-dir.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/hardcode-code-dir.patch (rev 0)
+++ packages/lightyears/trunk/debian/patches/hardcode-code-dir.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -0,0 +1,18 @@
+Description: Fix code path so it's found when installed system-wide
+Author: Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com>
+
+Index: lightyears-1.4/lightyears
+===================================================================
+--- lightyears-1.4.orig/lightyears 2011-07-22 01:40:32.000000000 +0200
++++ lightyears-1.4/lightyears 2011-07-22 01:40:31.000000000 +0200
+@@ -1,8 +1,8 @@
+ #!/usr/bin/python
+
+ # Set the location of the LightYears files here:
+-LIGHTYEARS_DIR = "."
+-# LIGHTYEARS_DIR = "/usr/share/games/lightyears" # (for Debian)
++#LIGHTYEARS_DIR = "."
++LIGHTYEARS_DIR = "/usr/share/games/lightyears" # (for Debian)
+
+ # Save games and configuration files are stored in the user's
+ # home directory.
Deleted: packages/lightyears/trunk/debian/patches/only_show_valid_resolutions.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/only_show_valid_resolutions.patch 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/patches/only_show_valid_resolutions.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,15 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' lightyears-1.3a/code/main.py lightyears-1.3a.new/code/main.py
---- lightyears-1.3a/code/main.py 2008-07-22 15:35:59.000000000 +0200
-+++ lightyears-1.3a.new/code/main.py 2008-07-22 15:54:07.000000000 +0200
-@@ -41,6 +41,11 @@
- pygame.init()
- pygame.font.init()
-
-+ # Ensure that all resolutions are supported by the system
-+ for resolution in RESOLUTIONS:
-+ if resolution[:2] not in pygame.display.list_modes():
-+ RESOLUTIONS.remove(resolution)
-+
- if ( no_sound ):
- resource.No_Sound()
- else:
Deleted: packages/lightyears/trunk/debian/patches/remove_shabang_intercept_py.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/remove_shabang_intercept_py.patch 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/patches/remove_shabang_intercept_py.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,8 +0,0 @@
-diff -Nur lightyears-1.3/code/intersect.py lightyears-1.3.new/code/intersect.py
---- lightyears-1.3/code/intersect.py 2007-11-13 23:34:23.000000000 +0100
-+++ lightyears-1.3.new/code/intersect.py 2007-11-17 19:05:07.000000000 +0100
-@@ -1,4 +1,3 @@
--#!/usr/bin/python2.4
- #
- # 20,000 Light Years Into Space
- # This game is licensed under GPL v2, and copyright (C) Jack Whitham 2006-07.
Modified: packages/lightyears/trunk/debian/patches/remove_startup_checks.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/remove_startup_checks.patch 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/patches/remove_startup_checks.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,17 +1,20 @@
-diff -Nur lightyears-1.3/code/startup.py lightyears-1.3.new/code/startup.py
---- lightyears-1.3/code/startup.py 2007-11-17 20:37:34.000000000 +0100
-+++ lightyears-1.3.new/code/startup.py 2007-11-17 20:39:18.000000000 +0100
-@@ -3,81 +3,23 @@
- # This game is licensed under GPL v2, and copyright (C) Jack Whitham 2006-07.
+Description: Remove unnecessary version checks from startup
+Author: Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com>
+
+Index: lightyears-1.4/code/startup.py
+===================================================================
+--- lightyears-1.4.orig/code/startup.py 2011-07-20 01:27:43.000000000 +0200
++++ lightyears-1.4/code/startup.py 2011-07-22 00:48:00.000000000 +0200
+@@ -3,60 +3,15 @@
+ # This game is licensed under GPL v2, and copyright (C) Jack Whitham 2006.
#
--# Python version check. 2.4.x or higher is required.
--# This also checks your Pygame version (after Python)
--# Earlier versions *might* work but I haven't tested them...
--# 2.4 is certainly required for built-in set() support.
--
--import sys
--
+-# Version check. This file can be much shorter for Debian.
++# Note: This file has been shortened a lot by Debian, removing startup
++# checks that shouldn't be necessary since dpkg takes care of them.
+
+ import sys
+
-def Check_Version():
- fault = False
- if ( sys.__dict__.has_key("version_info" ) ):
@@ -26,9 +29,8 @@
-
- if ( fault ):
- print ""
-- print "Python version 2.4 or higher is required."
+- print "Python 2 version 2.4 or higher is required."
- print "You appear to be using version",(str(major) + "." + str(minor))
-- print "Please install the latest version from http://www.python.org/"
- sys.exit(1)
-
- try:
@@ -57,42 +59,12 @@
- print "Please install the latest version from http://www.pygame.org/"
- sys.exit(1)
-
-- print "Python version",sys.version,"- good"
-- print "Pygame version",pygame.version.ver,"- good"
-+# Note: This file has been shortened a lot by Debian, removing startup
-+# checks that shouldn't be necessary since dpkg takes care of them.
-
+-
def Get_Game_Version():
-- # Used for savegames. Be sure to update this.
-- return "1.3"
-+ return "1.3" # no savegame changes in 1.4
+ return "1.3"
- def Main(data_dir):
-- print "Now checking your Python environment:"
+ def Main(data_dir, ignore = None):
- Check_Version()
--
-- # Psyco is optional, but recommended :)
-- if ( True ):
-- try:
-- import psyco
-- psyco.profile()
-- except Exception, r:
-- print 'Psyco not found. If the game runs too slowly, '
-- print 'install Psyco from http://psyco.sf.net/'
--
-+
-+ import pygame
-+
-+ try:
-+ import psyco
-+ psyco.profile()
-+ except Exception, r:
-+ print 'Note: If the game runs too slow you can try installing package "python-psyco".'
-+
import main
--
-+
- print "Game booting - have fun!"
main.Main(data_dir)
--
--
+
Added: packages/lightyears/trunk/debian/patches/series
===================================================================
--- packages/lightyears/trunk/debian/patches/series (rev 0)
+++ packages/lightyears/trunk/debian/patches/series 2011-07-21 23:57:51 UTC (rev 7346)
@@ -0,0 +1,4 @@
+remove_startup_checks.patch
+doc_image_path.patch
+snd_disabled_typo.patch
+hardcode-code-dir.patch
Added: packages/lightyears/trunk/debian/patches/snd_disabled_typo.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/snd_disabled_typo.patch (rev 0)
+++ packages/lightyears/trunk/debian/patches/snd_disabled_typo.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -0,0 +1,14 @@
+Description: Fix typo in variable name
+Author: Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com>
+
+--- lightyears-1.4.orig/code/resource.py
++++ lightyears-1.4/code/resource.py
+@@ -15,7 +15,7 @@ __snd_cache = dict()
+ __snd_disabled = False
+
+ if not pygame.mixer or not pygame.mixer.get_init():
+- __snd__disabled = True
++ __snd_disabled = True
+
+ DATA_DIR = os.path.abspath(os.path.join(
+ os.path.dirname(sys.argv[ 0 ]), "data"))
Deleted: packages/lightyears/trunk/debian/patches/start_windowed.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/start_windowed.patch 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/patches/start_windowed.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,18 +0,0 @@
-diff -Nur lightyears-1.3/code/config.py lightyears-1.3.new/code/config.py
---- lightyears-1.3/code/config.py 2007-11-17 16:40:46.000000000 +0100
-+++ lightyears-1.3.new/code/config.py 2007-11-17 18:06:14.000000000 +0100
-@@ -9,9 +9,12 @@
- class Config:
- def __init__(self):
- # Default settings:
-+ # Some default settings were changed in Debian:
-+ # - Resolution: upstream's value is 1024x768
-+ # - Fullscreen: upstream's value is True
- self.version = startup.Get_Game_Version()
-- self.resolution = (1024, 768)
-- self.fullscreen = True
-+ self.resolution = (800, 600)
-+ self.fullscreen = False
- self.font_scale = 4
- self.seen_before = False
-
Deleted: packages/lightyears/trunk/debian/patches/work_with_no_sound.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/work_with_no_sound.patch 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/patches/work_with_no_sound.patch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,32 +0,0 @@
-diff -Nur lightyears-1.3a/code/main.py lightyears-1.3a.new/code/main.py
---- lightyears-1.3a/code/main.py 2007-12-30 12:34:40.000000000 +0100
-+++ lightyears-1.3a.new/code/main.py 2007-12-30 13:04:07.000000000 +0100
-@@ -35,8 +35,13 @@
- bufsize = 2048
-
- no_sound = ( "--no-sound" in sys.argv )
-- if ( not no_sound ):
-- pygame.mixer.pre_init(22050,-16,2,bufsize)
-+ if not no_sound:
-+ try:
-+ pygame.mixer.pre_init(22050, -16, 2, bufsize)
-+ pygame.mixer.init()
-+ except pygame.error, message:
-+ print 'Sound initialization failed. %s' % message
-+ no_sound = True
-
- pygame.init()
- pygame.font.init()
-
-diff -Nur lightyears-1.3a/code/resource.py lightyears-1.3a.new/code/resource.py
---- lightyears-1.3a/code/resource.py 2007-12-30 12:34:40.000000000 +0100
-+++ lightyears-1.3a.new/code/resource.py 2007-12-30 12:34:42.000000000 +0100
-@@ -14,6 +14,9 @@
- __snd_cache = dict()
- __snd_disabled = False
-
-+if not pygame.mixer or not pygame.mixer.get_init():
-+ __snd__disabled = True
-+
- DATA_DIR = os.path.abspath(os.path.join(
- os.path.dirname(sys.argv[ 0 ]), "data"))
Deleted: packages/lightyears/trunk/debian/pycompat
===================================================================
--- packages/lightyears/trunk/debian/pycompat 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/pycompat 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1 +0,0 @@
-2
Deleted: packages/lightyears/trunk/debian/pyversions
===================================================================
--- packages/lightyears/trunk/debian/pyversions 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/pyversions 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1 +0,0 @@
-2.4-
Modified: packages/lightyears/trunk/debian/rules
===================================================================
--- packages/lightyears/trunk/debian/rules 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/rules 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,9 +1,4 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-DEB_INSTALL_MANPAGES_lightyears += debian/lightyears.6
-
-binary-install/lightyears::
- dh_pysupport -plightyears
+%:
+ dh $@ --with python2
Modified: packages/lightyears/trunk/debian/source/format
===================================================================
--- packages/lightyears/trunk/debian/source/format 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/source/format 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
Modified: packages/lightyears/trunk/debian/watch
===================================================================
--- packages/lightyears/trunk/debian/watch 2011-07-20 20:56:36 UTC (rev 7345)
+++ packages/lightyears/trunk/debian/watch 2011-07-21 23:57:51 UTC (rev 7346)
@@ -1,2 +1,2 @@
version=3
-http://www.jwhitham.org.uk/20kly/lightyears-(.*)\.tar\.gz
+http://www.jwhitham.org.uk/20kly/lightyears-(.*)\.tar\.[a-z0-9]+
More information about the Python-apps-commits
mailing list