[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. c5920eb604bc6b15c799eef3cb4f676cc15f4c5b

[Per Olofsson]

The following commit has been merged in the master branch:
commit c5920eb604bc6b15c799eef3cb4f676cc15f4c5b
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Sat Jul 18 12:53:01 2009 +0200

    fix ordering of stuff, make sure dirs are created before installing

diff --git a/debian/lyx.dirs b/debian/lyx.dirs
new file mode 100644
index 0000000..dd222db
--- /dev/null
+++ b/debian/lyx.dirs
@@ -0,0 +1 @@
+usr/share
diff --git a/debian/rules b/debian/rules
index 46b8c54..061d2d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,12 +57,7 @@ override_dh_auto_install:
 	mv debian/lyx-common/usr/bin debian/lyx/usr/bin
 	mv debian/lyx-common/usr/share/man debian/lyx/usr/share/man
 
-# move fonts and font docs to font package
-	mkdir -p debian/ttf-lyx/usr/share/fonts/truetype
-	mkdir -p debian/ttf-lyx/usr/share/doc/ttf-lyx
-	mv debian/lyx-common/usr/share/lyx/fonts/ReadmeBaKoMa4LyX.txt \
-		debian/ttf-lyx/usr/share/doc/ttf-lyx/
-	rm debian/lyx-common/usr/share/lyx/fonts/BaKoMaFontLicense.txt
+# move fonts to font package
 	mv debian/lyx-common/usr/share/lyx/fonts \
 		debian/ttf-lyx/usr/share/fonts/truetype/ttf-lyx
 
@@ -73,6 +68,13 @@ override_dh_auto_install:
 		debian/lyx-common/usr/share/texmf/tex/latex/lyx
 	cp debian/bash_completion debian/lyx-common/etc/bash_completion.d/lyx
 
+override_dh_installdocs:
+	dh_installdocs
+
+	mv debian/lyx-common/usr/share/lyx/fonts/ReadmeBaKoMa4LyX.txt \
+		debian/ttf-lyx/usr/share/doc/ttf-lyx/
+	rm debian/lyx-common/usr/share/lyx/fonts/BaKoMaFontLicense.txt
+
 override_dh_pysupport:
 	dh_pysupport /usr/share/lyx
 
diff --git a/debian/ttf-lyx.dirs b/debian/ttf-lyx.dirs
new file mode 100644
index 0000000..75e16f5
--- /dev/null
+++ b/debian/ttf-lyx.dirs
@@ -0,0 +1 @@
+usr/share/fonts/truetype

-- 
LyX packaging