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

[Per Olofsson]

The following commit has been merged in the master branch:
commit 978923b92e49e29324e1c9f410ea195e40a10690
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Thu Jul 23 09:11:34 2009 +0200

    Create all dirs with mkdir in debian/rules, so that they always exist even if we build arch-only. Closes: #537691.

diff --git a/debian/changelog b/debian/changelog
index 667c906..4c67963 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 lyx (1.6.3-4) UNRELEASED; urgency=low
 
   * Make latex-xft-fonts priority extra, correcting override disparity.
+  * Create all dirs with mkdir in debian/rules, so that they always
+    exist even if we build arch-only. Closes: #537691.
 
  -- Per Olofsson <pelle at debian.org>  Mon, 20 Jul 2009 09:00:18 +0200
 
diff --git a/debian/latex-xft-fonts.dirs b/debian/latex-xft-fonts.dirs
deleted file mode 100644
index 7276ecd..0000000
--- a/debian/latex-xft-fonts.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc
diff --git a/debian/lyx-common.dirs b/debian/lyx-common.dirs
deleted file mode 100644
index 6edf252..0000000
--- a/debian/lyx-common.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/texmf/tex/latex
-etc/bash_completion.d
diff --git a/debian/lyx.dirs b/debian/lyx.dirs
deleted file mode 100644
index 7276ecd..0000000
--- a/debian/lyx.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc
diff --git a/debian/rules b/debian/rules
index 01338e8..f7a9074 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,21 +54,29 @@ override_dh_auto_install:
 	cd build-tree && $(MAKE) install DESTDIR=`pwd`/../debian/lyx-common
 
 # move binaries to arch package
+	mkdir -p debian/lyx/usr/share
 	mv debian/lyx-common/usr/bin debian/lyx/usr/bin
 	mv debian/lyx-common/usr/share/man debian/lyx/usr/share/man
 
 # 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
 
+# move tex files to correct place
+	mkdir -p debian/lyx-common/usr/share/texmf/tex/latex
 	mv debian/lyx-common/usr/share/lyx/tex \
 		debian/lyx-common/usr/share/texmf/tex/latex/lyx
+
+# install bash completion
+	mkdir -p debian/lyx-common/etc/bash_completion.d
 	cp debian/bash_completion debian/lyx-common/etc/bash_completion.d/lyx
 
 override_dh_installdocs:
+	mkdir -p debian/lyx/usr/share/doc
 	ln -s lyx-common debian/lyx/usr/share/doc/lyx
 
 	dh_installdocs
diff --git a/debian/ttf-lyx.dirs b/debian/ttf-lyx.dirs
deleted file mode 100644
index 75e16f5..0000000
--- a/debian/ttf-lyx.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/fonts/truetype

-- 
LyX packaging