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

[Bas Couwenberg]

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

    Refresh patch and add headers for: setup.patch.

diff --git a/debian/changelog b/debian/changelog
index d82a02c..a0f8eb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
   * Use canonical URLs for Vcs-* fields.
   * Refresh patch and add headers for:
     - locale.patch
+    - setup.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 524f5de..03cd82c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 locale.patch
-setup.py
+setup.patch
 bitmappath
 wxpython
 gdal
diff --git a/debian/patches/setup.py b/debian/patches/setup.patch
similarity index 75%
rename from debian/patches/setup.py
rename to debian/patches/setup.patch
index 3398413..025131d 100644
--- a/debian/patches/setup.py
+++ b/debian/patches/setup.patch
@@ -1,8 +1,10 @@
-Index: thuban/setup.py
-===================================================================
---- thuban.orig/setup.py	2011-11-03 16:45:05.000000000 +0100
-+++ thuban/setup.py	2011-11-03 16:51:10.000000000 +0100
-@@ -47,7 +47,7 @@
+Description: Use /usr instead of /usr/local.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2011-11-03
+
+--- a/setup.py
++++ b/setup.py
+@@ -47,7 +47,7 @@ if os.name == "posix":
      # Unix like system.
     
      # Directories where Proj4 is installed
@@ -11,7 +13,7 @@ Index: thuban/setup.py
      proj4_incdir =  os.path.join(proj4_prefix, "include")
      proj4_libdir =  os.path.join(proj4_prefix, "lib")
      proj4_lib = "proj"
-@@ -1195,7 +1195,7 @@
+@@ -1195,7 +1195,7 @@ setup(name = "Thuban",
                    # same directory.
                    "install_lib": "$base/lib/thuban",
                    "install_scripts": "$base/lib/thuban",

-- 
Yet another interactive geographic data viewer