Package: xpilot-ng
Version: 1:4.7.3-2
Severity: important
Tags: patch sid jessie
User: [email protected]
Usertags: wxpy3.0
Control: block 755757 by -1
We're aiming to migrate the archive to using wxpython3.0 instead of
wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie is released.
I've rebuilt xpilot-ng with the attached patch, and tested it works
with wxPython 3.0, and everything seems to be fine.
I'm happy to NMU these changes.
Cheers,
Olly
diff -Nru xpilot-ng-4.7.3/debian/changelog xpilot-ng-4.7.3/debian/changelog
--- xpilot-ng-4.7.3/debian/changelog 2013-11-11 00:38:35.000000000 +1300
+++ xpilot-ng-4.7.3/debian/changelog 2014-08-08 17:10:32.000000000 +1200
@@ -1,3 +1,12 @@
+xpilot-ng (1:4.7.3-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control: Update dependency on python-wxgtk2.8 to python-wxgtk3.0.
+ * Update patch use-wxwidgets2.8.patch to use wxwidgets3.0 by default and
+ rename to use-wxwidgets3.0.patch.
+
+ -- Olly Betts <[email protected]> Fri, 08 Aug 2014 17:10:32 +1200
+
xpilot-ng (1:4.7.3-2) unstable; urgency=low
* Add [email protected] to Uploaders in control file (discussed with
diff -Nru xpilot-ng-4.7.3/debian/control xpilot-ng-4.7.3/debian/control
--- xpilot-ng-4.7.3/debian/control 2013-11-11 00:12:02.000000000 +1300
+++ xpilot-ng-4.7.3/debian/control 2014-08-08 17:07:29.000000000 +1200
@@ -24,7 +24,7 @@
Package: xpilot-ng-common
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk2.8, python-irc, ttf-freefont, ttf-bitstream-vera
+Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk3.0, python-irc, ttf-freefont, ttf-bitstream-vera
Suggests: xpilot-ng-server, xpilot-ng-utils, xpilot-ng-client-x11, xpilot-ng-client-sdl
Description: Common files for XPilot NG
XPilot is a multi-player tactical manoeuvring game for X. Each
diff -Nru xpilot-ng-4.7.3/debian/patches/series xpilot-ng-4.7.3/debian/patches/series
--- xpilot-ng-4.7.3/debian/patches/series 2013-11-10 23:37:39.000000000 +1300
+++ xpilot-ng-4.7.3/debian/patches/series 2014-08-08 17:11:01.000000000 +1200
@@ -1,3 +1,3 @@
-use-wxwidgets2.8.patch
+use-wxwidgets3.0.patch
cannons-pickup-items.patch
use-python-irc.patch
diff -Nru xpilot-ng-4.7.3/debian/patches/use-wxwidgets2.8.patch xpilot-ng-4.7.3/debian/patches/use-wxwidgets2.8.patch
--- xpilot-ng-4.7.3/debian/patches/use-wxwidgets2.8.patch 2011-10-17 00:28:17.000000000 +1300
+++ xpilot-ng-4.7.3/debian/patches/use-wxwidgets2.8.patch 1970-01-01 12:00:00.000000000 +1200
@@ -1,21 +0,0 @@
-Seems to work fine with wxPython 2.8. At least for Debian (and probably for
-the rest of the world too), 2.4 and 2.5 are totally irrelevant now, and we're
-aiming to remove 2.6 before wheezy.
-
---- xpilot-ng-4.7.3/contrib/xpngcc/xpngcc.py Fri Mar 5 14:03:50 2010
-+++ xpilot-ng-4.7.3/contrib/xpngcc/xpngcc.py Mon Oct 17 00:26:33 2011
-@@ -2,12 +2,9 @@
-
- import wxversion
- try:
-- wxversion.select('2.6')
-+ wxversion.select('2.8')
- except wxversion.VersionError:
-- try:
-- wxversion.select('2.4')
-- except wxversion.VersionError:
-- wxversion.select('2.5')
-+ wxversion.select('2.6')
- import wx
- import wx.html as html
- import os
diff -Nru xpilot-ng-4.7.3/debian/patches/use-wxwidgets3.0.patch xpilot-ng-4.7.3/debian/patches/use-wxwidgets3.0.patch
--- xpilot-ng-4.7.3/debian/patches/use-wxwidgets3.0.patch 1970-01-01 12:00:00.000000000 +1200
+++ xpilot-ng-4.7.3/debian/patches/use-wxwidgets3.0.patch 2014-08-08 17:09:29.000000000 +1200
@@ -0,0 +1,21 @@
+Seems to work fine with wxPython 3.0. At least for Debian (and probably for
+the rest of the world too), anything before 2.8 is totally irrelevant now, and
+we're aiming to remove 2.8 before jessie.
+
+--- xpilot-ng-4.7.3/contrib/xpngcc/xpngcc.py Fri Mar 5 14:03:50 2010
++++ xpilot-ng-4.7.3/contrib/xpngcc/xpngcc.py Mon Oct 17 00:26:33 2011
+@@ -2,12 +2,9 @@
+
+ import wxversion
+ try:
+- wxversion.select('2.6')
++ wxversion.select('3.0')
+ except wxversion.VersionError:
+- try:
+- wxversion.select('2.4')
+- except wxversion.VersionError:
+- wxversion.select('2.5')
++ wxversion.select('2.8')
+ import wx
+ import wx.html as html
+ import os
