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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 682913f9ebd4c9dc138a026ba025d9bf5820ec00
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 12:42:59 2013 +0200

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index d7f381d..2d9fec7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+thuban (1.2.2-4) UNRELEASED; urgency=low
+
+  * Add myself to Uploaders.
+
+ -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
+
 thuban (1.2.2-3) unstable; urgency=low
 
   * Rebuilding with current wxpython level.
diff --git a/debian/control b/debian/control
index 02a6e8a..81af9a8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: thuban
 Section: graphics
 Priority: extra
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders: Francesco Paolo Lovergine fran...@debian.org
+Uploaders: Francesco Paolo Lovergine fran...@debian.org,
+   Bas Couwenberg sebas...@xs4all.nl
 Build-Depends: debhelper (= 8), python-dev, python-wxgtk2.8, libproj-dev, 
  libgdal1-dev, libwxgtk2.8-dev, docbook-utils, python-support (= 0.6),
  docbook-xml

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit f1fc2e429b9a7beab2690ceea9b2a003f7e99b28
Author: Bas Couwenberg sebas...@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 sebas...@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.0 +0100
-+++ thuban/setup.py2011-11-03 16:51:10.0 +0100
-@@ -47,7 +47,7 @@
+Description: Use /usr instead of /usr/local.
+Author: Francesco Paolo Lovergine fran...@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

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 2508df25f52c1cb2fa2e1199eddb771a91ce30dd
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 12:45:28 2013 +0200

Use canonical URLs for Vcs-* fields.

diff --git a/debian/changelog b/debian/changelog
index d8cc40b..2dcefcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
 
   * Add myself to Uploaders.
   * Bump dephelper compatibility to 9.
+  * Use canonical URLs for Vcs-* fields.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/control b/debian/control
index 1752f95..9c5428c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends: debhelper (= 9), python-dev, python-wxgtk2.8, 
libproj-dev,
  docbook-xml
 Standards-Version: 3.9.2
 Homepage: http://thuban.intevation.org
-Vcs-Browser: http://git.debian.org/?p=pkg-grass/thuban.git
-Vcs-Git: git://git.debian.org/git/pkg-grass/thuban.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/thuban.git
+Vcs-Git: git://anonscm.debian.org/pkg-grass/thuban.git
 
 Package: thuban
 Architecture: any

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 3330e2eec8228c104330cf7571301e0709fc882f
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 13:33:30 2013 +0200

Refresh patch and add headers for: locale.patch.

diff --git a/debian/changelog b/debian/changelog
index 2dcefcc..d82a02c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
   * Add myself to Uploaders.
   * Bump dephelper compatibility to 9.
   * Use canonical URLs for Vcs-* fields.
+  * Refresh patch and add headers for:
+- locale.patch
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/patches/locale b/debian/patches/locale.patch
similarity index 72%
rename from debian/patches/locale
rename to debian/patches/locale.patch
index 6045caa..4e284f3 100644
--- a/debian/patches/locale
+++ b/debian/patches/locale.patch
@@ -1,8 +1,10 @@
-Index: thuban/Thuban/__init__.py
-===
 thuban.orig/Thuban/__init__.py 2011-11-03 16:45:05.0 +0100
-+++ thuban/Thuban/__init__.py  2011-11-03 16:50:38.0 +0100
-@@ -57,8 +57,14 @@
+Description: Use FHS paths for thuban Locale Resources.
+Author: Francesco Paolo Lovergine fran...@debian.org
+Last-Update: 2011-11-03
+
+--- a/Thuban/__init__.py
 b/Thuban/__init__.py
+@@ -57,8 +57,14 @@ def _(s):
  
  return _translation_function(s)
  
diff --git a/debian/patches/series b/debian/patches/series
index f5d9e54..524f5de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-locale
+locale.patch
 setup.py
 bitmappath
 wxpython

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit b930a90426590ec966785a0843c8b8d233d35ece
Author: Bas Couwenberg sebas...@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 sebas...@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..000
--- a/debian/patches/wxpython
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: thuban/thuban.py
-===
 thuban.orig/thuban.py  2011-11-03 16:45:05.0 +0100
-+++ thuban/thuban.py   2011-11-03 16:52:03.0 +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 000..94176ac
--- /dev/null
+++ b/debian/patches/wxpython.patch
@@ -0,0 +1,16 @@
+Description: Select wx version 2.8.
+Author: Francesco Paolo Lovergine fran...@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

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit bf6cf1bde5673b5c0dbbf12211fa14e59a794caa
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 12:44:06 2013 +0200

