Package: xpilot-ng-common
Version: 1:4.7.3-1.2
Tags: patch
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 tried patching xpilot-ng to use wxwidgets2.8, and xpngcc (which is
the only part to use wxwidgets AFAICS) seems to work equally well.
I noticed you're on the LowThresholdNMU list and I have prepared an NMU,
but I'm not previously familiar with this package, so I'm attaching the
diff to give you a chance to comment on it.
Cheers,
Olly
diff -ruN xpilot-ng-4.7.3.orig/debian/changelog xpilot-ng-4.7.3/debian/changelog
--- xpilot-ng-4.7.3.orig/debian/changelog 2010-06-03 06:03:29.000000000 +1200
+++ xpilot-ng-4.7.3/debian/changelog 2011-10-17 00:30:48.000000000 +1300
@@ -1,3 +1,11 @@
+xpilot-ng (1:4.7.3-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/control: Update dependency on python-wxgtk2.6 to python-wxgtk2.8.
+ * Add patch use-wxwidgets2.8.patch to use wxwidgets2.8 by default.
+
+ -- Olly Betts <[email protected]> Sun, 16 Oct 2011 11:29:22 +0000
+
xpilot-ng (1:4.7.3-1.2) unstable; urgency=low
[ Jari Aalto ]
diff -ruN xpilot-ng-4.7.3.orig/debian/control xpilot-ng-4.7.3/debian/control
--- xpilot-ng-4.7.3.orig/debian/control 2010-06-03 06:03:29.000000000 +1200
+++ xpilot-ng-4.7.3/debian/control 2011-10-17 00:20:30.000000000 +1300
@@ -23,7 +23,7 @@
Package: xpilot-ng-common
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk2.6, python-irclib, ttf-freefont, ttf-bitstream-vera
+Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk2.8, python-irclib, 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 -ruN xpilot-ng-4.7.3.orig/debian/patches/use-wxwidgets2.8.patch xpilot-ng-4.7.3/debian/patches/use-wxwidgets2.8.patch
--- xpilot-ng-4.7.3.orig/debian/patches/use-wxwidgets2.8.patch 1970-01-01 12:00:00.000000000 +1200
+++ xpilot-ng-4.7.3/debian/patches/use-wxwidgets2.8.patch 2011-10-17 00:28:17.000000000 +1300
@@ -0,0 +1,21 @@
+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
