[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 2b325057ed134d539d5c27fa7f88b6e6ddb17e69
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 11 21:23:08 2009 +0100

    move debconf cfgnote, cf. #445091
    
    as suggested in #445091, this is really a debconf abuse. Move the notes
    to README.Debian instead

diff --git a/debian/README.Debian b/debian/README.Debian
index ed9028b..61e569a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,3 +1,16 @@
+--------------------- on mplayer configuration
+
+The performance of MPlayer depends heavily on hardware; this means that
+it may benefit from tweaking options for every single machine it's
+installed on.
+
+Please see also the documentation provided by the 'mplayer-doc' package.
+
+Now, some configuration options will be set for the entire system in
+/etc/mplayer/mplayer.conf which may be adapted later. Any user can also
+refine options in ~/.mplayer/config.
+
+
 --------------------- on debian-multimedia
 
 Christian Marillat  offers many multimedia-related packages in his repository,
@@ -109,4 +122,4 @@ but for the following notes and exceptions:
 *N* to avoid stripping, use DEB_BUILD_OPTIONS=nostrip
     to enable debugging, use DEB_BUILD_OPTIONS=nostrip,debug
 
- -- A Mennucc <debdev at tonelli.sns.it>, Fri, 15 Dec 2006 14:53:12 +0100
+ -- Reinhard Tartler <siretart at tauware.de>, Wed, 11 Mar 2009 21:20:16 +0100
diff --git a/debian/mplayer.config b/debian/mplayer.config
index 1ceaff8..603dffb 100644
--- a/debian/mplayer.config
+++ b/debian/mplayer.config
@@ -56,18 +56,6 @@ fi
 
 db_go  || true
 
-### OK, go on configuring $CONF
-
-#db_beginblock
-
-db_input $CONFPRIORITY mplayer/cfgnote || true
-
-
-#db_endblock
-
-#db_go || true
-
-
 ########################################## dvd  device
 
 db_input  $CONFPRIORITY mplayer/dvd_device  || true
diff --git a/debian/mplayer.templates b/debian/mplayer.templates
index 2cbb1be..6d906ea 100644
--- a/debian/mplayer.templates
+++ b/debian/mplayer.templates
@@ -1,17 +1,3 @@
-Template: mplayer/cfgnote
-Type: note
-_Description: Detailed configuration needed for each user
- The performance of MPlayer depends heavily on hardware; this means that
- it may benefit from tweaking options for every single machine it's
- installed on.
- .
- You should read the documentation provided by the
- 'mplayer-doc' package.
- .
- Now, some configuration options will be set for the entire system in
- /etc/mplayer/mplayer.conf which may be adapted later. Any user can also
- refine options in ~/.mplayer/config.
-
 Template: mplayer/replace-existing-files
 Type: boolean
 Default: false

-- 
mplayer packaging