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

[Bas Couwenberg]

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

    Refresh patch and add headers for: bitmappath.patch.

diff --git a/debian/changelog b/debian/changelog
index a0f8eb7..2aa8e80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
   * Refresh patch and add headers for:
     - locale.patch
     - setup.patch
+    - bitmappath.patch
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/patches/bitmappath b/debian/patches/bitmappath.patch
similarity index 61%
rename from debian/patches/bitmappath
rename to debian/patches/bitmappath.patch
index a5da0d3..fcb39d3 100644
--- a/debian/patches/bitmappath
+++ b/debian/patches/bitmappath.patch
@@ -1,8 +1,10 @@
-Index: thuban/Thuban/Model/resource.py
-===================================================================
---- thuban.orig/Thuban/Model/resource.py	2011-11-03 16:45:05.000000000 +0100
-+++ thuban/Thuban/Model/resource.py	2011-11-03 16:51:29.000000000 +0100
-@@ -27,8 +27,11 @@
+Description: Use FHS paths for thuban Projections & Bitmaps Resources.
+Author: Paul Wise <pabs3 at bonedaddy.net>
+Last-Update: 2011-11-03
+
+--- a/Thuban/Model/resource.py
++++ b/Thuban/Model/resource.py
+@@ -27,8 +27,11 @@ from Thuban.Model.xmlwriter import XMLWr
  from Thuban.Model.proj import Projection, ProjFile
  from xml.sax import SAXParseException
  
@@ -16,11 +18,9 @@ Index: thuban/Thuban/Model/resource.py
  
  PROJ_EXT = ".proj"
  
-Index: thuban/Thuban/UI/resource.py
-===================================================================
---- thuban.orig/Thuban/UI/resource.py	2011-11-03 16:45:05.000000000 +0100
-+++ thuban/Thuban/UI/resource.py	2011-11-03 16:51:29.000000000 +0100
-@@ -19,7 +19,10 @@
+--- a/Thuban/UI/resource.py
++++ b/Thuban/UI/resource.py
+@@ -19,7 +19,10 @@ from Thuban.Lib.fileutil import get_thub
  import wx
  
  
diff --git a/debian/patches/series b/debian/patches/series
index 03cd82c..fbc854b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 locale.patch
 setup.patch
-bitmappath
+bitmappath.patch
 wxpython
 gdal

-- 
Yet another interactive geographic data viewer