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

    remove debconf question mplayer/install_codecs
    
    gets rid of another debconf abuse, cf #445091

diff --git a/debian/mplayer.config b/debian/mplayer.config
index b01771a..f2e2a99 100644
--- a/debian/mplayer.config
+++ b/debian/mplayer.config
@@ -23,12 +23,6 @@ case "${1}" in
 esac
 
 
-case "$(dpkg --print-installation-architecture)" in
-    i386|powerpc|alpha)
-        db_input medium mplayer/install_codecs  || true
-        ;;
-esac
-
 #for questions related to creation of /etc/mplayer/mplayer.conf
 CONFPRIORITY=medium
 #mplayer conf
diff --git a/debian/mplayer.templates b/debian/mplayer.templates
index daf41fa..2ebf31b 100644
--- a/debian/mplayer.templates
+++ b/debian/mplayer.templates
@@ -22,19 +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/install_codecs
-Type: note
-_Description: Binary codecs download
- MPlayer supports most video formats without additional software.
- .
- Additional video formats, such as Real 3.0/4.0, Windows Media 9, or Quicktime,
- can be supported by using binary codecs.
- .
- As such codecs are not free software, they are not distributed with
- this package but can be downloaded freely. The
- '/usr/share/mplayer/scripts/binary_codecs.sh' script is provided in
- this package to help downloading them from the MPlayer web site.
-
 Template: mplayer/dvd_device
 Type: string
 Default: /dev/cdrom

-- 
mplayer packaging