[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 14336d263e2dbb2982055472c9f40234040fb859
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 11 22:00:24 2009 +0100

    remove debconf question mplayer/dvd_device
    
    Modern Debian systems are almost always managed using udev, which
    provides a /dev/dvd symlink. Relying on this is certainly better than
    bugging the user about this.
    
    For the case that the user has more than one dvd drive and udev gets the
    wrong one, he can still override that decison in his configuration file.
    
    For the case that the system doesn't use udev, we can assume that the
    user is experienced enough to manage the configuration file himself.

diff --git a/debian/mplayer.config b/debian/mplayer.config
index f2e2a99..6927cc2 100644
--- a/debian/mplayer.config
+++ b/debian/mplayer.config
@@ -48,11 +48,6 @@ fi
 
 db_go  || true
 
-########################################## dvd  device
-
-db_input  $CONFPRIORITY mplayer/dvd_device  || true
-
-
 
 ########################################## find fonts
 
diff --git a/debian/mplayer.postinst b/debian/mplayer.postinst
index 4ffcae4..7091d03 100644
--- a/debian/mplayer.postinst
+++ b/debian/mplayer.postinst
@@ -58,7 +58,7 @@ create_conf () {
  db_get "mplayer/dvd_device"
  if test "$RET" ; then
      echo "#device for dvd" >> $t
-     echo "dvd-device=${RET}" >> $t 
+     echo "dvd-device=/dev/dvd" >> $t 
      test -r "$RET" || message "Mplayer warning: dvd device '$RET' does not exist!\n"
  fi
  
diff --git a/debian/mplayer.templates b/debian/mplayer.templates
index 2ebf31b..f9482db 100644
--- a/debian/mplayer.templates
+++ b/debian/mplayer.templates
@@ -22,12 +22,6 @@ _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/dvd_device
-Type: string
-Default: /dev/cdrom
-_Description: DVD device name:
- Please enter the name of the device for your DVD player, if any.
-
 Template: mplayer/ttfont
 Type: select
 Choices: ${ttfontchoices}

-- 
mplayer packaging