Package: londonlaw
Version: 0.2.1-15
Severity: normal
Tags: patch
User: [email protected]
Usertags: wx2.6to2.8

I'm trying to get packages to migrate from wxwidgets2.6 to wxwidgets2.8
so we can remove the former from the archive - it's no longer supported
upstream, and wxwidgets3.0 is supposed to be out early next year.

I've tried patching londonlaw as per the attached patch, and I can
successfully play a game against myself with the patched version.
However, I'm not familiar with the package, so I think more thorough
testing would be appropriate.

Cheers,
    Olly
diff -Nru londonlaw-0.2.1/debian/changelog londonlaw-0.2.1/debian/changelog
--- londonlaw-0.2.1/debian/changelog	2011-06-05 10:10:50.000000000 +1200
+++ londonlaw-0.2.1/debian/changelog	2011-10-18 23:08:27.000000000 +1300
@@ -1,3 +1,10 @@
+londonlaw (0.2.1-15.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update to use python-wxgtk2.8.
+
+ -- Olly Betts <[email protected]>  Tue, 18 Oct 2011 10:07:35 +0000
+
 londonlaw (0.2.1-15) unstable; urgency=low
 
   * Team upload.
diff -Nru londonlaw-0.2.1/debian/control londonlaw-0.2.1/debian/control
--- londonlaw-0.2.1/debian/control	2011-06-05 10:10:34.000000000 +1200
+++ londonlaw-0.2.1/debian/control	2011-10-18 23:04:48.000000000 +1300
@@ -13,7 +13,7 @@
 
 Package: londonlaw
 Architecture: all
-Depends: python-wxgtk2.6, ${python:Depends}, python-twisted-core, python-zopeinterface, ${misc:Depends}
+Depends: python-wxgtk2.8, ${python:Depends}, python-twisted-core, python-zopeinterface, ${misc:Depends}
 Description: Scotland Yard board game with network support
  London Law is an online multiplayer adaptation of the classic Scotland Yard
  board game (also see Wikipedia), first published by Ravensburger in 1983. The
diff -Nru londonlaw-0.2.1/debian/patches/01_wx24_fix.patch londonlaw-0.2.1/debian/patches/01_wx24_fix.patch
--- londonlaw-0.2.1/debian/patches/01_wx24_fix.patch	2011-03-26 09:16:21.000000000 +1300
+++ londonlaw-0.2.1/debian/patches/01_wx24_fix.patch	1970-01-01 12:00:00.000000000 +1200
@@ -1,16 +0,0 @@
-diff -Nur londonlaw-0.2.1/londonlaw/guiclient/__init__.py londonlaw-0.2.1.new/londonlaw/guiclient/__init__.py
---- londonlaw-0.2.1/londonlaw/guiclient/__init__.py	2005-07-06 02:45:05.000000000 +0200
-+++ londonlaw-0.2.1.new/londonlaw/guiclient/__init__.py	2005-08-23 02:34:54.000000000 +0200
-@@ -23,6 +23,12 @@
- 
- from twisted.internet import protocol, reactor
- from twisted.python import log
-+import wxversion
-+try:
-+	wxversion.select("2.6")
-+except wxversion.VersionError:
-+	wxversion.select("2.4")
-+
- from wxPython.wx import *
- from ConnectWindow import *
- from GameListWindow import *
diff -Nru londonlaw-0.2.1/debian/patches/01_wx28_fix.patch londonlaw-0.2.1/debian/patches/01_wx28_fix.patch
--- londonlaw-0.2.1/debian/patches/01_wx28_fix.patch	1970-01-01 12:00:00.000000000 +1200
+++ londonlaw-0.2.1/debian/patches/01_wx28_fix.patch	2011-10-18 23:06:48.000000000 +1300
@@ -0,0 +1,16 @@
+diff -Nur londonlaw-0.2.1/londonlaw/guiclient/__init__.py londonlaw-0.2.1.new/londonlaw/guiclient/__init__.py
+--- londonlaw-0.2.1/londonlaw/guiclient/__init__.py	2005-07-06 02:45:05.000000000 +0200
++++ londonlaw-0.2.1.new/londonlaw/guiclient/__init__.py	2005-08-23 02:34:54.000000000 +0200
+@@ -23,6 +23,12 @@
+ 
+ from twisted.internet import protocol, reactor
+ from twisted.python import log
++import wxversion
++try:
++	wxversion.select("2.8")
++except wxversion.VersionError:
++	wxversion.select("2.6")
++
+ from wxPython.wx import *
+ from ConnectWindow import *
+ from GameListWindow import *
diff -Nru londonlaw-0.2.1/debian/patches/series londonlaw-0.2.1/debian/patches/series
--- londonlaw-0.2.1/debian/patches/series	2011-03-26 09:16:21.000000000 +1300
+++ londonlaw-0.2.1/debian/patches/series	2011-10-18 23:07:17.000000000 +1300
@@ -1,2 +1,2 @@
-01_wx24_fix.patch
+01_wx28_fix.patch
 python-zope-fixes.patch

Reply via email to