[SCM] vlc/master: Apply upstream fix for KDE device actions.

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6b6f5e99f49deb64aeb7614e87dbb67d8e92cd9e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Nov 26 00:22:53 2010 +0100

    Apply upstream fix for KDE device actions.
    
    LP: #542293

diff --git a/debian/patches/Fix-for-KDE-device-actions.patch b/debian/patches/Fix-for-KDE-device-actions.patch
new file mode 100644
index 0000000..2da726d
--- /dev/null
+++ b/debian/patches/Fix-for-KDE-device-actions.patch
@@ -0,0 +1,57 @@
+From: Lari Natri <lari.natri at gmail.com>
+Subject: [PATCH] Fix for KDE device actions
+ This tiny patch enables opening of VideoCD/AudioCD/DVD discs with VLC in KDE
+ when inserted, which was broken before.
+Origin: upstream, http://git.videolan.org/?p=vlc.git;a=commitdiff;h=99ebae0c04aa2ce0b3085fbba78f4245c713d9c2
+Bug-Ubuntu: https://launchpad.net/bugs/542293
+Applied-Upstream: 1.2.0
+
+diff --git a/share/solid/vlc-opencda.desktop b/share/solid/vlc-opencda.desktop
+index 4bdd52a..866e85f 100644
+--- a/share/solid/vlc-opencda.desktop
++++ b/share/solid/vlc-opencda.desktop
+@@ -5,6 +5,6 @@ Actions=open;
+ 
+ [Desktop Action open]
+ Name=Open with VLC media player
+-Exec=vlc cdda://
++Exec=vlc cdda://%d
+ Icon=vlc
+ 
+diff --git a/share/solid/vlc-opendvd.desktop b/share/solid/vlc-opendvd.desktop
+index e86fa40..620a396 100644
+--- a/share/solid/vlc-opendvd.desktop
++++ b/share/solid/vlc-opendvd.desktop
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+-X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoDvd' ]
++X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]
+ Type=Service
+ Actions=open;
+ 
+ [Desktop Action open]
+ Name=Open with VLC media player
+-Exec=vlc dvd://
++Exec=vlc dvd://%d
+ Icon=vlc
+ 
+diff --git a/share/solid/vlc-openvcd.desktop b/share/solid/vlc-openvcd.desktop
+index 4b75c7b..2965ea5 100644
+--- a/share/solid/vlc-openvcd.desktop
++++ b/share/solid/vlc-openvcd.desktop
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+-X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoCd|SuperVideoCd' ]
++X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'VideoCd|SuperVideoCd' ]
+ Type=Service
+ Actions=open;
+ 
+ [Desktop Action open]
+ Name=Open with VLC media player
+-Exec=vlc vcd://
++Exec=vlc vcd://%d
+ Icon=vlc
+ 
+-- 
+1.7.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 39ffe16..9b80c3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 052_as-needed.diff
 200_osdmenu_paths.diff
 300_transcode_aspect_ratio.diff
+Fix-for-KDE-device-actions.patch
diff --git a/debian/rules b/debian/rules
index c362562..ea47994 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ confflags += \
 	--enable-vcdx \
 	--enable-vorbis \
 	--enable-zvbi \
-	--with-kde-solid \
+	--with-kde-solid=/usr/share/kde4/apps/solid/actions/ \
 	--with-mozilla-pkg=libxul \
 	$(NULL)
 # Reasons for disabling features:

-- 
VLC media player packaging