[SCM] mplayer packaging branch, master, updated. upstream/1.0rc2+svn20090303-94-ge2d2116

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c438aedfd0bddf029f6885884154ab2c22510bfa
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 11 22:19:41 2009 +0100

    remove debconf questions mplayer/ttfont and mplayer/no-ttfont
    
    mplayer is always compiled with fontconfig support, configure mplayer to
    use the font alias 'sans' and be done with that.

diff --git a/debian/mplayer.config b/debian/mplayer.config
index 6927cc2..12da8da 100644
--- a/debian/mplayer.config
+++ b/debian/mplayer.config
@@ -49,34 +49,6 @@ fi
 db_go  || true
 
 
-########################################## find fonts
-
-t=$(tempfile -p fonts )
-
-echo Sans >> $t
-echo Serif >> $t
-#this command is in package 'fontconfig'
-if test -x /usr/bin/fc-list ; then
- fc-list : family | cut -d, -f1  >> $t
-fi
-
-if test -s $t
-then
- fonts=$( awk '{printf("%s%s",a,$0) ; a=", "}' $t || true )
- db_subst "mplayer/ttfont" ttfontchoices $fonts  || true
- 
- # hack to work around set -e..
- db_input low  mplayer/ttfont && ret=0 || ret=$?
- if [ "$ret" = 30 ] ; then
-   db_set  mplayer/ttfont Sans  || true
- fi
-else
- db_input $CONFPRIORITY "mplayer/no-ttfont" || true
-fi
-
-
-rm $t
-
 ##############################################################
 
 #a list of mplayer -vo is added here automagically (see debian/config.augmenter)
diff --git a/debian/mplayer.postinst b/debian/mplayer.postinst
index 7091d03..4a0637a 100644
--- a/debian/mplayer.postinst
+++ b/debian/mplayer.postinst
@@ -62,12 +62,9 @@ create_conf () {
      test -r "$RET" || message "Mplayer warning: dvd device '$RET' does not exist!\n"
  fi
  
- db_get "mplayer/ttfont"
- if test "$RET" ; then
-     echo "#truetype font, using fontconfig" >> $t
-     echo "fontconfig=1" >> $t 
-     echo "font='${RET}'" >> $t
- fi
+ echo "#enable fontconfig" >> $t
+ echo "fontconfig=1" >> $t 
+ echo "font='sans'" >> $t
 
  echo "#if you do not like this default, override it by adding" >> $t
  echo "#  a ao= line below this debconf area" >> $t
diff --git a/debian/mplayer.templates b/debian/mplayer.templates
index f9482db..adf0946 100644
--- a/debian/mplayer.templates
+++ b/debian/mplayer.templates
@@ -21,18 +21,3 @@ _Description: MPlayer video output:
  .
  Please read the /usr/share/doc/mplayer-doc/HTML/en/video.html file from
  the 'mplayer-doc' package for more details.
-
-Template: mplayer/ttfont
-Type: select
-Choices: ${ttfontchoices}
-Default: ${ttfontdefault}
-_Description: Font for On Screen Display:
-
-Template: mplayer/no-ttfont
-Type: error
-_Description: No TrueType fonts found for On Screen Display
- MPlayer needs at least one TrueType font for its 'On Screen Display' feature.
- .
- You should install a package providing such fonts (such as
- 'ttf-freefont' or 'ttf-bitstream-vera' or 'msttcorefonts')
- and reconfigure MPlayer (by running 'dpkg-reconfigure mplayer').

-- 
mplayer packaging