[SCM] mplayer/master.experimental: enable joystick at compilation but leave it disable in config (Closes: #592082)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit ce5af9277635cd53e42aa53cd4065e555545e471
Author: steph <stephrom at gmx.com>
Date:   Mon Nov 1 13:37:34 2010 +0100

    enable joystick at compilation but leave it disable in config (Closes: #592082)

diff --git a/debian/mplayer.conf b/debian/mplayer.conf
index 82d3630..9e49dfb 100644
--- a/debian/mplayer.conf
+++ b/debian/mplayer.conf
@@ -86,6 +86,9 @@ ao=pulse,alsa,sdl:aalib
 
 stop-xscreensaver=yes
 
+# Joystick input is disabled because of issues on some laptops(thinkpad).
+joystick=no
+
 # 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 65d99cd..516f353 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,6 +54,7 @@ CONFIGURE_FLAGS = \
 	--disable-libavformat_a \
 	--disable-libpostproc_a \
 	--disable-libswscale_a \
+	--enable-joystick \
 	$(archconf)
 
 ifeq ($(DEB_HOST_ARCH),i386)

-- 
mplayer packaging