Bug#757308: grass: Please update to use wxpython3.0
On Thu, Aug 07, 2014 at 10:52:42AM +0200, Sebastiaan Couwenberg wrote: On 08/07/2014 06:56 AM, Olly Betts wrote: It looks like grass 7.0.0 will be compatible with wxPython 3.0 - I see in http://trac.osgeo.org/grass/wiki/Release/7.0.0beta-News the entry: | wxPython 3 compatibility fixes So updating the package to this version seems the simplest fix. In theory this is a good idea. But updating from grass 6.4.3 to 7.0.0 will require a transition, which we are unlikely to get in shape before the freeze in November. Ah, I didn't appreciate there were rdeps which would need to be updated for this too. Updating from grass 6.4.3 to 6.4.4 is more in the realm of possibilities, so we'll need to look into backporting the wxPython 3.0 changes to that. I've been working on a script to assist updating code to work with wxPython3, which might be helpful here if the python code in grass has changed a lot between 6.4.x and 7.0.0 such that backporting the changes is difficult: http://anonscm.debian.org/gitweb/?p=collab-maint/wx-migration-tools.git;a=summary I tried it on the 6.4.3 package, and with a bit of manual tweaking the startup wizard works, but the GUI after that doesn't. I'll send the debdiff of that in case it's useful. Cheers, Olly ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#757308: grass: Partial patch for wxpython3 support in 6.4.3-3
Here's the patch I mentioned in my previous comment.
Cheers,
Olly
diff -Nru grass-6.4.3/debian/changelog grass-6.4.3/debian/changelog
--- grass-6.4.3/debian/changelog 2013-12-17 00:51:16.0 +1300
+++ grass-6.4.3/debian/changelog 2014-08-16 16:05:18.0 +1200
@@ -1,3 +1,12 @@
+grass (6.4.3-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update to depend on python-wxgtk3.0 rather than python-wxgtk2.8.
+- new patch: wxpy3.0-compat.patch
+ * Drop Build-Conflicts: wx2.6-headers as wx2.6 was removed pre-wheezy.
+
+ -- Olly Betts o...@survex.com Sat, 16 Aug 2014 16:04:44 +1200
+
grass (6.4.3-3) unstable; urgency=medium
* Now b-d on current libgdal-dev.
diff -Nru grass-6.4.3/debian/control grass-6.4.3/debian/control
--- grass-6.4.3/debian/control 2013-12-17 00:51:16.0 +1300
+++ grass-6.4.3/debian/control 2014-08-07 14:51:24.0 +1200
@@ -27,17 +27,17 @@
libproj-dev, proj-bin,
libreadline-dev | libreadline6-dev,
libsqlite3-dev,
+ libwxgtk3.0-dev,
libxmu-dev,
#install optipng if compressing the PNG images in the programmers' manual
# optipng,
python (= 2.6.6-3~),
- python-wxgtk2.8, libwxgtk2.8-dev,
+ python-wxgtk3.0,
python-dev,
tcl-dev (= 8.5), tk-dev (= 8.5),
unixodbc-dev,
hardening-includes
Standards-Version: 3.9.5
-Build-Conflicts: wx2.6-headers
Homepage: http://grass.osgeo.org/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/grass.git
Vcs-Git: git://git.debian.org/git/pkg-grass/grass.git
@@ -109,7 +109,7 @@
Depends: ${shlibs:Depends},
grass-core,
${python:Depends},
- python-wxgtk2.8,
+ python-wxgtk3.0,
# pyGL needed for wxNviz
python-opengl,
xterm | x-terminal-emulator,
diff -Nru grass-6.4.3/debian/control.in grass-6.4.3/debian/control.in
--- grass-6.4.3/debian/control.in 2013-12-17 00:51:16.0 +1300
+++ grass-6.4.3/debian/control.in 2014-08-07 14:51:12.0 +1200
@@ -27,17 +27,17 @@
libproj-dev, proj-bin,
libreadline-dev | libreadline6-dev,
libsqlite3-dev,
+ libwxgtk3.0-dev,
libxmu-dev,
#install optipng if compressing the PNG images in the programmers' manual
# optipng,
python (= 2.6.6-3~),
- python-wxgtk2.8, libwxgtk2.8-dev,
+ python-wxgtk3.0,
python-dev,
tcl-dev (= 8.5), tk-dev (= 8.5),
unixodbc-dev,
hardening-includes
Standards-Version: 3.9.5
-Build-Conflicts: wx2.6-headers
Homepage: http://grass.osgeo.org/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/grass.git
Vcs-Git: git://git.debian.org/git/pkg-grass/grass.git
@@ -109,7 +109,7 @@
Depends: ${shlibs:Depends},
grass-core,
${python:Depends},
- python-wxgtk2.8,
+ python-wxgtk3.0,
# pyGL needed for wxNviz
python-opengl,
xterm | x-terminal-emulator,
diff -Nru grass-6.4.3/debian/patches/series grass-6.4.3/debian/patches/series
--- grass-6.4.3/debian/patches/series 2013-12-17 00:51:16.0 +1300
+++ grass-6.4.3/debian/patches/series 2014-08-07 15:40:42.0 +1200
@@ -7,3 +7,4 @@
barscale_ui
svn-any-version
fix_big-endian_issues
+wxpy3.0-compat.patch
diff -Nru grass-6.4.3/debian/patches/wxpy3.0-compat.patch grass-6.4.3/debian/patches/wxpy3.0-compat.patch
--- grass-6.4.3/debian/patches/wxpy3.0-compat.patch 1970-01-01 12:00:00.0 +1200
+++ grass-6.4.3/debian/patches/wxpy3.0-compat.patch 2014-08-16 18:01:04.0 +1200
@@ -0,0 +1,556 @@
+Description: Fix to work with wxPython 3.0
+Author: Olly Betts o...@survex.com
+Last-Update: 2014-08-16
+
+--- a/gui/wxpython/wxplot/profile.py
b/gui/wxpython/wxplot/profile.py
+@@ -291,7 +291,7 @@
+ if len(self.seglist) 0 :
+ self.ppoints = plot.PolyMarker(self.seglist,
+legend = ' ' + self.properties['marker']['legend'],
+- colour = wx.Color(self.properties['marker']['color'][0],
++ colour = wx.Colour(self.properties['marker']['color'][0],
+self.properties['marker']['color'][1],
+self.properties['marker']['color'][2],
+255),
+@@ -302,7 +302,7 @@
+
+ # Add profile distance/elevation pairs to plot data list for each raster profiled
+ for r in self.rasterList:
+-col = wx.Color(self.raster[r]['pcolor'][0],
++col = wx.Colour(self.raster[r]['pcolor'][0],
+self.raster[r]['pcolor'][1],
+self.raster[r]['pcolor'][2],
+255)
+@@ -332,7 +332,7 @@
+ dlg = wx.FileDialog(parent = self,
+ message = _(Choose prefix for file(s) where to save profile values...),
+ defaultDir = os.getcwd(),
+-wildcard = _(Comma separated value (*.csv)|*.csv), style = wx.SAVE)
++wildcard = _(Comma
[pyepr] 01/01: pristine-tar data for pyepr_0.8.2.orig.tar.gz
This is an automated email from the git hooks/post-receive script. a_valentino-guest pushed a commit to branch pristine-tar in repository pyepr. commit e24d9f61587723354e846b7768ba54dcbc2ed7cd Author: Antonio Valentino antonio.valent...@tiscali.it Date: Fri Aug 15 08:52:51 2014 + pristine-tar data for pyepr_0.8.2.orig.tar.gz --- pyepr_0.8.2.orig.tar.gz.delta | Bin 0 - 2091 bytes pyepr_0.8.2.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/pyepr_0.8.2.orig.tar.gz.delta b/pyepr_0.8.2.orig.tar.gz.delta new file mode 100644 index 000..f6df470 Binary files /dev/null and b/pyepr_0.8.2.orig.tar.gz.delta differ diff --git a/pyepr_0.8.2.orig.tar.gz.id b/pyepr_0.8.2.orig.tar.gz.id new file mode 100644 index 000..6754436 --- /dev/null +++ b/pyepr_0.8.2.orig.tar.gz.id @@ -0,0 +1 @@ +0e4f3837a859dc6623359482ba7d487bfb3e2688 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyepr.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[pyepr] branch upstream updated (88d1425 - c9890c5)
This is an automated email from the git hooks/post-receive script. a_valentino-guest pushed a change to branch upstream in repository pyepr. from 88d1425 Imported Upstream version 0.8.1 adds c9890c5 Imported Upstream version 0.8.2 No new revisions were added by this update. Summary of changes: .travis.yml | 17 +- Makefile | 6 +- README.txt | 20 +- doc/Makefile | 26 ++- doc/NEWS.txt | 30 ++- doc/conf.py | 79 ++-- doc/examples/write_ndvi.py | 97 + doc/index.txt| 9 +- doc/interactive_use.txt | 8 +- doc/make.bat | 52 + doc/ndvi_example.txt | 15 +- doc/pydoctheme/LICENSE | 42 +--- doc/pydoctheme/static/pydoctheme.css | 2 +- doc/pydoctheme/static/sidebar.js | 50 - doc/reference.txt| 16 +- doc/usermanual.txt | 20 +- requirements.txt | 2 +- setup.py | 8 +- src/epr.pyx | 87 +--- test/test_all.py | 378 +-- 20 files changed, 715 insertions(+), 249 deletions(-) mode change 100644 = 100755 test/test_all.py -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyepr.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[pyepr] branch pristine-tar updated (87b63d7 - e24d9f6)
This is an automated email from the git hooks/post-receive script. a_valentino-guest pushed a change to branch pristine-tar in repository pyepr. from 87b63d7 pristine-tar data for pyepr_0.8.1.orig.tar.gz new e24d9f6 pristine-tar data for pyepr_0.8.2.orig.tar.gz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: pyepr_0.8.2.orig.tar.gz.delta | Bin 0 - 2091 bytes pyepr_0.8.2.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 pyepr_0.8.2.orig.tar.gz.delta create mode 100644 pyepr_0.8.2.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyepr.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 01/01: Improve copyright.
This is an automated email from the git hooks/post-receive script. mira-guest pushed a commit to branch master in repository qmapshack. commit 79d66430615d2f7babdb83da7fe3fd91a08af8ff Author: Jaromír Mikeš mira.mi...@seznam.cz Date: Sat Aug 16 10:34:16 2014 +0200 Improve copyright. --- debian/copyright | 34 +- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index e070985..873b029 100644 --- a/debian/copyright +++ b/debian/copyright @@ -62,7 +62,7 @@ License: WTFPL-2 Files: src/helpers/CTextEditWidget.cpp src/helpers/CTextEditWidget.h Copyright: 2012, Digia Plc and/or its subsidiary(-ies) -License: UNKNOWN +License: License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 License: GPL-3+ This program is free software: you can redistribute it and/or modify @@ -151,3 +151,35 @@ License: WTFPL-2 0. You just DO WHAT THE FUCK YOU WANT TO. . see http://www.wtfpl.net/. + +License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 + $QT_BEGIN_LICENSE:LGPL$ + Commercial License Usage + Licensees holding valid commercial Qt licenses may use this file in + accordance with the commercial license agreement provided with the + Software or, alternatively, in accordance with the terms contained in + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information + use the contact form at http://qt.digia.com/contact-us. + . + GNU Lesser General Public License Usage + Alternatively, this file may be used under the terms of the GNU Lesser + General Public License version 2.1 as published by the Free Software + Foundation and appearing in the file LICENSE.LGPL included in the + packaging of this file. Please review the following information to + ensure the GNU Lesser General Public License version 2.1 requirements + will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + . + In addition, as a special exception, Digia gives you certain additional + rights. These rights are described in the Digia Qt LGPL Exception + version 1.1, included in the file LGPL_EXCEPTION.txt in this package. + . + GNU General Public License Usage + Alternatively, this file may be used under the terms of the GNU + General Public License version 3.0 as published by the Free Software + Foundation and appearing in the file LICENSE.GPL included in the + packaging of this file. Please review the following information to + ensure the GNU General Public License version 3.0 requirements will be + met: http://www.gnu.org/copyleft/gpl.html. + . + $QT_END_LICENSE$ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] branch master updated (d8568d2 - 79d6643)
This is an automated email from the git hooks/post-receive script. mira-guest pushed a change to branch master in repository qmapshack. from d8568d2 Improve copyright. new 79d6643 Improve copyright. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/copyright | 34 +- 1 file changed, 33 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
