[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. debian/2.0.1-1-25-g054f9c9

[Per Olofsson]

The following commit has been merged in the master branch:
commit 054f9c9c3c54b43551709d4aae8f4f452a9a77dc
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Tue Mar 6 13:54:41 2012 +0100

    Create /usr/share/doc/fonts-lyx before moving the readme file there. Fixes FTBFS when building binary-arch.

diff --git a/debian/changelog b/debian/changelog
index 92895a0..b7695cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lyx (2.0.3-2) UNRELEASED; urgency=low
+
+  * Create /usr/share/doc/fonts-lyx before moving the readme file there.
+    Fixes FTBFS when building binary-arch.
+
+ -- Per Olofsson <pelle at debian.org>  Tue, 06 Mar 2012 13:54:33 +0100
+
 lyx (2.0.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index 3e89470..f69cc4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,16 +43,18 @@ override_dh_auto_install:
 # make script executable
 	chmod 755 debian/lyx-common/usr/share/lyx/scripts/listerrors
 
+# handle font documentation
+	mkdir -p debian/fonts-lyx/usr/share/doc/fonts-lyx
+	mv debian/fonts-lyx/usr/share/fonts/truetype/lyx/ReadmeBaKoMa4LyX.txt \
+		debian/fonts-lyx/usr/share/doc/fonts-lyx/
+	rm debian/fonts-lyx/usr/share/fonts/truetype/lyx/BaKoMaFontLicense.txt
+
 override_dh_installdocs:
 	mkdir -p debian/lyx/usr/share/doc
 	ln -s lyx-common debian/lyx/usr/share/doc/lyx
 
 	dh_installdocs
 
-	mv debian/fonts-lyx/usr/share/fonts/truetype/lyx/ReadmeBaKoMa4LyX.txt \
-		debian/fonts-lyx/usr/share/doc/fonts-lyx/
-	rm debian/fonts-lyx/usr/share/fonts/truetype/lyx/BaKoMaFontLicense.txt
-
 override_dh_python2:
 	dh_python2 /usr/share/lyx
 

-- 
LyX packaging