[grass] 03/03: Imported Debian patch 7.0.0-1~exp2~trusty3

[Johan Van de Wauw]

This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch ubuntugis
in repository grass.

commit fbc31856ff04b901f0a377fb693dceb1dee8c110
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Tue Mar 24 20:10:05 2015 +0100

    Imported Debian patch 7.0.0-1~exp2~trusty3
---
 debian/changelog  | 12 ++++++++++++
 debian/control    |  2 +-
 debian/control.in |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c080c4d..9b30d27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+grass (7.0.0-1~exp2~trusty3) trusty; urgency=medium
+
+  * Further fix
+
+ -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Tue, 24 Mar 2015 20:10:05 +0100
+
+grass (7.0.0-1~exp2~trusty2) trusty; urgency=medium
+
+  * Fix wx2.8 usage 
+
+ -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Mon, 23 Mar 2015 00:06:52 +0100
+
 grass (7.0.0-1~exp2~trusty) trusty; urgency=medium
 
   [ Bas Couwenberg ]
diff --git a/debian/control b/debian/control
index 7380227..64b8b39 100644
--- a/debian/control
+++ b/debian/control
@@ -119,7 +119,7 @@ Package: grass-gui
 Architecture: any
 Depends: grass-core,
          ${python:Depends},
-         python-wxgtk3.0,
+         python-wxgtk2.8,
 # pyGL needed for wxNviz
          python-opengl,
          xterm | x-terminal-emulator,
diff --git a/debian/control.in b/debian/control.in
index b80b352..86814d8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -36,7 +36,7 @@ Build-Depends: autoconf2.13,
 # install optipng if compressing the PNG images in the programmers' manual
 #              optipng,
                python,
-               python-wxgtk3.0,
+               python-wxgtk2.8,
                python-dev,
                python-numpy,
                python-ply,
@@ -119,7 +119,7 @@ Package: grass-gui
 Architecture: any
 Depends: grass-core,
          ${python:Depends},
-         python-wxgtk3.0,
+         python-wxgtk2.8,
 # pyGL needed for wxNviz
          python-opengl,
          xterm | x-terminal-emulator,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git