Bump dephelper compatibility to 9.

diff --git a/debian/changelog b/debian/changelog
index 2d9fec7..d8cc40b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 thuban (1.2.2-4) UNRELEASED; urgency=low
 
   * Add myself to Uploaders.
+  * Bump dephelper compatibility to 9.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 81af9a8..1752f95 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Francesco Paolo Lovergine fran...@debian.org,
Bas Couwenberg sebas...@xs4all.nl
-Build-Depends: debhelper (= 8), python-dev, python-wxgtk2.8, libproj-dev, 
+Build-Depends: debhelper (= 9), python-dev, python-wxgtk2.8, libproj-dev, 
  libgdal1-dev, libwxgtk2.8-dev, docbook-utils, python-support (= 0.6),
  docbook-xml
 Standards-Version: 3.9.2

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit cc0db77c12d8be05b542e51631b9dc3cabab
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 13:11:05 2013 +0200

Don't remove .mo files on clean, part of upstream tarball.

diff --git a/debian/rules b/debian/rules
index 47f4ce3..b351f60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ clean-patched:
dh_testdir
dh_testroot
python setup.py clean
-   find $(CURDIR) -name *.mo -exec rm -f {} \;
+   #find $(CURDIR) -name *.mo -exec rm -f {} \;
rm -f build-stamp 
rm -rf build Doc/manual/thuban-manual Doc/manual/thuban-manual-de
dh_clean

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 1448a3ab4e2c7c48a13b32790f9bf4596212807e
Author: Bas Couwenberg sebas...@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 sebas...@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.0 
+0100
-+++ thuban/Thuban/Model/resource.py2011-11-03 16:51:29.0 +0100
-@@ -27,8 +27,11 @@
+Description: Use FHS paths for thuban Projections  Bitmaps Resources.
+Author: Paul Wise pa...@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.0 +0100
-+++ thuban/Thuban/UI/resource.py   2011-11-03 16:51:29.0 +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

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 2b25d71304b0eea6e4a568c95f5904328372eeb1
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 13:51:42 2013 +0200

Improve short description to not start with article.

diff --git a/debian/changelog b/debian/changelog
index 32701f7..7e66c1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
 - bitmappath.patch
 - wxpython.patch
 - gdal.patch
+  * Improve short description to not start with article.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/control b/debian/control
index 9c5428c..666ff2f 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Package: thuban
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, gdal-bin, python-wxgtk2.8, 
python-sqlite, ${misc:Depends}
 Recommends: python-psycopg, python-gdal, python-mapscript
-Description: An interactive geographic data viewer
+Description: Interactive geographic data viewer
  Thuban can read geographic data in the shapefile format. Main features of
  thuban are the layer management and the possibility to navigate on the
  map, to control the visual appearance of objects, to identify and edit

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit a9de2c4aec7baa9ade98a86bed46bc9b6011f1e9
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 16:33:15 2013 +0200

List missing files after install.

diff --git a/debian/changelog b/debian/changelog
index 18f3b02..ae9836c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
   * Improve short description to not start with article.
   * Use minimal dh rules with python2.
   * Move documentation into its own thuban-doc package.
+  * List missing files after install.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/rules b/debian/rules
index 2de42bb..92da38e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,3 +41,7 @@ override_dh_auto_install:
dh_auto_install -- --prefix=/usr
 
$(RM) -f $(CURDIR)/debian/thuban/usr/bin/create_epsg
+
+override_dh_install:
+   dh_install --list-missing
+

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit a74c7be492b21aa6f8426de9b9ec034d3b5b1bbb
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 13:48:51 2013 +0200

Refresh patch and add headers for: gdal.patch.

diff --git a/debian/changelog b/debian/changelog
index 2aca078..32701f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
 - setup.patch
 - bitmappath.patch
 - wxpython.patch
+- gdal.patch
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/patches/gdal b/debian/patches/gdal
deleted file mode 100644
index 5a01411..000
--- a/debian/patches/gdal
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: thuban/Extensions/ogr/ogrdialog.py
-===
 thuban.orig/Extensions/ogr/ogrdialog.py2011-11-03 16:45:05.0 
+0100
-+++ thuban/Extensions/ogr/ogrdialog.py 2011-11-03 16:52:54.0 +0100
-@@ -14,7 +14,7 @@
- import wx
- 
- try:
--import ogr
-+from osgeo import ogr
- except ImportError:
- ogr = None
- 
-Index: thuban/Extensions/ogr/ogrshapes.py
-===
 thuban.orig/Extensions/ogr/ogrshapes.py2011-11-03 16:45:05.0 
