From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 14 Sep 2012 18:36:51 +0000 (-0700)
Subject: Install jpg, css and preview.pdf files into the doc packages
X-Git-Tag: debian/2.16.0-1_exp+1~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=757f38e53994b5180112e0bfef3b39514c748717;p=lilypond.git

Install jpg, css and preview.pdf files into the doc packages
---

diff --git a/debian/rules b/debian/rules
index 4cb3edcb8d..eab7b203d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,22 +43,27 @@ override_dh_auto_install-indep:
 	rm -rf $(CURDIR)/debian/tmp/usr/share/omf
 	rm -rf $(CURDIR)/debian/tmp/usr/share/doc/lilypond/html/input
 
-## we need to install only the png, ly and english html files into the
-## doc-html package, and only the english pdfs into the doc-pdf
-## package. Because dh_install doesn't support regexes, we'll use find
-## to replace the contents of the .install file before we call
-## dh_install
+## we need to install only the png, jpg, css, ly and english html
+## files into the doc-html package, and only the english pdfs into the
+## doc-pdf package. Because dh_install doesn't support regexes, we'll
+## use find to replace the contents of the .install file before we
+## call dh_install
 override_dh_install:
-	echo -e 'usr/share/doc/lilypond/html/*/*/*.ly\nusr/share/doc/lilypond/html/*/*/*.png' \
+	/bin/echo -e 'usr/share/doc/lilypond/html/*/*/*.ly\nusr/share/doc/lilypond/html/*/*/*.png' \
 		> $(CURDIR)/debian/lilypond-doc-html.install
+	/bin/echo -e 'usr/share/doc/lilypond/html/*/*/*.jpg\nusr/share/doc/lilypond/html/*/*/*.css' \
+		>> $(CURDIR)/debian/lilypond-doc-html.install
 	find $(CURDIR)/debian/tmp/ -type f \
 		-regex '.*usr/share/doc/lilypond/.*/[^\.]+.html' \
 		-printf '%P\n' >> $(CURDIR)/debian/lilypond-doc-html.install
-	echo -e ''> $(CURDIR)/debian/lilypond-doc-pdf.install
+	/bin/echo -e ''> $(CURDIR)/debian/lilypond-doc-pdf.install
 	find $(CURDIR)/debian/tmp/ -type f \
 		-regex '.*usr/share/doc/lilypond/.*/[^\.]+.pdf' \
 		-printf '%P\n' >> $(CURDIR)/debian/lilypond-doc-pdf.install
-	dh_install
+	find $(CURDIR)/debian/tmp/ -type f \
+		-regex '.*usr/share/doc/lilypond/.*/[^\.]+.preview.pdf' \
+		-printf '%P\n' >> $(CURDIR)/debian/lilypond-doc-pdf.install
+	dh_install --list-missing
 
 
 ## this rule will update debian/control and the per-language install