Package: ghextris Version: 0.9.0-1 Severity: normal Tags: patch Hi,
Attached is the diff for my ghextris 0.9.0-1.1 NMU. -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -Nru /tmp/3NUPOdB7eb/ghextris-0.9.0/debian/changelog
/tmp/pe1dNz1PxF/ghextris-0.9.0/debian/changelog
--- /tmp/3NUPOdB7eb/ghextris-0.9.0/debian/changelog 2004-05-13
03:58:40.000000000 +0200
+++ /tmp/pe1dNz1PxF/ghextris-0.9.0/debian/changelog 2006-07-22
20:02:00.000000000 +0200
@@ -1,3 +1,13 @@
+ghextris (0.9.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename dependencies for python transition (Closes: 377080).
+ * Fix some deprecation warnings.
+ * Add French translation (Closes: #334483).
+ * Add Swedish translation (Closes: #343301, #345175).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sat, 22 Jul 2006 20:01:33 +0200
+
ghextris (0.9.0-1) unstable; urgency=low
* New upstream version, new Debian packaging.
diff -Nru /tmp/3NUPOdB7eb/ghextris-0.9.0/debian/control
/tmp/pe1dNz1PxF/ghextris-0.9.0/debian/control
--- /tmp/3NUPOdB7eb/ghextris-0.9.0/debian/control 2004-05-20
00:53:12.000000000 +0200
+++ /tmp/pe1dNz1PxF/ghextris-0.9.0/debian/control 2006-07-22
20:03:15.000000000 +0200
@@ -7,7 +7,7 @@
Package: ghextris
Architecture: all
-Depends: python2.3, python2.3-glade2 (>= 2.2.0-1), python2.3-gnome2 (>=
2.0.2-1), python2.3-gtk2 (>= 2.2.0-1)
+Depends: python2.3, python-glade2 (>= 2.2.0-1), python-gnome2 (>= 2.0.2-1),
python-gtk2 (>= 2.2.0-1)
Description: A Tetris-like game on a hexagonal grid
Ghextris is a somewhat Tetris-like game, except that the pieces are composed
of hexagonal blocks instead of squares.
diff -Nru /tmp/3NUPOdB7eb/ghextris-0.9.0/ghextris.py
/tmp/pe1dNz1PxF/ghextris-0.9.0/ghextris.py
--- /tmp/3NUPOdB7eb/ghextris-0.9.0/ghextris.py 2004-05-19 23:40:53.000000000
+0200
+++ /tmp/pe1dNz1PxF/ghextris-0.9.0/ghextris.py 2006-07-22 20:07:19.000000000
+0200
@@ -29,7 +29,7 @@
pygtk.require("2.0")
import gtk
-import gnome.canvas
+import gnomecanvas
import gnome
import gobject
import gtk.glade
@@ -119,17 +119,17 @@
self.speed_orig = 400
self.speed = 400
self.speed_ratio = 0.99
- self.speed_reset = gtk.FALSE
- self.paused = gtk.FALSE
- self.lost = gtk.TRUE
+ self.speed_reset = False
+ self.paused = False
+ self.lost = True
self.score = 0
self.hiscore = 0
self.nextnum = 0
- self.running = gtk.FALSE
+ self.running = False
- self.nextpiece = gtk.FALSE
- self.board = gtk.FALSE
+ self.nextpiece = False
+ self.board = False
self.rowgroups = []
def draw_hexagon(self, group, color):
@@ -196,12 +196,12 @@
self.speed = self.speed_orig
self.score = 0
self.attitude = 0
- self.lost = gtk.FALSE
- self.paused = gtk.FALSE
+ self.lost = False
+ self.paused = False
self.update_appbar()
- if self.board != gtk.FALSE:
+ if self.board != False:
self.board.destroy()
self.board = self.canvas.root().add("GnomeCanvasGroup", x = 0, y = 0)
@@ -219,29 +219,29 @@
self.nextnum = whrandom.randint(0, 9)
self.next_piece()
- if self.running == gtk.FALSE:
+ if self.running == False:
gobject.timeout_add(self.speed, self.timer_handler)
- self.running = gtk.TRUE
+ self.running = True
else:
- self.speed_reset = gtk.TRUE
+ self.speed_reset = True
- return gtk.TRUE
+ return True
def on_about_activate(self, event):
aTree = gtk.glade.XML(self.glade, "about")
about = aTree.get_widget("about")
about.set_property("name", "Ghextris")
about.set_property("version", VERSION)
- return gtk.TRUE
+ return True
def on_pause_game_activate(self, event):
- if self.lost == gtk.TRUE:
- return gtk.FALSE
- if self.paused == gtk.TRUE:
- self.paused = gtk.FALSE
+ if self.lost == True:
+ return False
+ if self.paused == True:
+ self.paused = False
else:
- self.paused = gtk.TRUE
- return gtk.TRUE
+ self.paused = True
+ return True
def on_quit_activate(self, event):
gtk.main_quit()
@@ -293,7 +293,7 @@
self.colors[self.piecenum%(len(self.colors)+1)],
self.piece_x, self.piece_y)
- if self.nextpiece != gtk.FALSE:
+ if self.nextpiece != False:
self.nextpiece.destroy()
self.nextpiece = self.place_piece(self.preview,
self.pieces[self.nextnum][0],
@@ -302,35 +302,35 @@
self.deltay[self.nextnum])
def timer_handler(self):
- if self.lost == gtk.TRUE:
- self.running = gtk.FALSE
- return gtk.FALSE
+ if self.lost == True:
+ self.running = False
+ return False
- if self.paused == gtk.TRUE:
- return gtk.TRUE
+ if self.paused == True:
+ return True
self.piece_y += 1
- if self.check_collisions() == gtk.TRUE:
+ if self.check_collisions() == True:
self.piece_y -= 1
self.update_field()
- if self.top_occupied() != gtk.TRUE:
+ if self.top_occupied() != True:
self.next_piece()
else:
- self.lost = gtk.TRUE
+ self.lost = True
if self.hiscore < self.score:
self.hiscore = self.score
self.update_appbar()
- self.running = gtk.FALSE
- return gtk.FALSE
+ self.running = False
+ return False
else:
self.piece.move(0, self.pieceheight)
- if self.speed_reset == gtk.TRUE:
- self.speed_reset = gtk.FALSE
+ if self.speed_reset == True:
+ self.speed_reset = False
gobject.timeout_add(int(self.speed), self.timer_handler)
- return gtk.FALSE
+ return False
- return gtk.TRUE
+ return True
def update_appbar(self):
self.appbar.set_text("%s: %d | %s: %d" % (_("Score"), self.score,
@@ -338,18 +338,18 @@
self.hiscore))
def key_handler(self, widget, event=None):
- if self.lost == gtk.TRUE:
- return gtk.FALSE
+ if self.lost == True:
+ return False
- if event.keyval == gtk.keysyms.p and self.lost == gtk.FALSE:
- if self.paused == gtk.TRUE:
- self.paused = gtk.FALSE
+ if event.keyval == gtk.keysyms.p and self.lost == False:
+ if self.paused == True:
+ self.paused = False
else:
- self.paused = gtk.TRUE
- return gtk.TRUE
+ self.paused = True
+ return True
- if self.paused == gtk.TRUE:
- return gtk.FALSE
+ if self.paused == True:
+ return False
if event.keyval == gtk.keysyms.Up or event.keyval == gtk.keysyms.Down:
if event.keyval == gtk.keysyms.Up:
@@ -360,16 +360,16 @@
self.attitude = ((self.attitude + attitude_change +
len(self.pieces[self.piecenum])) %
len(self.pieces[self.piecenum]))
- if self.check_collisions() == gtk.TRUE:
+ if self.check_collisions() == True:
self.attitude = old_attitude
- return gtk.TRUE
+ return True
self.piece.destroy()
self.piece = self.place_piece(self.board,
self.pieces[self.piecenum][self.attitude],
self.colors[self.piecenum%(len(self.colors)+1)],
self.piece_x, self.piece_y);
- return gtk.TRUE
+ return True
if event.keyval == gtk.keysyms.Left or event.keyval ==
gtk.keysyms.Right:
if event.keyval == gtk.keysyms.Left:
@@ -384,23 +384,23 @@
else:
deltay -= self.pieceheight/2
- if self.check_collisions() == gtk.TRUE:
+ if self.check_collisions() == True:
if deltay > 0:
self.piece_x -= deltax
- return gtk.TRUE
+ return True
self.piece_y += 1
deltay += self.pieceheight
- if self.check_collisions() == gtk.TRUE:
+ if self.check_collisions() == True:
self.piece_x -= deltax
self.piece_y -= 1
- return gtk.TRUE
+ return True
self.piece.move(deltax*(self.piecewidth+self.piecenarrow)/2,
deltay)
- return gtk.TRUE
+ return True
if event.keyval == gtk.keysyms.space:
orig_piece_y = self.piece_y
- while self.check_collisions() == gtk.FALSE:
+ while self.check_collisions() == False:
self.piece_y += 1
self.piece_y -= 1
self.piece.move(0, self.pieceheight*(self.piece_y - orig_piece_y))
@@ -408,17 +408,17 @@
if self.score > self.hiscore:
self.hiscore = self.score
self.update_field()
- if self.top_occupied() != gtk.TRUE:
+ if self.top_occupied() != True:
self.next_piece()
else:
- self.lost = gtk.TRUE
+ self.lost = True
if self.hiscore < self.score:
self.hiscore = self.score
self.update_appbar()
- return gtk.TRUE
+ return True
- return gtk.FALSE
+ return False
def check_collisions(self):
for i in range(len(self.pieces[self.piecenum][self.attitude])):
@@ -429,12 +429,12 @@
else:
deltay = 0
if j + self.piece_x < 0 or j + self.piece_x >= self.cols:
- return gtk.TRUE
+ return True
if ((i + self.piece_y + deltay > 0) and
(i + self.piece_y + deltay >= self.rows or
self.field[i + self.piece_y + deltay][j +
self.piece_x] != 0)):
- return gtk.TRUE
- return gtk.FALSE
+ return True
+ return False
def update_field(self):
for i in range(len(self.pieces[self.piecenum][self.attitude])):
@@ -456,16 +456,16 @@
def collapse_rows(self):
row_points = 50
for i in range(self.rows):
- row_full = gtk.TRUE
+ row_full = True
for j in range(self.cols):
if self.field[i][j] == 0:
- row_full = gtk.FALSE
+ row_full = False
break
- if row_full == gtk.TRUE:
+ if row_full == True:
row_points *= 2
self.speed *= self.speed_ratio
- self.speed_reset = gtk.TRUE
+ self.speed_reset = True
self.rowgroups[i].destroy()
for j in range(i-1, -1, -1):
self.rowgroups[j].move(0, self.pieceheight)
@@ -485,8 +485,8 @@
def top_occupied(self):
for i in range(self.cols):
if self.field[0][i] != 0:
- return gtk.TRUE
- return gtk.FALSE
+ return True
+ return False
if __name__ == '__main__':
h = Hextris()
diff -Nru /tmp/3NUPOdB7eb/ghextris-0.9.0/po/fr.po
/tmp/pe1dNz1PxF/ghextris-0.9.0/po/fr.po
--- /tmp/3NUPOdB7eb/ghextris-0.9.0/po/fr.po 1970-01-01 01:00:00.000000000
+0100
+++ /tmp/pe1dNz1PxF/ghextris-0.9.0/po/fr.po 2006-07-22 19:58:48.000000000
+0200
@@ -0,0 +1,36 @@
+# translation of fr.po to French
+# Julien Rosal <[EMAIL PROTECTED]>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ghextris_0.9.0-1 fr\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-13 02:07+0300\n"
+"PO-Revision-Date: 2005-09-20 19:10+0100\n"
+"Last-Translator: Julien Rosal <[EMAIL PROTECTED]>\n"
+"Language-Team: French <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: FRANCE\n"
+
+#: ghextris.glade.h:1
+msgid "Ghextris"
+msgstr "Ghextris"
+
+#: ghextris.glade.h:2
+msgid "translator_credits"
+msgstr "Traduction fran??aise propos??e par Julien Rosal et debian-l10n-french"
+
+#: ghextris.glade.h:3
+msgid "?? 2004 Mikko Rauhala <[EMAIL PROTECTED]>"
+msgstr "?? 2004 Mikko Rauhala <[EMAIL PROTECTED]>"
+
+#: ghextris.py:336
+msgid "Score"
+msgstr "Score"
+
+#: ghextris.py:337
+msgid "High score"
+msgstr "Meilleur score"
diff -Nru /tmp/3NUPOdB7eb/ghextris-0.9.0/po/sv.po
/tmp/pe1dNz1PxF/ghextris-0.9.0/po/sv.po
--- /tmp/3NUPOdB7eb/ghextris-0.9.0/po/sv.po 1970-01-01 01:00:00.000000000
+0100
+++ /tmp/pe1dNz1PxF/ghextris-0.9.0/po/sv.po 2006-07-22 20:00:41.000000000
+0200
@@ -0,0 +1,37 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <[EMAIL PROTECTED]>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ghextris\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-13 02:07+0300\n"
+"PO-Revision-Date: 2005-12-14 09:58+0100\n"
+"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
+"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ghextris.glade.h:1
+msgid "Ghextris"
+msgstr "Ghextris"
+
+#: ghextris.glade.h:2
+msgid "translator_credits"
+msgstr "Daniel Nylander <[EMAIL PROTECTED]>"
+
+#: ghextris.glade.h:3
+msgid "?? 2004 Mikko Rauhala <[EMAIL PROTECTED]>"
+msgstr "?? 2004 Mikko Rauhala <[EMAIL PROTECTED]>"
+
+#: ghextris.py:336
+msgid "Score"
+msgstr "Rekord"
+
+#: ghextris.py:337
+msgid "High score"
+msgstr "H??gsta rekord"
+
signature.asc
Description: Digital signature
