--- Begin Message ---
Package: thuban
Version: 1.2.2-5
Severity: important
Tags: patch
Tags: sid jessie
User: freewx-ma...@lists.alioth.debian.org
Usertags: wx3.0 wxpy3.0
Control: block 748169 by -1
Control: block 755757 by -1
We're aiming to migrate the archive to using wxwidgets3.0/wxpython3.0
instead of wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie
is released.
I've built thuban with the attached patch. It starts up OK, and I can
open the "About" dialog, create a new session and toggle the map legend.
However, I don't have any shape files so can't test further. And it
would be better if someone more familiar with the package did a thorough
test.
I'm happy to NMU this change if you wish me to - just let me know.
Cheers,
Olly
diff -Nru thuban-1.2.2/debian/changelog thuban-1.2.2/debian/changelog
--- thuban-1.2.2/debian/changelog 2014-01-12 22:08:20.000000000 +1300
+++ thuban-1.2.2/debian/changelog 2014-08-07 11:52:37.000000000 +1200
@@ -1,3 +1,10 @@
+thuban (1.2.2-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update to use wxWidgets 3.0 - drop wxpython.patch, add wxpython3.0.patch.
+
+ -- Olly Betts <o...@survex.com> Thu, 07 Aug 2014 11:52:34 +1200
+
thuban (1.2.2-5) unstable; urgency=low
* Bump Standards-Version to 3.9.5, no changes required.
diff -Nru thuban-1.2.2/debian/control thuban-1.2.2/debian/control
--- thuban-1.2.2/debian/control 2014-01-12 22:08:20.000000000 +1300
+++ thuban-1.2.2/debian/control 2014-08-07 11:25:35.000000000 +1200
@@ -6,10 +6,11 @@
Priority: optional
Build-Depends: debhelper (>= 9),
python-all-dev (>= 2.6.6-3~),
- python-wxgtk2.8,
+ python-wxgtk3.0,
+ python-wxgtk3.0-dev,
libproj-dev,
libgdal-dev,
- libwxgtk2.8-dev,
+ libwxgtk3.0-dev,
docbook-utils,
docbook-xsl,
docbook-xml,
@@ -25,7 +26,7 @@
Depends: ${shlibs:Depends},
${python:Depends},
gdal-bin,
- python-wxgtk2.8,
+ python-wxgtk3.0,
python-sqlite,
${misc:Depends}
Recommends: python-psycopg2,
diff -Nru thuban-1.2.2/debian/patches/series thuban-1.2.2/debian/patches/series
--- thuban-1.2.2/debian/patches/series 2014-01-12 22:08:20.000000000 +1300
+++ thuban-1.2.2/debian/patches/series 2014-08-07 11:47:58.000000000 +1200
@@ -1,5 +1,5 @@
locale.patch
setup.patch
bitmappath.patch
-wxpython.patch
gdal.patch
+wxpython3.0.patch
diff -Nru thuban-1.2.2/debian/patches/wxpython3.0.patch thuban-1.2.2/debian/patches/wxpython3.0.patch
--- thuban-1.2.2/debian/patches/wxpython3.0.patch 1970-01-01 12:00:00.000000000 +1200
+++ thuban-1.2.2/debian/patches/wxpython3.0.patch 2014-08-07 12:47:33.000000000 +1200
@@ -0,0 +1,121 @@
+Description: wxPython 3.0 support
+ Note: wxPython and wxWidgets are now separate source packages, so we only
+ want to check that the major and minor versions match.
+Author: Olly Betts <o...@survex.com>
+Last-Update: 2014-08-06
+
+--- a/thuban.py
++++ b/thuban.py
+@@ -11,7 +11,7 @@
+ import Thuban
+
+ import wxversion
+-wxversion.select("2.8")
++wxversion.select("3.0")
+
+ # Put the Lib dir into the path. The Lib dir contains some extra non
+ # really Thuban specific Python modules
+--- a/setup.py
++++ b/setup.py
+@@ -71,7 +71,7 @@
+
+ # On POSIX-systems we run wxgtk-config to determine the C++-compiler
+ # flags
+- wx_config_script = "wx-config --version=2.8"
++ wx_config_script = "wx-config --version=3.0"
+ # These lists will be filled automatically below
+ wx_cs_params = [[] for i in range(CS_NUM_PARAMS)]
+
+--- a/Thuban/version.py
++++ b/Thuban/version.py
+@@ -201,7 +201,7 @@
+
+ # Check whether the wxWindows version of wxPython and thuban's
+ # wxproj module match. If they don't match, segfaults are likely.
+- if versions["wxproj-wx-tuple"] != versions["wxPython-tuple"][:3]:
++ if versions["wxproj-wx-tuple"][:2] != versions["wxPython-tuple"][:2]:
+ errors.append(_("Thuban was compiled with wx %(wxproj-wx)s"
+ " but wxPython is %(wxPython)s")
+ % versions)
+--- a/Extensions/ogr/ogrdialog.py
++++ b/Extensions/ogr/ogrdialog.py
+@@ -36,7 +36,7 @@
+ """Initialize the dialog.
+ """
+ wx.Dialog.__init__(self, parent, -1, _("Choose file format"),
+- style = wx.DIALOG_MODAL|wx.CAPTION)
++ style = wx.CAPTION)
+ self.session = session
+ self.tables = []
+
+@@ -116,7 +116,7 @@
+ """Initialize the dialog.
+ """
+ wx.Dialog.__init__(self, parent, -1, _("Choose layer"),
+- style = wx.DIALOG_MODAL|wx.CAPTION)
++ style = wx.CAPTION)
+ self.tables = []
+
+ #
+@@ -200,7 +200,7 @@
+ """Initialize the dialog.
+ """
+ wx.Dialog.__init__(self, parent, -1, _("Choose layer from database"),
+- style = wx.DIALOG_MODAL|wx.CAPTION)
++ style = wx.CAPTION)
+ self.session = session
+ self.dbconns = self.session.DBConnections()
+ self.tables = []
+@@ -348,7 +348,7 @@
+ """Initialize the dialog.
+ """
+ wx.Dialog.__init__(self, parent, -1, "Enter string for OGRConnection",
+- style = wx.DIALOG_MODAL|wx.CAPTION)
++ style = wx.CAPTION)
+ self.session = session
+
+ # Sizer for the entire dialog
+--- a/Thuban/UI/dbdialog.py
++++ b/Thuban/UI/dbdialog.py
+@@ -40,7 +40,7 @@
+
+ def __init__(self, parent, session):
+ wx.Dialog.__init__(self, parent, -1, _("Choose layer from database"),
+- style = wx.DIALOG_MODAL|wx.CAPTION)
++ style = wx.CAPTION)
+ self.session = session
+ self.dbconns = self.session.DBConnections()
+ self.tables = []
+--- a/Thuban/UI/exceptiondialog.py
++++ b/Thuban/UI/exceptiondialog.py
+@@ -23,7 +23,7 @@
+ def __init__(self, parent, message, title = _('Thuban: Internal Error')):
+ wx.Dialog.__init__(self, parent, -1, title,
+ wx.DefaultPosition,
+- style = wx.RESIZE_BORDER|wx.CAPTION|wx.DIALOG_MODAL)
++ style = wx.RESIZE_BORDER|wx.CAPTION)
+
+ self.parent = parent
+ self.dialog_layout(message)
+--- a/Thuban/UI/labeldialog.py
++++ b/Thuban/UI/labeldialog.py
+@@ -25,7 +25,7 @@
+ def __init__(self, parent, table, shape_index):
+ wx.Dialog.__init__(self, parent, -1, _("Label Values"),
+ wx.DefaultPosition,
+- style = wx.RESIZE_BORDER|wx.CAPTION|wx.DIALOG_MODAL)
++ style = wx.RESIZE_BORDER|wx.CAPTION)
+
+ self.parent = parent
+ self.dialog_layout(table, shape_index)
+--- a/Extensions/mouseposition/mouseposition.py
++++ b/Extensions/mouseposition/mouseposition.py
+@@ -101,7 +101,7 @@
+ # locator executed as an tool/extension to Thuban
+ iconfile = os.path.join(os.path.abspath(Thuban.__path__[0]),
+ "..", "Resources", "Bitmaps", "identify")
+-iconfile = os.path.join(os.path.abspath(os.path.dirname(__file__)),
++iconfile = os.path.join('/usr/share/thuban/Extensions/mouseposition',
+ 'position')
+ registry.Add(ToolCommand("mouse_position_tool", "Mouse Position Tool",
+ mouse_position_tool, icon = iconfile,
diff -Nru thuban-1.2.2/debian/patches/wxpython.patch thuban-1.2.2/debian/patches/wxpython.patch
--- thuban-1.2.2/debian/patches/wxpython.patch 2014-01-12 22:08:20.000000000 +1300
+++ thuban-1.2.2/debian/patches/wxpython.patch 1970-01-01 12:00:00.000000000 +1200
@@ -1,16 +0,0 @@
-Description: Select wx version 2.8.
-Author: Francesco Paolo Lovergine <fran...@debian.org>
-Last-Update: 2011-11-03
-
---- a/thuban.py
-+++ b/thuban.py
-@@ -8,6 +8,9 @@
- # Read the file COPYING coming with Thuban for details.
-
- import sys, os
-+import wxversion
-+wxversion.select("2.8")
-+
- import Thuban
-
- import wxversion
--- End Message ---
