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

[Per Olofsson]

The following commit has been merged in the master branch:
commit bfc83cb6926d64139b368324fd8565814ad387f5
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Sat Mar 3 12:53:57 2012 +0100

    Rename ttf-lyx to fonts-lyx.

diff --git a/debian/changelog b/debian/changelog
index fd4c6b1..9db5592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ lyx (2.0.3-1) UNRELEASED; urgency=low
   * Use debhelper v9 mode.
   * Use xz source tarballs.
   * Make /usr/share/lyx/scripts/listerrors executable.
+  * Rename ttf-lyx to fonts-lyx.
 
  -- Per Olofsson <pelle at debian.org>  Tue, 14 Feb 2012 17:18:00 +0100
 
diff --git a/debian/control b/debian/control
index 37ffb68..a236516 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: python (>= 2.6.6-3), debhelper (>= 9),
 Package: lyx
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, lyx-common (= ${source:Version}), xdg-utils
-Recommends: texlive-latex-recommended, texlive-latex-extra, texlive-science, texlive-generic-extra, texlive-fonts-recommended, preview-latex-style, dvipng, imagemagick, psutils, ghostscript, poppler-utils, ttf-lyx, evince-gtk | pdf-viewer, elyxer | tex4ht | hevea | tth | latex2html 
+Recommends: texlive-latex-recommended, texlive-latex-extra, texlive-science, texlive-generic-extra, texlive-fonts-recommended, preview-latex-style, dvipng, imagemagick, psutils, ghostscript, poppler-utils, fonts-lyx, evince-gtk | pdf-viewer, elyxer | tex4ht | hevea | tth | latex2html
 Suggests: rcs, dvipost, groff, libtiff-tools, gnuhtml2latex, wv, chktex, noweb, sgmltools-lite, linuxdoc-tools, writer2latex, latex2rtf, librsvg2-bin | inkscape, texlive-xetex, etoolbox
 Description: document processor
  LyX is an almost WYSIWYG-frontend for LaTeX. It makes the power and
@@ -51,12 +51,11 @@ Description: architecture-independent files for LyX
  architecture-dependent. See the lyx package for a description of LyX
  itself.
 
-Package: ttf-lyx
+Package: fonts-lyx
 Architecture: all
 Section: fonts
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}
-Description: TrueType versions of some TeX fonts
+Description: TrueType versions of some TeX fonts used by LyX
  These fonts are needed for the visual math symbol display in
  LyX. They can also be used to display MathML in Gecko-based browsers
  like Iceweasel.
@@ -71,3 +70,13 @@ Description: TrueType versions of some TeX fonts
   * msam10  - Extra math symbols, first series
   * msbm10  - Extra math symbols, second series, including Blackboard Bold
   * wasy10  - Waldi symbol fonts
+
+Package: ttf-lyx
+Architecture: all
+Section: oldlibs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, fonts-lyx
+Description: transitional package
+ This package only exists to facilitate the renaming of ttf-lyx to
+ fonts-lyx. You may safely remove this package once no other package
+ depends on it.
diff --git a/debian/rules b/debian/rules
index 95257c3..98a0ce8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,9 +28,9 @@ override_dh_auto_install:
 	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
+	mkdir -p debian/fonts-lyx/usr/share/fonts/truetype
 	mv debian/lyx-common/usr/share/lyx/fonts \
-		debian/ttf-lyx/usr/share/fonts/truetype/ttf-lyx
+		debian/fonts-lyx/usr/share/fonts/truetype/lyx
 
 # remove empty directory
 	rmdir debian/lyx-common/usr/share/lyx/images/commands
@@ -54,10 +54,9 @@ override_dh_installdocs:
 
 	dh_installdocs
 
-	mkdir -p debian/ttf-lyx/usr/share/doc/ttf-lyx
-	mv debian/ttf-lyx/usr/share/fonts/truetype/ttf-lyx/ReadmeBaKoMa4LyX.txt \
-		debian/ttf-lyx/usr/share/doc/ttf-lyx/
-	rm debian/ttf-lyx/usr/share/fonts/truetype/ttf-lyx/BaKoMaFontLicense.txt
+	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