+0100
-+++ thuban/Extensions/ogr/ogrshapes.py 2011-11-03 16:52:54.0 +0100
-@@ -12,7 +12,7 @@
- # $Id: ogrshapes.py 2770 2007-05-22 08:54:41Z bh $
- 
- try:
--import ogr
-+from osgeo import ogr
- except ImportError:
- ogr = None
- 
-Index: thuban/Thuban/Model/layer.py
-===
 thuban.orig/Thuban/Model/layer.py  2011-11-03 16:45:05.0 +0100
-+++ thuban/Thuban/Model/layer.py   2011-11-03 16:52:54.0 +0100
-@@ -395,8 +395,8 @@
- 
- 
- if resource.has_gdal_support():
--import gdal
--from gdalconst import GA_ReadOnly
-+from osgeo import gdal
-+from osgeo.gdalconst import GA_ReadOnly
- 
- class RasterLayer(BaseLayer):
- 
diff --git a/debian/patches/gdal.patch b/debian/patches/gdal.patch
new file mode 100644
index 000..eefba66
--- /dev/null
+++ b/debian/patches/gdal.patch
@@ -0,0 +1,39 @@
+Description: Import ogr and gdal from osgeo module.
+Author: Francesco Paolo Lovergine fran...@debian.org
+Last-Update: 2011-11-03
+
+--- a/Extensions/ogr/ogrdialog.py
 b/Extensions/ogr/ogrdialog.py
+@@ -14,7 +14,7 @@ import sys, traceback
+ import wx
+ 
+ try:
+-import ogr
++from osgeo import ogr
+ except ImportError:
+ ogr = None
+ 
+--- a/Extensions/ogr/ogrshapes.py
 b/Extensions/ogr/ogrshapes.py
+@@ -12,7 +12,7 @@ __version__ = $Revision: 2770 $
+ # $Id: ogrshapes.py 2770 2007-05-22 08:54:41Z bh $
+ 
+ try:
+-import ogr
++from osgeo import ogr
+ except ImportError:
+ ogr = None
+ 
+--- a/Thuban/Model/layer.py
 b/Thuban/Model/layer.py
+@@ -395,8 +395,8 @@ class Layer(BaseLayer):
+ 
+ 
+ if resource.has_gdal_support():
+-import gdal
+-from gdalconst import GA_ReadOnly
++from osgeo import gdal
++from osgeo.gdalconst import GA_ReadOnly
+ 
+ class RasterLayer(BaseLayer):
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c96efde..ae6b71c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@ locale.patch
 setup.patch
 bitmappath.patch
 wxpython.patch
-gdal
+gdal.patch

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit fc813cd53123842e0b9f1bfec2da91c2f10efd0a
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 14:03:33 2013 +0200

Use minimal dh rules with python2.

diff --git a/debian/changelog b/debian/changelog
index 7e66c1e..e0c8bf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
 - wxpython.patch
 - gdal.patch
   * Improve short description to not start with article.
+  * Use minimal dh rules with python2.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/rules b/debian/rules
index b351f60..2de42bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,65 +5,39 @@
 
 PYDEF=$(shell pyversions -d)
 PYDEFVER=$(shell pyversions -d -v)
-CFLAGS = -Wall -g
+
+CFLAGS += -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
 else
 CFLAGS += -O2
 endif
 
-build: build-stamp
-build-stamp: 
-   dh_testdir
-   CFLAGS=$(CFLAGS) python setup.py build_ext --use-wx-python-swig-hack
-   make -C po mo
-   make -C Doc/manual man-html man-html-de
-   # Needs external data, many failures
-   # cd test ; python runtests.py
-   touch build-stamp
+%:
+   dh $@ --with python2
 
-clean: clean-patched unpatch
-clean-patched: 
-   dh_testdir
-   dh_testroot
-   python setup.py clean
-   #find $(CURDIR) -name *.mo -exec rm -f {} \;
-   rm -f build-stamp 
-   rm -rf build Doc/manual/thuban-manual Doc/manual/thuban-manual-de
+override_dh_clean:
dh_clean
-   rm -f debian/pyversions
 
