[SCM] mplayer packaging branch, karmic, updated. debian/1.0.rc3+svn20090426-1ubuntu8

[siretart at users.alioth.debian.org]

The following commit has been merged in the karmic branch:
commit 6d266f0076bed6cb475e23467d76d31729c6bdb5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Oct 3 10:58:26 2009 +0200

    add ubuntu specific configuration file
    
    for video, first try xvmc, then xv, then x11 for video driver,
    for audio, try pulse, then alsa then oss.

diff --git a/etc/example.conf b/debian/mplayer.conf
similarity index 93%
copy from etc/example.conf
copy to debian/mplayer.conf
index cb3e290..9af41e9 100644
--- a/etc/example.conf
+++ b/debian/mplayer.conf
@@ -1,7 +1,7 @@
 #
 # MPlayer configuration file
 #
-# Configuration files are read system-wide from /usr/local/etc/mplayer.conf
+# Configuration files are read system-wide from /etc/mplayer.conf
 # and per user from ~/.mplayer/config, where per-user settings override
 # system-wide settings, all of which are overrriden by the command line.
 #
@@ -17,10 +17,7 @@
 ##################
 
 # Specify default video driver (see -vo help for a list).
-#vo=xv
-
-# Use SDL video with the aalib subdriver by default.
-#vo = sdl:aalib
+vo=vdpau,xv,x11
 
 # FBdev driver:
 #
@@ -70,8 +67,8 @@
 # audio settings #
 ##################
 
-# Specify default audio driver (see -ao help for a list).
-#ao=oss
+# Use pulse, then alsa, then SDL video with the aalib subdriver by default.
+ao=pulse,alsa,sdl:aalib
 
 # Use SDL audio driver with the esd subdriver by default.
 #ao = sdl:esd
@@ -87,6 +84,8 @@
 # other settings #
 ##################
 
+stop-xscreensaver=yes
+
 # Pretend to be Window Media Player.
 # Fixes playback when playlist and media file use the same URL.
 #user-agent=NSPlayer/4.1.0.3856
diff --git a/debian/rules b/debian/rules
index 4518976..117e4df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -172,7 +172,7 @@ install-arch:
 	dh_prep -a
 	$(MAKE) install-mplayer DESTDIR=$(CURDIR)/debian/mplayer-nogui
 	$(MAKE) install-mplayer-man-en DESTDIR=$(CURDIR)/debian/mplayer-nogui
-	install -D -m 644 etc/example.conf \
+	install -D -m 644 debian/mplayer.conf \
 	                  $(CURDIR)/debian/mplayer-nogui/etc/mplayer/mplayer.conf
 	#install mencoder
 	$(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder

-- 
mplayer packaging