Package: ftp.debian.org

I'm trying to get wxwidgets2.6 removed.  Currently the only thing
preventing removal (at least according to dak rm on ries) is that xaralx
has i386 binaries.  Since xaralx is in non-free and not auto-built, I asked
the maintainer (Joachim Breitner - Cc-ed on this message) if I should
request removal or if he could update the i386 binaries, and he replied:

Joachim Breitner <nome...@debian.org> writes:
> Am Montag, den 05.12.2011, 01:15 +0000 schrieb Olly Betts:
> > It doesn't look like xaralx is on the list of non-free packages which
> > can safely be auto-built, so I assume somebody did a porter upload of
> > the current i386 binaries (perhaps you?)
> >
> > Should I just request these be removed, or would you prefer to upload
> > newer i386 binaries?
>
> I just tried to compile it in a i386 chroot, but the build failed, and I
> won't debug this very soon. So feel free to request removal.

I'm taking that as "RoM".

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	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 <o...@survex.com>  Sun, 16 Oct 2011 11:29:22 +0000
+
 xpilot-ng (1:4.7.3-1.2) unstable; urgency=low
 
   [ Jari Aalto ]
diff -Nru xpilot-ng-4.7.3/debian/control xpilot-ng-4.7.3/debian/control
--- xpilot-ng-4.7.3/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 -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	1970-01-01 12:00:00.000000000 +1200
+++ xpilot-ng-4.7.3/debian/patches/series	2011-10-17 03:13:14.000000000 +1300
@@ -0,0 +1 @@
+use-wxwidgets2.8.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	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

Reply via email to