[SCM] live-manual branch, debian, updated. debian/2.0_a7-1-3-g6699a55

Daniel Baumann daniel at debian.org
Sun Oct 3 08:41:25 UTC 2010


The following commit has been merged in the debian branch:
commit 6699a55e57fd73420d32c9522e4cb958325ca571
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Oct 3 10:38:00 2010 +0200

    Using debhelper install files instead of rules.

diff --git a/debian/live-manual-epub.install b/debian/live-manual-epub.install
new file mode 100644
index 0000000..9067030
--- /dev/null
+++ b/debian/live-manual-epub.install
@@ -0,0 +1 @@
+usr/share/doc/live-manual/epub
diff --git a/debian/live-manual-html.install b/debian/live-manual-html.install
new file mode 100644
index 0000000..5f7fe7f
--- /dev/null
+++ b/debian/live-manual-html.install
@@ -0,0 +1 @@
+usr/share/doc/live-manual/html
diff --git a/debian/live-manual-odf.install b/debian/live-manual-odf.install
new file mode 100644
index 0000000..24da313
--- /dev/null
+++ b/debian/live-manual-odf.install
@@ -0,0 +1 @@
+usr/share/doc/live-manual/odf
diff --git a/debian/live-manual-pdf.install b/debian/live-manual-pdf.install
new file mode 100644
index 0000000..b53f42e
--- /dev/null
+++ b/debian/live-manual-pdf.install
@@ -0,0 +1 @@
+usr/share/doc/live-manual/pdf
diff --git a/debian/live-manual-txt.install b/debian/live-manual-txt.install
new file mode 100644
index 0000000..885e29f
--- /dev/null
+++ b/debian/live-manual-txt.install
@@ -0,0 +1 @@
+usr/share/doc/live-manual/txt
diff --git a/debian/rules b/debian/rules
index 638d0da..7860e1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,28 +3,8 @@
 %:
 	dh ${@}
 
-override_dh_auto_install:
-	dh_auto_install
-
-	# live-manual-epub
-	mkdir -p debian/live-manual-epub/usr/share/doc/live-manual
-	mv debian/tmp/usr/share/doc/live-manual/epub debian/live-manual-epub/usr/share/doc/live-manual
-
-	# live-manual-html
-	mkdir -p debian/live-manual-html/usr/share/doc/live-manual
-	mv debian/tmp/usr/share/doc/live-manual/html debian/live-manual-html/usr/share/doc/live-manual
-
-	# live-manual-odf
-	mkdir -p debian/live-manual-odf/usr/share/doc/live-manual
-	mv debian/tmp/usr/share/doc/live-manual/odf debian/live-manual-odf/usr/share/doc/live-manual
-
-	# live-manual-pdf
-	mkdir -p debian/live-manual-pdf/usr/share/doc/live-manual
-	mv debian/tmp/usr/share/doc/live-manual/pdf debian/live-manual-pdf/usr/share/doc/live-manual
-
-	# live-manual-txt
-	mkdir -p debian/live-manual-txt/usr/share/doc/live-manual
-	mv debian/tmp/usr/share/doc/live-manual/txt debian/live-manual-txt/usr/share/doc/live-manual
+override_dh_install:
+	dh_install --fail-missing
 
 override_dh_compress:
 	dh_compress -X.html -X.odt

-- 
live-manual



More information about the debian-live-changes mailing list