[med-svn] r8504 - trunk/packages/freediams/trunk/debian

[Andreas Tille]

Author: tille
Date: 2011-11-09 14:48:05 +0000 (Wed, 09 Nov 2011)
New Revision: 8504

Modified:
   trunk/packages/freediams/trunk/debian/changelog
   trunk/packages/freediams/trunk/debian/freediams-doc-en.install
   trunk/packages/freediams/trunk/debian/freediams-doc-fr.install
   trunk/packages/freediams/trunk/debian/rules
Log:
Install docs viea dh_install instead of doing it manually


Modified: trunk/packages/freediams/trunk/debian/changelog
===================================================================
--- trunk/packages/freediams/trunk/debian/changelog	2011-11-09 14:45:19 UTC (rev 8503)
+++ trunk/packages/freediams/trunk/debian/changelog	2011-11-09 14:48:05 UTC (rev 8504)
@@ -12,6 +12,10 @@
     - Clarified license of several third party files
   * debian/rules: clean some autogenerated *.qm files
   * debian/freediams-doc-{en,fr}.doc-base
+  * debian/freediams-doc-{en,fr}.links: Add index.html links as
+    documentation index
+  * debian/freediams-doc-{en,fr}.install, debian/rules:
+    install documentation via dh_install rather than manually
 
  -- Andreas Tille <tille at debian.org>  Tue, 08 Nov 2011 10:50:11 +0100
 

Modified: trunk/packages/freediams/trunk/debian/freediams-doc-en.install
===================================================================
--- trunk/packages/freediams/trunk/debian/freediams-doc-en.install	2011-11-09 14:45:19 UTC (rev 8503)
+++ trunk/packages/freediams/trunk/debian/freediams-doc-en.install	2011-11-09 14:48:05 UTC (rev 8504)
@@ -1 +1 @@
-usr/share/doc/freediams/en
+global_resources/doc/freediams/en/html/* usr/share/doc/freediams/en

Modified: trunk/packages/freediams/trunk/debian/freediams-doc-fr.install
===================================================================
--- trunk/packages/freediams/trunk/debian/freediams-doc-fr.install	2011-11-09 14:45:19 UTC (rev 8503)
+++ trunk/packages/freediams/trunk/debian/freediams-doc-fr.install	2011-11-09 14:48:05 UTC (rev 8504)
@@ -1 +1 @@
-usr/share/doc/freediams/fr
+global_resources/doc/freediams/fr/html/* usr/share/doc/freediams/fr

Modified: trunk/packages/freediams/trunk/debian/rules
===================================================================
--- trunk/packages/freediams/trunk/debian/rules	2011-11-09 14:45:19 UTC (rev 8503)
+++ trunk/packages/freediams/trunk/debian/rules	2011-11-09 14:48:05 UTC (rev 8504)
@@ -19,12 +19,6 @@
 	make install
 
 override_dh_install:
-	# Install documentation
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/freediams/en
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/freediams/fr
-	cp -a global_resources/doc/freediams/en/html/* $(CURDIR)/debian/tmp/usr/share/doc/freediams/en
-	cp -a global_resources/doc/freediams/fr/html/* $(CURDIR)/debian/tmp/usr/share/doc/freediams/fr
-
 	# Remove those Links to dynamic libraries which have no version number (this should only
 	# be provided in -dev packages.  But some *.so files are real files without version number
 	# FIXME
@@ -33,7 +27,7 @@
 	# remove doc files from /usr/bin
 	rm -f debian/tmp/usr/bin/[CR]*
 
-	dh_install --autodest
+	dh_install
 
 override_dh_shlibdeps::
 	LD_LIBRARY_PATH=debian/tmp/usr/lib/freediams dh_shlibdeps -l/usr/lib/freediams