[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 fe29120b32095b4ffe9b30af6d5149603ce30c1a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 11 21:29:38 2009 +0100

    remove debconf question mplayer/replace-existing-files-bail
    
    gets rid of another debconf abuse, cf #445091

diff --git a/debian/mplayer.config b/debian/mplayer.config
index 603dffb..b01771a 100644
--- a/debian/mplayer.config
+++ b/debian/mplayer.config
@@ -47,8 +47,6 @@ then
  db_get  'mplayer/replace-existing-files' || true
  if [ "$RET" != "true" ] 
  then
-    db_input $CONFPRIORITY 'mplayer/replace-existing-files-bail' || true
-    db_go  || true
     exit 0
     #since we are bailing out, all code from here on must be related to $CONF
  fi
diff --git a/debian/mplayer.templates b/debian/mplayer.templates
index 6d906ea..daf41fa 100644
--- a/debian/mplayer.templates
+++ b/debian/mplayer.templates
@@ -7,15 +7,6 @@ _Description: Replace existing configuration file?
  by a generated one (the old file will be moved to
  /etc/mplayer/mplayer.conf.debconf-old).
 
-Template: mplayer/replace-existing-files-bail
-Type: note
-_Description: Old configuration file kept
- You chose not to replace the existing /etc/mplayer/mplayer.conf
- file.
- .
- That file can be generated automatically later by running
- 'dpkg-reconfigure mplayer'.
-
 Template: mplayer/voutput
 Type: select
 Default: autodetect

-- 
mplayer packaging