[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/2.0.0_beta3-498-gc5df014

[Sven Hoexter]

The following commit has been merged in the master branch:
commit 642117494e5334944a0d8888623b578eb89c0a37
Author: Sven Hoexter <sven at timegate.de>
Date:   Thu Feb 3 11:47:44 2011 +0100

    Remove the latex-xft-fonts dummy package.

diff --git a/debian/changelog b/debian/changelog
index 82dc180..8e6f16d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ lyx (2.0.0~beta3-2) UNRELEASED; urgency=low
   * Remove debian/patches/fix-manpage-errors, applied upstream.
     Thanks Georg.
   * Add debian/patches/hyphen-as-minus.
+  * Remove the latex-xft-fonts dummy package.
 
   [ Per Olofsson ]
   * Add debian/source/local-options with option unapply-patches.
diff --git a/debian/control b/debian/control
index cd6ef44..28646b9 100644
--- a/debian/control
+++ b/debian/control
@@ -69,11 +69,3 @@ 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: latex-xft-fonts
-Architecture: all
-Section: fonts
-Priority: extra
-Depends: ${misc:Depends}, ttf-lyx
-Description: TrueType versions of some TeX fonts -- transitional package
- This package only exists to ease the transition to the ttf-lyx package.
diff --git a/debian/latex-xft-fonts.preinst b/debian/latex-xft-fonts.preinst
deleted file mode 100644
index 6605d6e..0000000
--- a/debian/latex-xft-fonts.preinst
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-set -e
-
-# Remove a no-longer used conffile
-rm_conffile() {
-	local PKGNAME="$1"
-	local CONFFILE="$2"
-
-	[ -e "$CONFFILE" ] || return 0
-
-	local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
-	local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
-	if [ "$md5sum" != "$old_md5sum" ]; then
-		echo "Obsolete conffile $CONFFILE has been modified by you."
-		echo "Saving as $CONFFILE.dpkg-bak ..."
-		mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-	else
-		echo "Removing obsolete conffile $CONFFILE ..."
-		rm -f "$CONFFILE"
-	fi
-}
-
-hintsfile=/etc/defoma/hints/latex-xft-fonts.hints
-
-case "$1" in
-install|upgrade)
-	if dpkg --compare-versions "$2" le "0.1-8"; then
-		if [ "$1" = upgrade ] && [ -f $hintsfile ] && \
-			[ -x "`which defoma-font 2>/dev/null`" ]; then
-			defoma-font purge-all $hintsfile
-		fi
-
-		rm_conffile latex-xft-fonts $hintsfile
-	fi
-esac
-
-#DEBHELPER#

-- 
LyX packaging