[SCM] 2D CAD system branch, master, updated. debian/1.0.0_rc1+nolibs-2-8-g89c8a58

[Lisandro Damián Nicanor Pérez Meyer]

The following commit has been merged in the master branch:
commit 9bb9442534e1d4bde7a2f38d9cc3f4a2d4a104e3
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Jun 19 16:46:41 2011 -0300

    Fix doc-base's paths and install on-app help.

diff --git a/debian/changelog b/debian/changelog
index a075808..8995bdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 librecad (1.0.0~rc1+nolibs-3) UNRELEASED; urgency=low
 
   [Lisandro Damián Nicanor Pérez Meyer]
-  * Install documentation to /usr/share/doc/librecad/.
+  * Install documentation to /usr/share/doc/librecad/:
+    - Fix doc-base's paths.
+    - Install the on-app help.
 
   [Scott Howard]
   * Use libdxflib's new includedir to fix a FTBFS
diff --git a/debian/librecad-doc.doc-base b/debian/librecad-doc.doc-base
index 5ccdcd0..a43e6de 100644
--- a/debian/librecad-doc.doc-base
+++ b/debian/librecad-doc.doc-base
@@ -5,6 +5,6 @@ Abstract: This manual describes the usage of QCad (LibreCAD).
 Section: Graphics
 
 Format: HTML
-Index: /usr/share/doc/librecad-doc/index.html
-Files: /usr/share/doc/librecad-doc/*.html
+Index: /usr/share/doc/librecad/index.html
+Files: /usr/share/doc/librecad/*.html
 
diff --git a/debian/librecad-doc.install b/debian/librecad-doc.install
index 81adc3e..6a09787 100644
--- a/debian/librecad-doc.install
+++ b/debian/librecad-doc.install
@@ -1 +1,2 @@
+unix/resources/doc/ /usr/share/doc/librecad/
 support/doc/ /usr/share/doc/librecad/

-- 
2D CAD system