-install: build
-   dh_testdir
-   dh_testroot
-   dh_prep
-   dh_installdirs
+   python setup.py clean
+
+   $(RM) -rf $(CURDIR)/build
+   $(RM) -rf $(CURDIR)/Doc/manual/thuban-manual
+   $(RM) -rf $(CURDIR)/Doc/manual/thuban-manual-de
+
+override_dh_auto_build:
+   python setup.py build_ext

-   python setup.py install --prefix=/usr --no-compile 
--root=$(CURDIR)/debian/thuban
-   rm -f $(CURDIR)/debian/thuban/usr/bin/create_epsg
-   echo $(PYDEFVER) $(CURDIR)/debian/pyversions
+   find $(CURDIR) -name *.mo -delete
+
+   $(MAKE) -C $(CURDIR)/po mo
+   $(MAKE) -C $(CURDIR)/Doc/manual man-html man-html-de
 
-binary-indep: build install
+override_dh_auto_test:
+   # Needs external data, many failures
+   # cd test ; python runtests.py
 
-binary-arch: build install
-   dh_testdir
-   dh_testroot
-   dh_install
-   dh_installdocs
-   dh_installexamples
-   dh_installmenu
-   dh_installman
-   dh_installchangelogs 
-   dh_link
-   dh_strip
-   dh_compress
-   dh_fixperms
-   dh_pysupport 
-   dh_installdeb
-   dh_shlibdeps
-   dh_gencontrol
-   dh_md5sums
-   dh_builddeb
+override_dh_auto_install:
+   dh_auto_install -- --prefix=/usr
 
-binary: binary-arch binary-indep
-.PHONY: build clean binary-arch binary install clean-patched clean patch 
unpatch
+   $(RM) -f $(CURDIR)/debian/thuban/usr/bin/create_epsg

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit b70c773ce8b1168cae33e1ead526a1536562534c
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 16:43:26 2013 +0200

Update python build dependencies.

diff --git a/debian/changelog b/debian/changelog
index 41a02af..35058be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
   * Move documentation into its own thuban-doc package.
   * List missing files after install.
   * Update watch file, handle common mistakes.
+  * Update python build dependencies: remote python-support, replace python-dev
+with python-all-dev (= 2.6.6-3~).
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/control b/debian/control
index be89eb1..9d65213 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Francesco Paolo Lovergine fran...@debian.org,
Bas Couwenberg sebas...@xs4all.nl
-Build-Depends: debhelper (= 9), python-dev, python-wxgtk2.8, libproj-dev, 
- libgdal1-dev, libwxgtk2.8-dev, docbook-utils, python-support (= 0.6),
+Build-Depends: debhelper (= 9), python-all-dev (= 2.6.6-3~), 
python-wxgtk2.8, libproj-dev, 
+ libgdal1-dev, libwxgtk2.8-dev, docbook-utils,
  docbook-xml
 Standards-Version: 3.9.2
 Homepage: http://thuban.intevation.org

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 9f5ec96619b8d93f972c5fd2e48f996c2c655e20
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 16:22:05 2013 +0200

Move documentation into its own thuban-doc package.

diff --git a/debian/changelog b/debian/changelog
index e0c8bf7..18f3b02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
 - gdal.patch
   * Improve short description to not start with article.
   * Use minimal dh rules with python2.
+  * Move documentation into its own thuban-doc package.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/control b/debian/control
index 666ff2f..be89eb1 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,26 @@ Package: thuban
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, gdal-bin, python-wxgtk2.8, 
python-sqlite, ${misc:Depends}
 Recommends: python-psycopg, python-gdal, python-mapscript
+Suggests: thuban-doc
 Description: Interactive geographic data viewer
  Thuban can read geographic data in the shapefile format. Main features of
  thuban are the layer management and the possibility to navigate on the
  map, to control the visual appearance of objects, to identify and edit
  attributes by object selection and to print and export the resulting maps
  for further processing.
