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

[Per Olofsson]

The following commit has been merged in the master branch:
commit b9c24aceaac67c7d0c6d777b5c7d5f98e20723b7
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Sun Jul 5 17:45:56 2009 +0200

    Move fonts in debian/rules instead of deleting them and installing manually.

diff --git a/debian/changelog b/debian/changelog
index e2b86ab..57e7910 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ lyx (1.6.3-2) UNRELEASED; urgency=low
   [ Per Olofsson ]
   * Update Vcs-* fields to the new Git repository.
   * Update ttf-lyx description.
+  * Move fonts in debian/rules instead of deleting them and installing
+    manually.
 
  -- Sven Hoexter <sven at timegate.de>  Wed, 24 Jun 2009 20:12:24 +0200
 
diff --git a/debian/rules b/debian/rules
index 0a21e29..b093881 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,8 +79,10 @@ install: build
 	mv debian/lyx-common/usr/bin debian/lyx/usr/bin
 	mv debian/lyx-common/usr/share/man debian/lyx/usr/share/man
 
-# remove font directory as fonts are in the package ttf-lyx
-	rm -r debian/lyx-common/usr/share/lyx/fonts
+# move fonts to font package
+	mkdir -p debian/ttf-lyx/usr/share/fonts/truetype
+	mv debian/lyx-common/usr/share/lyx/fonts \
+		debian/ttf-lyx/usr/share/fonts/truetype/ttf-lyx
 
 # remove empty directory
 	rmdir debian/lyx-common/usr/share/lyx/images/commands
diff --git a/debian/ttf-lyx.install b/debian/ttf-lyx.install
deleted file mode 100644
index 181a138..0000000
--- a/debian/ttf-lyx.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/fonts/*.ttf /usr/share/fonts/truetype/ttf-lyx

-- 
LyX packaging