r15069 - in packages/trunk/bubbros/debian: . patches
Juhani Numminen
jsonic-guest at moszumanska.debian.org
Wed May 7 15:27:38 UTC 2014
Author: jsonic-guest
Date: 2014-05-07 15:27:38 +0000 (Wed, 07 May 2014)
New Revision: 15069
Removed:
packages/trunk/bubbros/debian/bubbros.doc-base
packages/trunk/bubbros/debian/patches/fix_exceptions.patch
Modified:
packages/trunk/bubbros/debian/
packages/trunk/bubbros/debian/changelog
packages/trunk/bubbros/debian/install
packages/trunk/bubbros/debian/patches/series
packages/trunk/bubbros/debian/rules
Log:
New upstream release.
Set origUrl property of debian/.
Reformat the d/changelog entry.
HTML docs not shipped anymore, so remove d/bubbros.doc-base and
references to them in d/install.
d/patches/fix_exceptions.patch was partially applied upstream,
partially rejected so dropping it.
Don’t install VCS cruft of upstream tarball.
Property changes on: packages/trunk/bubbros/debian
___________________________________________________________________
Added: svn-bp:origUrl
+ http://pkg-games.alioth.debian.org/tarballs/bubbros_1.6.2.orig.tar.gz
Deleted: packages/trunk/bubbros/debian/bubbros.doc-base
===================================================================
--- packages/trunk/bubbros/debian/bubbros.doc-base 2014-05-06 13:31:48 UTC (rev 15068)
+++ packages/trunk/bubbros/debian/bubbros.doc-base 2014-05-07 15:27:38 UTC (rev 15069)
@@ -1,8 +0,0 @@
-Document: bubbros-html-docs
-Title: The Bub's Brothers Game
-Author: Armin Rigo and the IMA connection
-Section: Games/Action
-
-Format: HTML
-Index: /usr/share/doc/bubbros/html/
-Files: /usr/share/doc/bubbros/html/*.html
Modified: packages/trunk/bubbros/debian/changelog
===================================================================
--- packages/trunk/bubbros/debian/changelog 2014-05-06 13:31:48 UTC (rev 15068)
+++ packages/trunk/bubbros/debian/changelog 2014-05-07 15:27:38 UTC (rev 15069)
@@ -1,24 +1,32 @@
-bubbros (1.6-3) UNRELEASED; urgency=low
+bubbros (1.6.2-1) UNRELEASED; urgency=medium
[ Siegfried-Angel Gevatter Pujals ]
- * Add patches/fix_exceptions.patch, by Ben Finney (Closes: #585187).
- * Switch to dpkg-source 3.0 (quilt) format and bump Standards-Version.
+ * Switch to dpkg-source 3.0 (quilt) format.
* Change python-all-dev dependency to python-all.
[ Evgeni Golov ]
* Update Vcs-* fields to point to anonscm.debian.org.
[ Juhani Numminen ]
- * Bump Standards-Version to 3.9.5.
- * Include CDBS’ quilt makefile, add quilt to depends and add
- debian/patches/series to actually apply patches.
- * Add debian/patches/replace_sf_logo.patch to prevent fetching SF.net logo.
- * Add Keywords field to debian/bubbros.desktop, remove unhelpful GenericName.
- * Add myself to Uploaders.
- * Exclude Makefiles from being installed.
- * Change python helper to dh_python2 as dh_pysupport is obsolete.
- * Remove ${shlibs:Depends} from Depends as the binary package is arch-indep.
- * Rewrite debian/copyright to machine-readable format.
+ * New upstream release.
+ - Fixes obsolete Python string exceptions (Closes: #585187).
+ * debian/control:
+ - Add myself to Uploaders.
+ - Add quilt to Depends.
+ - Bump Standards-Version to 3.9.5.
+ - Change python helper to dh-python as python-support is obsolete.
+ - Remove ${shlibs:Depends} from Depends as the binary package is arch-indep.
+ * debian/rules:
+ - Include CDBS’ quilt makefile.
+ - Change python helper to dh-python as python-support is obsolete.
+ - Don't install the CVS cruft and Makefiles.
+ * Add debian/patches/series.
+ * debian/patches/replace_sf_logo.patch: Prevent fetching SF.net logo.
+ * debian/bubbros.desktop:
+ - Add Keywords.
+ - Remove unhelpful GenericName.
+ * debian/copyright: Rewrite to machine-readable format.
+ * Remove debian/bubbros.doc-base as the html docs were dropped.
-- Juhani Numminen <juhaninumminen0 at gmail.com> Sun, 04 May 2014 21:31:16 +0300
Modified: packages/trunk/bubbros/debian/install
===================================================================
--- packages/trunk/bubbros/debian/install 2014-05-06 13:31:48 UTC (rev 15068)
+++ packages/trunk/bubbros/debian/install 2014-05-07 15:27:38 UTC (rev 15069)
@@ -9,8 +9,3 @@
http2 usr/share/games/bubbros/
metaserver/__init__.py usr/share/games/bubbros/metaserver/
metaserver/meta*.py usr/share/games/bubbros/metaserver/
-
-doc/Introduction.html usr/share/doc/bubbros/html/
-doc/authors.html usr/share/doc/bubbros/html/
-doc/help.html usr/share/doc/bubbros/html/
-doc/crazybonuses.html usr/share/doc/bubbros/html/
Deleted: packages/trunk/bubbros/debian/patches/fix_exceptions.patch
===================================================================
--- packages/trunk/bubbros/debian/patches/fix_exceptions.patch 2014-05-06 13:31:48 UTC (rev 15068)
+++ packages/trunk/bubbros/debian/patches/fix_exceptions.patch 2014-05-07 15:27:38 UTC (rev 15069)
@@ -1,300 +0,0 @@
-# 01-standard-raise-statements.patch
-#
-# Description: Use standard syntax for ‘raise’ with exception instances.
-# Author: Ben Finney <ben+debian at benfinney.id.au>
-# Bug-Debian: http://bugs.debian.org/585187
-# Last-Update: 2010-06-15
-
-
-=== modified file 'bubbob/boards.py'
---- old/bubbob/boards.py 2010-06-15 07:19:05 +0000
-+++ new/bubbob/boards.py 2010-06-15 07:39:50 +0000
-@@ -1432,7 +1432,7 @@
- assert test.height == height, "some boards have a different height"
- except Exception, e:
- print 'Caught "%s" in level "%s":' % (e, B.__name__)
-- raise e
-+ raise
- bwidth = width*CELL
- bheight = height*CELL
- bheightmod = (height+2)*CELL
-
-=== modified file 'bubbob/images/buildcolors.py'
---- old/bubbob/images/buildcolors.py 2010-06-15 07:19:05 +0000
-+++ new/bubbob/images/buildcolors.py 2010-06-15 07:39:50 +0000
-@@ -280,7 +280,7 @@
- else:
- # from now on we should always use the palette approach;
- # comment out the following line to restore the old color-rotation code.
-- raise IOError("cannot find the palette file %r" % (tmp,))
-+ raise IOError("cannot find the palette file %(tmp)r" % vars())
-
-
- if __name__ == '__auto__': # when execfile'd from images.py
-
-=== modified file 'bubbob/macbinary.py'
---- old/bubbob/macbinary.py 2010-06-15 07:19:05 +0000
-+++ new/bubbob/macbinary.py 2010-06-15 07:39:50 +0000
-@@ -105,10 +105,10 @@
- class Subfile:
- def __init__(self, f, start, length):
- if start < 0:
-- raise ValueError, 'negative position'
-+ raise ValueError("negative position")
- if isinstance(f, Subfile):
- if start + length > f.length:
-- raise ValueError, 'subfile out of bounds'
-+ raise ValueError("subfile out of bounds")
- f, start = f.f, f.start+start
- self.f = f
- self.start = start
-@@ -124,7 +124,7 @@
- return self.f.read(size)
- def seek(self, npos):
- if npos < 0:
-- raise ValueError, 'negative position'
-+ raise ValueError("negative position")
- self.position = npos
-
-
-@@ -186,7 +186,7 @@
- f = self.subfile()
- pattype, patmap, patdata = struct.unpack(">Hll", f.read(10))
- if pattype != 1:
-- raise ValueError, 'Pattern type not supported'
-+ raise ValueError("Pattern type not supported")
- f.seek(patmap)
- (rowBytes, h, w, packType, packSize,
- pixelType, pixelSize, cmpCount, cmpSize, pmTable) = (
-@@ -194,9 +194,9 @@
- isBitmap = (rowBytes & 0x8000) != 0
- rowBytes &= 0x3FFF
- if packType != 0:
-- raise ValueError, 'packed image not supported'
-+ raise ValueError("packed image not supported")
- if pixelType != 0 or cmpCount != 1:
-- raise ValueError, 'direct RGB image not supported'
-+ raise ValueError("direct RGB image not supported")
- assert cmpSize == pixelSize and pixelSize in [1,2,4,8]
- f.seek(pmTable)
- colormap = loadcolormap(f)
-
-=== modified file 'bubbob/test_rnglevel.py'
---- old/bubbob/test_rnglevel.py 2010-06-15 07:19:05 +0000
-+++ new/bubbob/test_rnglevel.py 2010-06-15 07:39:50 +0000
-@@ -61,4 +61,4 @@
- else:
- for line in level.walls:
- print line
-- raise AssertionError("full height wall in column %d" % x)
-+ raise AssertionError("full height wall in column %(x)d" % vars())
-
-=== modified file 'common/gamesrv.py'
---- old/common/gamesrv.py 2010-06-15 07:19:05 +0000
-+++ new/common/gamesrv.py 2010-06-15 07:39:50 +0000
-@@ -986,7 +986,7 @@
- else:
- break
- else:
-- raise error, "server cannot find a free TCP socket port"
-+ raise error("server cannot find a free TCP socket port")
- else:
- raise
-
-@@ -1288,13 +1288,13 @@
- elif SERVER_SHUTDOWN and not ewtd and not owtd:
- SERVER_SHUTDOWN -= delay
- if SERVER_SHUTDOWN <= 0.001:
-- raise SystemExit, "Server shutdown requested."
-+ raise SystemExit("Server shutdown requested.")
- elif clients or getattr(game, 'autoreset', 0):
- servertimeout = None
- elif servertimeout is None:
- servertimeout = time() + SERVER_TIMEOUT
- elif time() > servertimeout:
-- raise SystemExit, "No more server activity, timing out."
-+ raise SystemExit("No more server activity, timing out.")
- except KeyboardInterrupt:
- if game is None or not game.FnExcHandler(1):
- raise
-
-=== modified file 'common/javaserver.py'
---- old/common/javaserver.py 2010-06-15 07:19:05 +0000
-+++ new/common/javaserver.py 2010-06-15 07:39:50 +0000
-@@ -123,7 +123,7 @@
- data = wave_cache[code[0]] = wav2au(snd.read())
- break
- else:
-- raise KeyError, code[0]
-+ raise KeyError(code[0])
- return StringIO(data), 'audio/wav'
-
-
-
-=== modified file 'display/modes.py'
---- old/display/modes.py 2010-06-15 07:19:05 +0000
-+++ new/display/modes.py 2010-06-15 07:39:50 +0000
-@@ -142,16 +142,17 @@
- return info
- if last_chance is not None:
- return last_chance
-- raise KeyError, 'no driver available!'
-+ raise KeyError("no driver available!")
- else:
- # find mode by name
- for info in lst:
- if info.name.upper() == name.upper():
- err = info.imperror()
-+ info_name = info.name
- if err:
-- raise KeyError, '%s: %s' % (info.name, err)
-+ raise KeyError("%(info_name)s: %(err)s" % vars())
- return info
-- raise KeyError, '%s: no such driver' % name
-+ raise KeyError("%(name)s: no such driver" % vars())
-
- def findmode_err(*args):
- try:
-
-=== modified file 'display/pclient.py'
---- old/display/pclient.py 2010-06-15 07:19:05 +0000
-+++ new/display/pclient.py 2010-06-15 07:39:50 +0000
-@@ -44,11 +44,11 @@
- self.rect = None
- return self.pixmap
- elif attr in ('bmpcode', 'rect'):
-- raise KeyError, attr
-+ raise KeyError(attr)
- elif attr == 'originalrect':
- self.originalrect = self.rect
- return self.originalrect
-- raise AttributeError, attr
-+ raise AttributeError(attr)
- def clear(self):
- if self.__dict__.has_key('pixmap'):
- del self.pixmap
-@@ -115,13 +115,13 @@
- while 1:
- t = self.s.recv(200)
- if not t and not hasattr(self.s, 'RECV_CAN_RETURN_EMPTY'):
-- raise error, "connexion closed"
-+ raise error("connection closed")
- initialbuf += t
- if len(initialbuf) >= len(MSG_WELCOME):
- head = initialbuf[:len(MSG_WELCOME)]
- tail = initialbuf[len(MSG_WELCOME):]
- if head != MSG_WELCOME:
-- raise error, "connected to something not a game server"
-+ raise error("connected to something not a game server")
- if '\n' in tail:
- break
- n = tail.index('\n')
-
-=== modified file 'display/puremixer.py'
---- old/display/puremixer.py 2010-06-15 07:19:05 +0000
-+++ new/display/puremixer.py 2010-06-15 07:39:50 +0000
-@@ -64,7 +64,7 @@
- byteorder = self.byteorder
- # done
- if (freq, bytes, signed, channels, byteorder) != self.parameters:
-- raise ValueError, 'sound sample conversion failed'
-+ raise ValueError("sound sample conversion failed")
- return data
-
- def wavesample(self, file):
-@@ -114,10 +114,12 @@
- elif byte == 4:
- typecode = 'i'
- else:
-- raise ValueError, 'cannot convert endianness for samples of %d bytes' % byte
-+ raise ValueError(
-+ "cannot convert endianness for samples of %(byte)d bytes"
-+ % vars())
- import array
- a = array.array(typecode, data)
- if a.itemsize != byte:
-- raise ValueError, 'endianness convertion failed'
-+ raise ValueError("endianness conversion failed")
- a.byteswap()
- return a.tostring()
-
-=== modified file 'display/pythonxlibintf.py'
---- old/display/pythonxlibintf.py 2010-06-15 07:19:05 +0000
-+++ new/display/pythonxlibintf.py 2010-06-15 07:39:50 +0000
-@@ -72,7 +72,7 @@
- elif depth == 24 or depth == 32:
- p_size = 8, 8, 8
- else:
-- raise ValueError, 'unsupported screen depth %d' % depth
-+ raise ValueError("unsupported screen depth %(depth)d" % vars())
-
- imgdata = []
- maskdata = []
-
-=== modified file 'http2/httppages.py'
---- old/http2/httppages.py 2010-06-15 07:19:05 +0000
-+++ new/http2/httppages.py 2010-06-15 07:39:50 +0000
-@@ -34,7 +34,7 @@
- if not attr.startswith('_'):
- return None
- else:
-- raise AttributeError, attr
-+ raise AttributeError(attr)
-
-
- class PageServer:
-@@ -237,7 +237,7 @@
- host = headers['remote host']
- host = socket.gethostbyname(host)
- if host != '127.0.0.1':
-- raise HTTPRequestError, "Access denied"
-+ raise HTTPRequestError("Access denied")
- return None, self.indexurl
-
- ## def listloader(self, headers, s=[], **options):
-@@ -253,7 +253,7 @@
-
- def newloader(self, headers, **options):
- if not self.Game:
-- raise HTTPRequestError, "Complete bub-n-bros installation needed"
-+ raise HTTPRequestError("Complete bub-n-bros installation needed")
- locals = {
- 'Game': self.Game,
- 'options': self.globaloptions,
-@@ -323,9 +323,10 @@
- httpport = int(httpport[0])
- except (ValueError, IndexError):
- if port:
-- raise HTTPRequestError, "This server is not running HTTP."
-+ raise HTTPRequestError("This server is not running HTTP.")
- else:
-- raise HTTPRequestError, "Sorry, I cannot connect the Java applet to a server using this field."
-+ raise HTTPRequestError(
-+ "Sorry, I cannot connect the Java applet to a server using this field.")
- return None, 'http://%s:%s/' % (host, httpport)
-
- # now is a good time to generate the color files if we can
-@@ -458,7 +459,8 @@
- if dpy.getmodule() is None:
- return None # redirect to the Java applet
- if dpy is None or snd is None:
-- raise HTTPRequestError, "No installed graphics or sounds drivers. See the settings page."
-+ raise HTTPRequestError(
-+ "No installed graphics or sounds drivers. See the settings page.")
- options = self.localoptions
- result = ['--cfg='+no_quote_worries(self.filename)]
- for key, value in options.dict().items():
-
-=== modified file 'http2/sf/bb12.py'
---- old/http2/sf/bb12.py 2010-06-15 07:19:05 +0000
-+++ new/http2/sf/bb12.py 2010-06-15 07:39:50 +0000
-@@ -123,7 +123,7 @@
- f.seek(0, 2)
- e = Entry(f)
- if e.pos >= SIZEMAX:
-- raise "Sorry, server database too big"
-+ raise RuntimeError("Sorry, server database too big")
- hostname = string.split(srv, ':')[0]
- if '.' not in hostname:
- Entry.Notice = 'Server hostname "%s" incomplete.' % hostname
-
Modified: packages/trunk/bubbros/debian/patches/series
===================================================================
--- packages/trunk/bubbros/debian/patches/series 2014-05-06 13:31:48 UTC (rev 15068)
+++ packages/trunk/bubbros/debian/patches/series 2014-05-07 15:27:38 UTC (rev 15069)
@@ -2,5 +2,4 @@
manpages.patch
disable_runtime_image_building.patch
config_in_homedir.patch
-fix_exceptions.patch
replace_sf_logo.patch
Modified: packages/trunk/bubbros/debian/rules
===================================================================
--- packages/trunk/bubbros/debian/rules 2014-05-06 13:31:48 UTC (rev 15068)
+++ packages/trunk/bubbros/debian/rules 2014-05-07 15:27:38 UTC (rev 15069)
@@ -3,6 +3,9 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+# Don't install the CVS cruft of orig tarball
+DEB_DH_INSTALL_ARGS_ALL=-XCVS -X.cvsignore
+
# Define some repeatedly used paths
DEBDIR=${CURDIR}/debian
BINDIR=${DEBDIR}/bin
More information about the Pkg-games-commits
mailing list