+ .
+ This package contains the thuban program an its libraries.
+
+Package: thuban-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Interactive geographic data viewer - common files
+ Thuban can read geographic data in the shapefile format. Main features of
+ thuban are the layer management and the possibility to navigate on the
+ map, to control the visual appearance of objects, to identify and edit
+ attributes by object selection and to print and export the resulting maps
+ for further processing.
+ .
+ This package contains the thuban documentation.
+
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 1f8d6b2..000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-Doc/manual/images/*.png usr/share/doc/thuban/images
-devtools/create_epsg.py usr/lib/thuban
diff --git a/debian/doc-base b/debian/thuban-doc.doc-base
similarity index 66%
rename from debian/doc-base
rename to debian/thuban-doc.doc-base
index 9d20c4d..c3e7f30 100644
--- a/debian/doc-base
+++ b/debian/thuban-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: Manual for users of Thuban, an interactive geographic 
data viewer.
 Section: Viewers
 
 Format: HTML
-Index: /usr/share/doc/thuban/thuban-manual/index.html
-Files: /usr/share/doc/thuban/thuban-manual/*.html
+Index: /usr/share/doc/thuban-doc/thuban-manual/index.html
+Files: /usr/share/doc/thuban-doc/thuban-manual/*.html
diff --git a/debian/doc-base.de b/debian/thuban-doc.doc-base.de
similarity index 66%
rename from debian/doc-base.de
rename to debian/thuban-doc.doc-base.de
index 39c6080..50f6de1 100644
--- a/debian/doc-base.de
+++ b/debian/thuban-doc.doc-base.de
@@ -5,5 +5,5 @@ Abstract: Manual for German users of Thuban, an interactive 
geographic data view
 Section: Viewers
 
 Format: HTML
-Index: /usr/share/doc/thuban/thuban-manual-de/index.html
-Files: /usr/share/doc/thuban/thuban-manual-de/*.html
+Index: /usr/share/doc/thuban-doc/thuban-manual-de/index.html
+Files: /usr/share/doc/thuban-doc/thuban-manual-de/*.html
diff --git a/debian/docs b/debian/thuban-doc.docs
similarity index 81%
rename from debian/docs
rename to debian/thuban-doc.docs
index 8c810be..7ed6af9 100644
--- a/debian/docs
+++ b/debian/thuban-doc.docs
@@ -1,4 +1,2 @@
-README
-NEWS
 Doc/manual/thuban-manual
 Doc/manual/thuban-manual-de
diff --git a/debian/thuban-doc.install b/debian/thuban-doc.install
new file mode 100644
index 000..7752728
--- /dev/null
+++ b/debian/thuban-doc.install
@@ -0,0 +1 @@
+Doc/manual/images/*.png usr/share/doc/thuban-doc/images
diff --git a/debian/dirs b/debian/thuban.dirs
similarity index 100%
rename from debian/dirs
rename to debian/thuban.dirs
diff --git a/debian/thuban.docs b/debian/thuban.docs
new file mode 100644
index 000..9eafbe1
--- /dev/null
+++ b/debian/thuban.docs
@@ -0,0 +1,2 @@
+README
+NEWS
diff --git a/debian/examples b/debian/thuban.examples
similarity index 100%
rename from debian/examples
rename to debian/thuban.examples
diff --git a/debian/thuban.install b/debian/thuban.install
new file mode 100644
index 000..d5a744a
--- /dev/null
+++ b/debian/thuban.install
@@ -0,0 +1 @@
+devtools/create_epsg.py usr/lib/thuban
diff --git a/debian/links b/debian/thuban.links
similarity index 100%
rename from debian/links
rename to debian/thuban.links
diff --git a/debian/manpages b/debian/thuban.manpages
similarity index 100%
rename from debian/manpages
rename to debian/thuban.manpages
diff --git a/debian/menu b/debian/thuban.menu
similarity index 100%
rename from debian/menu
rename to debian/thuban.menu

-- 
Yet another interactive geographic data

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit b25bdeb939e54786ccab3326774e317c0ad82e17
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 16:38:39 2013 +0200

Update watch file, handle common mistakes.

diff --git a/debian/changelog b/debian/changelog
index ae9836c..41a02af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
   * Use minimal dh rules with python2.
   * Move documentation into its own thuban-doc package.
   * List missing files after install.
+  * Update watch file, handle common mistakes.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/watch b/debian/watch
index 68e4320..a3762f8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://wald.intevation.org/frs?group_id=6 
/frs/download.php/\d+/Thuban-([\d\.]+).tar.bz2
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/
 \
+http://wald.intevation.org/frs?group_id=6 
(?:.*/)?Thuban[_\-](\d+[\d\.]+)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit bae9a72ce9e9628ecfbaf85c4e3281ae9ed9f317
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 18:00:28 2013 +0200

Update copyright file using copyright-format 1.0.

diff --git a/debian/changelog b/debian/changelog
index b9e037b..03ced32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
   * Update python build dependencies: remote python-support, replace python-dev
 with python-all-dev (= 2.6.6-3~).
   * Update files to install for thuban package.
