Fix python-trinity-doc packaging on Debian and Ubuntu

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 345baa66111cdbb228325a2e666249337929bef5)

6 files changed, 7 insertions, 8 deletions

diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.dirs b/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.dirs
deleted file mode 100644
index 8c23689f0..000000000
--- a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/doc/python-trinity-doc
-usr/share/doc/python-trinity-doc/examples
-usr/share/doc/python-trinity-doc/html
-
diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.install b/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.install
deleted file mode 100644
index 146aeabc5..000000000
--- a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-doc/* usr/share/doc/python-trinity-doc/html
diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
new file mode 100644
index 000000000..96235463f
--- /dev/null
+++ b/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
@@ -0,0 +1,3 @@
+usr/share/doc/python-trinity-trinity-doc
+usr/share/doc/python-trinity-trinity-doc/examples
+usr/share/doc/python-trinity-trinity-doc/html
diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.doc-base b/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
index aceab5ecb..bb9705168 100644
--- a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.doc-base
+++ b/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
@@ -3,10 +3,10 @@ Title: PyTDE developer documentation
 Author: Jim Bublitz, The TDE Team
 Abstract: This documentation describes the PyTDE API
  PyTDE contains the Python bindings to the TDE core library.
- This manual contains general handling instructions and 
+ This manual contains general handling instructions and
  a class reference.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/python-trinity-doc/html/index.html
-Files: /usr/share/doc/python-trinity-doc/html/*.html
+Index: /usr/share/doc/python-trinity-trinity-doc/html/index.html
+Files: /usr/share/doc/python-trinity-trinity-doc/html/*.html
diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.examples b/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
index e39721e20..e39721e20 100644
--- a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.examples
+++ b/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-doc.install
new file mode 100644
index 000000000..20b273acb
--- /dev/null
+++ b/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-doc.install
@@ -0,0 +1 @@
+doc/* usr/share/doc/python-trinity-trinity-doc/html