r473 - vdr/vdr-plugin-vdrcd/trunk/debian

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 17 Apr 2005 20:13:58 +0000


Author: tschmidt
Date: 2005-04-17 20:13:57 +0000 (Sun, 17 Apr 2005)
New Revision: 473

Added:
   vdr/vdr-plugin-vdrcd/trunk/debian/commands.vdrcd.conf
   vdr/vdr-plugin-vdrcd/trunk/debian/links
   vdr/vdr-plugin-vdrcd/trunk/debian/mount.sh
Modified:
   vdr/vdr-plugin-vdrcd/trunk/debian/changelog
   vdr/vdr-plugin-vdrcd/trunk/debian/control
   vdr/vdr-plugin-vdrcd/trunk/debian/install
   vdr/vdr-plugin-vdrcd/trunk/debian/plugin.vdrcd.conf
Log:
vdr-plugin-vdrcd:
    - New upstream release
    - Depend/Build-Depend on vdr (>=1.3.23-1)
    - Conflict with vdr (>=1.3.24)
    - Changed my email address to the one from Debian
    - Added mount.sh, commands.vdrcd.conf and plugin.vdrcd.conf
      from vdrdevel-plugin-vdrcd


Modified: vdr/vdr-plugin-vdrcd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/changelog	2005-04-17 19:57:56 UTC (rev 472)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/changelog	2005-04-17 20:13:57 UTC (rev 473)
@@ -1,9 +1,20 @@
+vdr-plugin-vdrcd (0.0.10.1-1) experimental; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+
+  * Thomas Schmidt <tschmidt@debian.org> 
+    - New upstream release
+    - Depend/Build-Depend on vdr (>=1.3.23-1)
+    - Conflict with vdr (>=1.3.24)
+    - Changed my email address to the one from Debian
+    - Added mount.sh, commands.vdrcd.conf and plugin.vdrcd.conf
+      from vdrdevel-plugin-vdrcd
+  
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 17 Apr 2005 22:05:17 +0200
+
 vdr-plugin-vdrcd (0.0.10-1) unstable; urgency=low
 
-  !!! not ready for uploading, still needs testing !!!
-
   * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> 
     - Initial Release.
 
  -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Wed,  8 Dec 2004 01:49:03 +0100
-

Added: vdr/vdr-plugin-vdrcd/trunk/debian/commands.vdrcd.conf
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/commands.vdrcd.conf	2005-04-17 19:57:56 UTC (rev 472)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/commands.vdrcd.conf	2005-04-17 20:13:57 UTC (rev 473)
@@ -0,0 +1 @@
+Eject CD : /usr/lib/vdr-plugin-vdrcd/mount.sh unmount /cdfs ; /usr/lib/vdr-plugin-vdrcd/mount.sh unmount /cdrom ; /usr/lib/vdr-plugin-vdrcd/mount.sh eject /cdrom

Modified: vdr/vdr-plugin-vdrcd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/control	2005-04-17 19:57:56 UTC (rev 472)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/control	2005-04-17 20:13:57 UTC (rev 473)
@@ -2,15 +2,15 @@
 Section: misc
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
-Uploaders: Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.2.6-6), dpatch (>= 2.0.9)
+Uploaders: Thomas Schmidt <tschmidt@debian.org>
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.23-1), dpatch (>= 2.0.9)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-vdrcd
 Architecture: any
-Depends: ${shlibs:Depends}, vdr (>= 1.2.6-6), vdr-plugin-dvd, vdr-plugin-vcd
+Depends: ${shlibs:Depends}, vdr (>= 1.3.23-1), vdr-plugin-dvd, vdr-plugin-vcd
 Suggests: vdr-plugin-mp3
-Conflicts: vdr (>= 1.2.7)
+Conflicts: vdr (>= 1.3.24)
 Description: Mediadetection Plugin for vdr
  This Plugin tries to identify the type of a Media Disc 
  inserted into your CD-ROM/DVD drive. If the type of media 

Modified: vdr/vdr-plugin-vdrcd/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/install	2005-04-17 19:57:56 UTC (rev 472)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/install	2005-04-17 20:13:57 UTC (rev 473)
@@ -1,3 +1,4 @@
-libvdr-vdrcd.so.*    		usr/lib/vdr/plugins/
-debian/plugin.vdrcd.conf	etc/vdr/plugins/
-
+libvdr-vdrcd.so.*               usr/lib/vdr/plugins/
+debian/plugin.vdrcd.conf        etc/vdr/plugins/
+debian/mount.sh                 usr/lib/vdr-plugin-vdrcd/
+debian/commands.vdrcd.conf      usr/share/vdr/command-hooks/

Added: vdr/vdr-plugin-vdrcd/trunk/debian/links
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/links	2005-04-17 19:57:56 UTC (rev 472)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/links	2005-04-17 20:13:57 UTC (rev 473)
@@ -0,0 +1 @@
+etc/vdr/command-hooks/commands.vdrcd.conf  usr/share/vdr/command-hooks/commands.vdrcd.conf

Added: vdr/vdr-plugin-vdrcd/trunk/debian/mount.sh
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/mount.sh	2005-04-17 19:57:56 UTC (rev 472)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/mount.sh	2005-04-17 20:13:57 UTC (rev 473)
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# This script is called from VDR to mount/unmount/eject the 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-vdrcd/trunk/debian/plugin.vdrcd.conf
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/plugin.vdrcd.conf	2005-04-17 19:57:56 UTC (rev 472)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/plugin.vdrcd.conf	2005-04-17 20:13:57 UTC (rev 473)
@@ -1 +1,9 @@
--c /media/cdrom0
+#
+# Command line parameters for vdr-plugin-vdrcd
+#
+# For details see /usr/share/doc/vdr-plugin-vdrcd/README.gz
+#
+# If you change the mount points /cdfs and /cdrom you probably have to change
+# the eject command in /etc/vdr/command-hooks/commands.vdrcd.conf too.
+#
+-m /usr/lib/vdr-plugin-vdrcd/mount.sh -c /cdfs -c /cdrom