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

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 9f5ec96619b8d93f972c5fd2e48f996c2c655e20
Author: Bas Couwenberg <sebastic at 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 <sebastic at 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..0000000
--- 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 0000000..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 0000000..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 0000000..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 viewer