r3372 - in vdr/vdr-plugin-mp3/trunk/debian: . patches
Tobias Grimm
tiber-guest at costa.debian.org
Sat Sep 23 16:48:47 UTC 2006
Author: tiber-guest
Date: 2006-09-23 16:48:45 +0000 (Sat, 23 Sep 2006)
New Revision: 3372
Added:
vdr/vdr-plugin-mp3/trunk/debian/mount.sh
Removed:
vdr/vdr-plugin-mp3/trunk/debian/mount
Modified:
vdr/vdr-plugin-mp3/trunk/debian/changelog
vdr/vdr-plugin-mp3/trunk/debian/control
vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch
vdr/vdr-plugin-mp3/trunk/debian/rules
Log:
Build-Depend on vdr-dev (>=1.4.3-1)
Modified: vdr/vdr-plugin-mp3/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/changelog 2006-09-23 16:34:35 UTC (rev 3371)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog 2006-09-23 16:48:45 UTC (rev 3372)
@@ -10,6 +10,7 @@
* Depend on mjpegtools (>=1:1.8.0) and netpbm
* Moved shell scripts to /usr/share/vdr-plugin-mp3
* Added debian/compat
+ * Build-Depend on vdr-dev (>=1.4.3-1)
-- Tobias Grimm <tg at e-tobi.net> Thu, 21 Sep 2006 21:53:46 +0200
Modified: vdr/vdr-plugin-mp3/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/control 2006-09-23 16:34:35 UTC (rev 3371)
+++ vdr/vdr-plugin-mp3/trunk/debian/control 2006-09-23 16:48:45 UTC (rev 3372)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>=1.4.2-1), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev
+Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>=1.4.3-1), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev
Standards-Version: 3.7.2
Package: vdr-plugin-mp3
Deleted: vdr/vdr-plugin-mp3/trunk/debian/mount
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/mount 2006-09-23 16:34:35 UTC (rev 3371)
+++ vdr/vdr-plugin-mp3/trunk/debian/mount 2006-09-23 16:48:45 UTC (rev 3372)
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# This script is called from VDR to mount/unmount/eject
-# the sources for MP3 play and/or image sources,
-#
-# argument 1: wanted action, one of mount,unmount,eject,status
-# argument 2: mountpoint to act on
-#
-# mount,unmount,eject must return 0 if succeeded, 1 if failed
-# status must return 0 if device is mounted, 1 if not
-#
-# ok -> changed mount to not abort, if eject -t did fail, e.g. for a usb storage device
-
-action="$1"
-path="$2"
-
-case "$action" in
-mount)
- eject -t "$path" &>/dev/null # close the tray, but not do/print anything if that fails
- mount "$path" || exit 1 # mount it
- ;;
-unmount)
- umount "$path" || exit 1 # unmount it
- ;;
-eject)
- eject "$path" || exit 1 # eject disk
- ;;
-status)
- cat /proc/mounts | grep -q "$path" # check if mounted
- if [ $? -ne 0 ]; then # not mounted ...
- exit 1
- fi
-esac
-
-exit 0
Copied: vdr/vdr-plugin-mp3/trunk/debian/mount.sh (from rev 3368, vdr/vdr-plugin-mp3/trunk/debian/mount)
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/mount.sh (rev 0)
+++ vdr/vdr-plugin-mp3/trunk/debian/mount.sh 2006-09-23 16:48:45 UTC (rev 3372)
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# This script is called from VDR to mount/unmount/eject
+# the sources for MP3 play and/or image sources,
+#
+# argument 1: wanted action, one of mount,unmount,eject,status
+# argument 2: mountpoint to act on
+#
+# mount,unmount,eject must return 0 if succeeded, 1 if failed
+# status must return 0 if device is mounted, 1 if not
+#
+# ok -> changed mount to not abort, if eject -t did fail, e.g. for a usb storage device
+
+action="$1"
+path="$2"
+
+case "$action" in
+mount)
+ eject -t "$path" &>/dev/null # close the tray, but not do/print anything if that fails
+ mount "$path" || exit 1 # mount it
+ ;;
+unmount)
+ umount "$path" || exit 1 # unmount it
+ ;;
+eject)
+ eject "$path" || exit 1 # eject disk
+ ;;
+status)
+ cat /proc/mounts | grep -q "$path" # check if mounted
+ if [ $? -ne 0 ]; then # not mounted ...
+ exit 1
+ fi
+esac
+
+exit 0
Modified: vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch 2006-09-23 16:34:35 UTC (rev 3371)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch 2006-09-23 16:48:45 UTC (rev 3372)
@@ -8,7 +8,7 @@
@DPATCH@
diff -urNad vdr-plugin-mp3-0.9.15~/data-mp3.c vdr-plugin-mp3-0.9.15/data-mp3.c
--- vdr-plugin-mp3-0.9.15~/data-mp3.c 2006-04-23 17:41:14.000000000 +0200
-+++ vdr-plugin-mp3-0.9.15/data-mp3.c 2006-09-23 16:55:54.000000000 +0200
++++ vdr-plugin-mp3-0.9.15/data-mp3.c 2006-09-23 18:46:11.000000000 +0200
@@ -36,8 +36,8 @@
#define di(x) ;
#endif
@@ -22,13 +22,25 @@
const char *img_suff[] = { "jpg","png","gif",0 };
diff -urNad vdr-plugin-mp3-0.9.15~/data.c vdr-plugin-mp3-0.9.15/data.c
--- vdr-plugin-mp3-0.9.15~/data.c 2006-05-16 19:31:09.000000000 +0200
-+++ vdr-plugin-mp3-0.9.15/data.c 2006-09-23 16:51:16.000000000 +0200
++++ vdr-plugin-mp3-0.9.15/data.c 2006-09-23 18:46:11.000000000 +0200
@@ -38,7 +38,7 @@
// ----------------------------------------------------------------
-const char *mountscript = "mount.sh";
-+const char *mountscript = "/usr/lib/vdr-plugin-mp3/mount.sh";
++const char *mountscript = "/usr/lib/vdr-plugin-mp3/mount";
char *Quote(const char *str)
{
+diff -urNad vdr-plugin-mp3-0.9.15~/player-mplayer.c vdr-plugin-mp3-0.9.15/player-mplayer.c
+--- vdr-plugin-mp3-0.9.15~/player-mplayer.c 2006-09-19 20:17:50.000000000 +0200
++++ vdr-plugin-mp3-0.9.15/player-mplayer.c 2006-09-23 18:47:43.000000000 +0200
+@@ -47,7 +47,7 @@
+
+ #define MPLAYER_VOL_STEP 3.0
+
+-const char *MPlayerCmd = "mplayer.sh";
++const char *MPlayerCmd = "/usr/share/vdr-plugin-mplayer/mplayer";
+ int MPlayerAid=-1;
+ const char *globalResumeDir = 0;
+
Modified: vdr/vdr-plugin-mp3/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/rules 2006-09-23 16:34:35 UTC (rev 3371)
+++ vdr/vdr-plugin-mp3/trunk/debian/rules 2006-09-23 16:48:45 UTC (rev 3372)
@@ -57,8 +57,8 @@
dh_installdirs
dh_install
- install -m 755 $(CURDIR)/debian/mount \
- $(CURDIR)/debian/$(VDR)-plugin-mp3/usr/share/$(VDR)-plugin-mp3/
+ install -m 755 $(CURDIR)/debian/mount.sh \
+ $(CURDIR)/debian/$(VDR)-plugin-mp3/usr/share/$(VDR)-plugin-mp3/mount
install -m 755 $(CURDIR)/examples/image_convert.sh.example \
$(CURDIR)/debian/$(VDR)-plugin-mp3/usr/share/$(VDR)-plugin-mp3/image_convert
More information about the pkg-vdr-dvb-changes
mailing list