diff -Nru /tmp/ZguLZAUkzs/poker-network-1.1.1/debian/changelog /tmp/gZlAXSUzLc/poker-network-1.1.1/debian/changelog --- /tmp/ZguLZAUkzs/poker-network-1.1.1/debian/changelog 2007-09-12 16:11:28.000000000 +0000 +++ /tmp/gZlAXSUzLc/poker-network-1.1.1/debian/changelog 2007-09-12 16:11:29.000000000 +0000 @@ -1,3 +1,15 @@ +poker-network (1.1.1-1ubuntu2) gutsy; urgency=low + + * Fix poker-web installation issue (LP: #138836): + - Add dbconfig-common (preinst required) as Pre-Depends + + * Fix SIGSEGV on start-up for poker2d (LP: #137573): + - Add simple-patchsys.mk to debian/rules + - Add 00-fix-double-initdisplay.patch patch in debian/patches + - Add 01-fix-glade-autoconnect.patch in debian/patches + + -- Johan Euphrosine Wed, 12 Sep 2007 18:01:32 +0200 + poker-network (1.1.1-1ubuntu1) gutsy; urgency=low * Merge from Debian unstable (LP: #131670). Remaining Ubuntu changes: diff -Nru /tmp/ZguLZAUkzs/poker-network-1.1.1/debian/control /tmp/gZlAXSUzLc/poker-network-1.1.1/debian/control --- /tmp/ZguLZAUkzs/poker-network-1.1.1/debian/control 2007-09-12 16:11:28.000000000 +0000 +++ /tmp/gZlAXSUzLc/poker-network-1.1.1/debian/control 2007-09-12 16:11:29.000000000 +0000 @@ -45,7 +45,8 @@ Section: web Priority: optional Architecture: all -Depends: ${misc:Depends}, dbconfig-common, ucf, php5 | php5-cgi, php5-mysql, php5-gd, apache2, php-pear, gettext +Pre-Depends: dbconfig-common +Depends: ${misc:Depends}, ucf, php5 | php5-cgi, php5-mysql, php5-gd, apache2, php-pear, gettext Description: Web interface to a poker-network server Play poker with other players connected on a poker-network server (holdem, omaha, omaha high/low, stud 7 ...) in ring games, sit and go diff -Nru /tmp/ZguLZAUkzs/poker-network-1.1.1/debian/patches/00-fix-double-initdisplay.patch /tmp/gZlAXSUzLc/poker-network-1.1.1/debian/patches/00-fix-double-initdisplay.patch --- /tmp/ZguLZAUkzs/poker-network-1.1.1/debian/patches/00-fix-double-initdisplay.patch 1970-01-01 00:00:00.000000000 +0000 +++ /tmp/gZlAXSUzLc/poker-network-1.1.1/debian/patches/00-fix-double-initdisplay.patch 2007-09-12 16:11:29.000000000 +0000 @@ -0,0 +1,67 @@ +diff -Nur poker-network-1.1.1/pokerclient2d/poker2d.py poker-network-1.1.1.new/pokerclient2d/poker2d.py +--- poker-network-1.1.1/pokerclient2d/poker2d.py 2007-09-02 22:30:14.000000000 +0200 ++++ poker-network-1.1.1.new/pokerclient2d/poker2d.py 2007-09-05 21:12:13.000000000 +0200 +@@ -189,7 +189,6 @@ + def __init__(self, *args, **kwargs): + PokerClientFactory.__init__(self, *args, **kwargs) + +- self.initDisplay() + if self.settings.headerGet("/settings/@batch") != "yes": + self.skin = PokerSkin2D(settings = self.settings) + self.renderer = PokerRenderer(self) +diff -Nur poker-network-1.1.1/tests/test-poker2d.py.in poker-network-1.1.1.new/tests/test-poker2d.py.in +--- poker-network-1.1.1/tests/test-poker2d.py.in 2007-09-02 22:30:14.000000000 +0200 ++++ poker-network-1.1.1.new/tests/test-poker2d.py.in 2007-09-05 21:16:06.000000000 +0200 +@@ -33,6 +33,7 @@ + sys.path.insert(0, "..") + sys.path.insert(0, "@top_srcdir@/pokerclient2d") + sys.path.insert(0, "../pokerclient2d/.libs") ++ + import poker2d + import platform + +@@ -43,6 +44,34 @@ + def configOk(self): + pass + ++from pokerui.pokerinterface import PokerInterface ++def updateMenuMockup(instance, settings): ++ pass ++PokerInterface.updateMenu = updateMenuMockup ++class PokerClientFactory2DMockup(poker2d.PokerClientFactory2D): ++ initDisplayCount = 0 ++ def __init__(self): ++ class SettingsMockup: ++ path = "" ++ def headerGetInt(self, path): ++ return 0 ++ def headerGet(self, path): ++ if path == '/settings/data/@path': ++ return '@top_srcdir@/pokerclient2d/data' ++ elif path == '/settings/@verbose': ++ return "0" ++ elif path == '/sequence/chips': ++ return "0 1 2 3" ++ return "" ++ def headerGetProperties(self, path): ++ return {0:{'position':0, 'serial':0,'currency_serial':0},'currency_serial':0} ++ def notifyUpdates(self, updated): ++ pass ++ poker2d.PokerClientFactory2D.__init__(self, self, settings = SettingsMockup(), config = SettingsMockup()) ++ def initDisplay(self): ++ self.initDisplayCount += 1 ++ ++ + class Poker2DTestCase(unittest.TestCase): + def testConfigFileOnWindows(self): + poker2d.Main = MainMockup +@@ -52,6 +81,9 @@ + poker2d.run("", None, None) + self.assertEqual(MainMockup.instance.settings, "conf/poker2d/poker2d.xml") + platform.system = system ++ def testPokerClientFactory2D(self): ++ client = PokerClientFactory2DMockup() ++ self.assertEqual(1, client.initDisplayCount) + + if __name__ == '__main__': + unittest.main() diff -Nru /tmp/ZguLZAUkzs/poker-network-1.1.1/debian/patches/01-fix-glade-autoconnect.patch /tmp/gZlAXSUzLc/poker-network-1.1.1/debian/patches/01-fix-glade-autoconnect.patch --- /tmp/ZguLZAUkzs/poker-network-1.1.1/debian/patches/01-fix-glade-autoconnect.patch 1970-01-01 00:00:00.000000000 +0000 +++ /tmp/gZlAXSUzLc/poker-network-1.1.1/debian/patches/01-fix-glade-autoconnect.patch 2007-09-12 16:11:29.000000000 +0000 @@ -0,0 +1,51 @@ +diff -Nur poker-network-1.1.1/pokerclient2d/gamewindow.py poker-network-1.1.1.new/pokerclient2d/gamewindow.py +--- poker-network-1.1.1/pokerclient2d/gamewindow.py 2007-02-14 14:16:54.000000000 +0000 ++++ poker-network-1.1.1.new/pokerclient2d/gamewindow.py 2007-09-06 18:50:14.000000000 +0000 +@@ -26,13 +26,12 @@ + # + + import gtk +-import gtk.glade + import unittest + + class GameWindowGlade: +- def __init__(self, glade_file): ++ def __init__(self, glade): + self.widgets = {} +- self.glade = gtk.glade.XML(glade_file) ++ self.glade = glade + window = self.glade.get_widget('game_window') + fixed = self.glade.get_widget('game_window_fixed') + window.remove(fixed) +@@ -147,7 +146,6 @@ + for name, widget in self.widgets.iteritems(): + method = getattr(instance, "on_%s_clicked" % name, None) + if method: widget.connect("clicked", method) +- return self.glade.signal_autoconnect(instance) + + if __name__ == '__main__': + glade = GameWindowGlade('data/interface/table/mockup.glade') +diff -Nur poker-network-1.1.1/pokerclient2d/pokerdisplay2d.py poker-network-1.1.1.new/pokerclient2d/pokerdisplay2d.py +--- poker-network-1.1.1/pokerclient2d/pokerdisplay2d.py 2007-04-19 17:31:03.000000000 +0000 ++++ poker-network-1.1.1.new/pokerclient2d/pokerdisplay2d.py 2007-09-06 18:50:14.000000000 +0000 +@@ -396,8 +396,11 @@ + if exists(gtkrc): + gtk.rc_parse(gtkrc) + glade_file = self.datadir + "/interface/table/mockup.glade" ++ glade = gtk.glade.XML(glade_file) ++ glade.signal_autoconnect(self) + from gamewindow import GameWindowGlade +- self.glade = GameWindowGlade(glade_file) ++ self.glade = GameWindowGlade(glade) ++ self.glade.signal_autoconnect(self) + self.actions = { + "call": self.glade.get_widget("call"), + "raise": self.glade.get_widget("raise"), +@@ -412,7 +415,6 @@ + "fold": self.glade.get_widget("fold"), + } + self.switch = self.glade.get_widget("switch") +- self.glade.signal_autoconnect(self) + # self.actions['check'].add_accelerator("clicked", gtk.AccelGroup(), gtk.gdk.keyval_from_name("p"), gtk.gdk.MOD1_MASK, gtk.ACCEL_VISIBLE) + + self.animations = pokeranimation2d.create(self.glade, config, settings) diff -Nru /tmp/ZguLZAUkzs/poker-network-1.1.1/debian/rules /tmp/gZlAXSUzLc/poker-network-1.1.1/debian/rules --- /tmp/ZguLZAUkzs/poker-network-1.1.1/debian/rules 2007-09-12 16:11:28.000000000 +0000 +++ /tmp/gZlAXSUzLc/poker-network-1.1.1/debian/rules 2007-09-12 16:11:29.000000000 +0000 @@ -12,6 +12,7 @@ export PKG_CONFIG_PATH=/usr/share/pkgconfig include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk clean:: # $(DEB_BUILDDIR)/config.status rm -f $(DEB_SRCDIR)/*cdbs-*