[SCM] thuban branch, master, updated. upstream/1.2.2-31-g356ea40

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit b930a90426590ec966785a0843c8b8d233d35ece
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Oct 1 13:45:21 2013 +0200

    Refresh patch and add headers for: wxpython.patch.

diff --git a/debian/changelog b/debian/changelog
index 2aa8e80..2aca078 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
     - locale.patch
     - setup.patch
     - bitmappath.patch
+    - wxpython.patch
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index fbc854b..c96efde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 locale.patch
 setup.patch
 bitmappath.patch
-wxpython
+wxpython.patch
 gdal
diff --git a/debian/patches/wxpython b/debian/patches/wxpython
deleted file mode 100644
index 6055fc1..0000000
--- a/debian/patches/wxpython
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: thuban/thuban.py
-===================================================================
---- thuban.orig/thuban.py	2011-11-03 16:45:05.000000000 +0100
-+++ thuban/thuban.py	2011-11-03 16:52:03.000000000 +0100
-@@ -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
diff --git a/debian/patches/wxpython.patch b/debian/patches/wxpython.patch
new file mode 100644
index 0000000..94176ac
--- /dev/null
+++ b/debian/patches/wxpython.patch
@@ -0,0 +1,16 @@
+Description: Select wx version 2.8.
+Author: Francesco Paolo Lovergine <frankie at 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

-- 
Yet another interactive geographic data viewer