* Export unselect.png

* Fix paths when installed in Debian package

diff --git a/debian/patches/00list b/debian/patches/00list
index b14d3a839095e36c82a29aab2d35d467efcfc2eb..7a5f1782c4889a7ae527286967232ddc6000b3be 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 20_no-wx-updates
+20_osdmenu-paths

diff --git a/debian/patches/20_osdmenu-paths.dpatch b/debian/patches/20_osdmenu-paths.dpatch
new file mode 100755 (executable)
index 0000000..e79d2f6
--- /dev/null
+++ b/debian/patches/20_osdmenu-paths.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh -e
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- vlc.orig/share/osdmenu/default.cfg
++++ vlc/share/osdmenu/default.cfg
+@@ -1,4 +1,4 @@
+-dir share/osdmenu/default
++dir /usr/share/vlc/osdmenu/default
+ action        key-play-pause (0,0)
+       unselect unselected.png
+       select   selection/play_pause.png
+--- vlc.orig/share/osdmenu/dvd.cfg
++++ vlc/share/osdmenu/dvd.cfg
+@@ -1,4 +1,4 @@
+-dir share/osdmenu/dvd
++dir /usr/share/vlc/osdmenu/dvd
+ action        key-play (0,0)
+       unselect unselect/barroff.png
+       select   selection/play.png
+--- vlc.orig/modules/video_filter/osdmenu.c
++++ vlc/modules/video_filter/osdmenu.c
+@@ -90,7 +90,7 @@
+ #if defined( WIN32 ) || defined( UNDER_CE )
+ #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
+ #else
+-#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
++#define OSD_DEFAULT_CFG "/usr/share/vlc/osdmenu/default.cfg"
+ #endif
+ 
+ #define OSD_UPDATE_MIN     0

diff --git a/share/Makefile.am b/share/Makefile.am
index 487525e66f2cfd856702f5bab40601cac77c36d3..ea820e4a2005e1f77e5da0af79b3d736a5e95ba8 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -101,6 +101,7 @@ DIST_http = \
 
 DIST_osdmenu_default = \
        osdmenu/default.cfg \
+       osdmenu/default/unselected.png \
        osdmenu/default/selection/bw.png \
        osdmenu/default/selection/esc.png \
        osdmenu/default/selection/fw.png \