+  * Update copyright file using copyright-format 1.0.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/copyright b/debian/copyright
index c36dc27..a671ef8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,119 +1,166 @@
-This package was debianized by Silke Reimer si...@intevation.de on
-Tue, 26 Nov 2002 09:06:49 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Thuban
+Upstream-Contact: Thuban Project Team thu...@intevation.de
+Source: http://thuban.intevation.org/
+
+Files: *
+Copyright: 2001-2008, Intevation GmbH
+License: GPL-2.0+
+
+Files: libraries/pyprojection/*
+Copyright: 2001 Meridian Environmental Technology, Inc
+License: BSD-2-Clause
+
+Files: libraries/pyprojection/Projection_wrap.c
+ libraries/pyshapelib/dbflib_wrap.c
+ libraries/pyshapelib/shapelib_wrap.c
+Copyright: 1999-2000, The University of Chicago
+Comment:  This file contains generic SWIG runtime support for pointer
+ type checking as well as a few commonly used macros to control
+ external linkage.
+License: public-domain
+ This file may be freely redistributed without license or fee provided
+ this copyright message remains intact.
+
+Files: libraries/shapelib/*
+Copyright: 1999, 2001, Frank Warmerdam
+License: MIT or LGPL-2.0+
+
+Files: Thuban/Lib/connector.py
+Copyright: 1997-1998, 2000-2001, 2003 Bernhard Herzog
+License: LGPL-2.0+
+
+Files: libraries/thuban/gdalwarp.cpp
+Copyright: 2002, i3 - information integration and imaging Fort Collin, CO
+License: MIT
+
+Files: libraries/thuban/wxPython_int.h
+Copyright: 1998, Total Control Software
+License: WXwindows
+
+License: BSD-2-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+License: GPL-2.0+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in the file 
+ `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2.0+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Library General
+ Public License version 2 can be found in the file 
+ `/usr/share/common-licenses/LGPL-2'.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person
+ obtaining a

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 8a21d9d785297610463dd11e5d8436d60aa9ee40
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 16:58:31 2013 +0200

Restructure control file with cme fix dpkg-control.

diff --git a/debian/control b/debian/control
index 9d65213..9636930 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,33 @@
 Source: thuban
-Section: graphics
-Priority: extra
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Francesco Paolo Lovergine fran...@debian.org,
Bas Couwenberg sebas...@xs4all.nl
-Build-Depends: debhelper (= 9), python-all-dev (= 2.6.6-3~), 
python-wxgtk2.8, libproj-dev, 
- libgdal1-dev, libwxgtk2.8-dev, docbook-utils,
- docbook-xml
+Section: graphics
+Priority: extra
+Build-Depends: debhelper (= 9),
+   python-all-dev (= 2.6.6-3~),
+   python-wxgtk2.8,
+   libproj-dev,
+   libgdal1-dev,
+   libwxgtk2.8-dev,
+   docbook-utils,
+   docbook-xml
 Standards-Version: 3.9.2
-Homepage: http://thuban.intevation.org
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/thuban.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/thuban.git
+Homepage: http://thuban.intevation.org
 
 Package: thuban
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, gdal-bin, python-wxgtk2.8, 
python-sqlite, ${misc:Depends}
-Recommends: python-psycopg, python-gdal, python-mapscript
+Depends: ${shlibs:Depends},
+ ${python:Depends},
+ gdal-bin,
+ python-wxgtk2.8,
+ python-sqlite,
+ ${misc:Depends}
+Recommends: python-psycopg,
+python-gdal,
+python-mapscript
 Suggests: thuban-doc
 Description: Interactive geographic data viewer
  Thuban can read geographic data in the shapefile format. Main features of

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit a737862d84951a1180a0b8d169b50aa75edcaa8a
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 16:48:05 2013 +0200

Update files to install for thuban package.

diff --git a/debian/changelog b/debian/changelog
index 35058be..b9e037b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
   * Update watch file, handle common mistakes.
   * Update python build dependencies: remote python-support, replace python-dev
 with python-all-dev (= 2.6.6-3~).
+  * Update files to install for thuban package.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/thuban.install b/debian/thuban.install
index d5a744a..0b5b3ee 100644
--- a/debian/thuban.install
+++ b/debian/thuban.install
@@ -1 +1,4 @@
 devtools/create_epsg.py usr/lib/thuban
+usr/bin/
+usr/lib/
+usr/share/

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 35db1284cd2b4f438c3d6bab104ec07ffac99abf
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 16:51:54 2013 +0200

Move dirs to doc package.

diff --git a/debian/thuban-doc.dirs b/debian/thuban-doc.dirs
new file mode 100644
index 000..7e7bd37
--- /dev/null
+++ b/debian/thuban-doc.dirs
@@ -0,0 +1 @@
+usr/share/doc/thuban-doc/images
diff --git a/debian/thuban.dirs b/debian/thuban.dirs
deleted file mode 100644
index 1157a4b..000
--- a/debian/thuban.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/thuban/images

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit e054347cfd3d1d31608cb512ffd18e47762769c7
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 18:02:25 2013 +0200

Build depend on python-psycopg2 instead of its virtual package.

diff --git a/debian/changelog b/debian/changelog
index 03ced32..e3fc2ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
 with python-all-dev (= 2.6.6-3~).
   * Update files to install for thuban package.
   * Update copyright file using copyright-format 1.0.
+  * Build depend on python-psycopg2 instead of its virtual package.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/control b/debian/control
index 9636930..812ddd7 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Depends: ${shlibs:Depends},
  python-wxgtk2.8,
  python-sqlite,
  ${misc:Depends}
-Recommends: python-psycopg,
+Recommends: python-psycopg2,
 python-gdal,
 python-mapscript
 Suggests: thuban-doc

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 0dcf3861d5bcf78d18e9815bfab104b7ebc20969
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 18:04:36 2013 +0200

Bump Standards-Version to 3.9.4.

diff --git a/debian/changelog b/debian/changelog
index e3fc2ff..c597a9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
   * Update files to install for thuban package.
   * Update copyright file using copyright-format 1.0.
   * Build depend on python-psycopg2 instead of its virtual package.
+  * Bump Standards-Version to 3.9.4, changes: minimal dh rules, Vcs-* fields,
+copyright.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/control b/debian/control
index 812ddd7..1a30f95 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (= 9),
libwxgtk2.8-dev,
docbook-utils,
docbook-xml
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/thuban.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/thuban.git
 Homepage: http://thuban.intevation.org

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 0ed1c635639a37af6feec6053ff1bf8fc38b770e
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 18:28:06 2013 +0200

Convert thuban man page to Docbook XML.

diff --git a/debian/changelog b/debian/changelog
index c597a9d..f54fb73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
   * Build depend on python-psycopg2 instead of its virtual package.
   * Bump Standards-Version to 3.9.4, changes: minimal dh rules, Vcs-* fields,
 copyright.
+  * Convert thuban man page to Docbook XML.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/control b/debian/control
index 1a30f95..7dae090 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,10 @@ Build-Depends: debhelper (= 9),
libgdal1-dev,
libwxgtk2.8-dev,
docbook-utils,
-   docbook-xml
+   docbook-xsl,
+   docbook-xml,
+   docbook2x,
+   xsltproc
 Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/thuban.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/thuban.git
diff --git a/debian/man/thuban.1.xml b/debian/man/thuban.1.xml
new file mode 100644
index 000..cddcbca
--- /dev/null
+++ b/debian/man/thuban.1.xml
@@ -0,0 +1,84 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE refentry PUBLIC -//OASIS//DTD DocBook XML V4.4//EN 
http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd;
+refentry id='thuban'
+
+  refmeta
+refentrytitlethuban/refentrytitle
+manvolnum1/manvolnum
+  /refmeta
+
+  refnamediv
+refnamethuban/refname
+refpurposeinteractive geographic data viewer/refpurpose
+  /refnamediv
+
+  refsynopsisdiv id='synopsis'
+cmdsynopsis
+  commandthuban/command
+  arg choice='opt'replaceablethuban-session-file/replaceable/arg
+/cmdsynopsis
+  /refsynopsisdiv
+
+  refsect1 id='description'
+titleDESCRIPTION/title
+para
+  This manual page documents briefly the commandthuban/command command.
+  This manual page was written for the Debian distribution because the
+  original program does not have a manual page.
+/para
+para
+  commandthuban/command is an interactiv geographic data viewer.
+  Thuban can read geographic data in the shapefile format. To control
+  the visual appearance of a layer you have to select the layer in the
+  session window of thuban. Afterwards you can change the layers color
+  with the Layer-menu.
+/para
+para
+  You can load the layers table with the Layer-table-menu. Afterwards you
+  can query the table for feature selection. You can also load new tables
+  with the Table-menu and make a table join to the current layer table.
+/para
+para
+  Maps can be printed or exported to the PS-format by Map/print.
+/para
+para
+  All changes can be saved in a thuban session file. If a thuban session
+  file has been indicated on command line it will be loaded by thuban. If
+  no thuban session file has been given thuban starts with a new session.
+/para
+  /refsect1
+
+  refsect1 id='see-also'
+titleSEE ALSO/title
+
+para
+ http://thuban.intevation.org/
+/para
+
+  /refsect1
+
+  refsect1 id='author'
+titleAUTHOR/title
+
+para
+ Thuban was written by Intevation GmbH, emailb...@intevation.de/email
+/para
+para
+  This manual page was written by Silke Reimer
+  emailsi...@intevation.de/email
+  for the Debian GNU/Linux system (but may be used by others).
+/para
+
+  /refsect1
+
+  refsect1 id='copyright'
+titleCOPYRIGHT/title
+
+para
+  Thuban may be copied and modified under the terms of the GNU General
+  Public License.
+/para
+
+  /refsect1
+
+/refentry
diff --git a/debian/rules b/debian/rules
index 92da38e..42be5c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@
 PYDEF=$(shell pyversions -d)
 PYDEFVER=$(shell pyversions -d -v)
 
+MANPAGES:=$(wildcard debian/man/*.*.xml)
+
 CFLAGS += -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
@@ -26,6 +28,12 @@ override_dh_clean:
$(RM) -rf $(CURDIR)/Doc/manual/thuban-manual-de
 
 override_dh_auto_build:
+   # Create man pages from DocBook XML
+   for x in $(MANPAGES) ; do \
+ docbook2x-man $$x ; \
+ mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
+   done
+
python setup.py build_ext

find $(CURDIR) -name *.mo -delete
diff --git a/debian/thuban.1 b/debian/thuban.1
deleted file mode 100644
index 82ee588..000
--- a/debian/thuban.1
+++ /dev/null
@@ -1,48 +0,0 @@
-.TH THUBAN 1 July  28, 2003
-.\ Some roff macros, for reference:
-.\ .nhdisable hyphenation
-.\ .hyenable hyphenation
-.\ .ad l  left justify
-.\ .ad b  justify to both left and

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

2013-10-01 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 356ea408cc552167290e181cc948fcc106593b57
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Tue Oct 1 18:37:48 2013 +0200

Add man page for create_epsg.

diff --git a/debian/changelog b/debian/changelog
index f54fb73..5927ce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.4, changes: minimal dh rules, Vcs-* fields,
 copyright.
   * Convert thuban man page to Docbook XML.
+  * Add man page for create_epsg.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/man/create_epsg.1.xml b/debian/man/create_epsg.1.xml
new file mode 100644
index 000..948e196
--- /dev/null
+++ b/debian/man/create_epsg.1.xml
@@ -0,0 +1,44 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE refentry PUBLIC -//OASIS//DTD DocBook XML V4.4//EN 
http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd;
+refentry id='create_epsg'
+
+  refmeta
+refentrytitlecreate_epsg/refentrytitle
+manvolnum1/manvolnum
+  /refmeta
+
+  refnamediv
+refnamecreate_epsg/refname
+refpurposeconvert the epsg file of proj into a python .proj 
file/refpurpose
+  /refnamediv
+
+  refsynopsisdiv id='synopsis'
+cmdsynopsis
+  commandcreate_epsg/command
+  arg choice='plain'gt; replaceableepsg.proj/replaceable/arg
+/cmdsynopsis
+  /refsynopsisdiv
+
+  refsect1 id='description'
+titleDESCRIPTION/title
+
+para
+  commandcreate_epsg/command converts the epsg file of proj into a
+  python .proj file.
+/para
+para
+  It assumes the original file of proj ('epsg') to be present in the
+  standard location of a system wide installation, i.e. in
+  /usr/share/proj/epsg.
+/para
+para
+  The entries in the source file look like this:
+  screen
+# Anguilla 1957 / British West Indies Grid
+lt;200gt; +proj=tmerc +lat_0=0.0 +lon_0=-62.0 +k=0.999500 
+x_0=4 0.000 +y_0=0.000 +ellps=clrk80 +units=m  no_defs lt;gt;
+  /screen
+/para
+
+  /refsect1
+
+/refentry
diff --git a/debian/thuban.manpages b/debian/thuban.manpages
index ff89709..3ba1452 100644
--- a/debian/thuban.manpages
+++ b/debian/thuban.manpages
@@ -1 +1,2 @@
 debian/man/thuban.1
+debian/man/create_epsg.1

-- 
Yet another interactive geographic data viewer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel