r3715 - vdr/vdradmin-am/trunk/debian

[Tobias Grimm]

Author: tiber-guest
Date: 2006-11-11 02:01:13 +0100 (Sat, 11 Nov 2006)
New Revision: 3715

Added:
   vdr/vdradmin-am/trunk/debian/at2epgsearch
Modified:
   vdr/vdradmin-am/trunk/debian/NEWS.Debian
   vdr/vdradmin-am/trunk/debian/README.Debian
   vdr/vdradmin-am/trunk/debian/rules
   vdr/vdradmin-am/trunk/debian/vdradmin-am.install
Log:
added at2epgsearch to make transition of auto timers to epgsearch easier

Modified: vdr/vdradmin-am/trunk/debian/NEWS.Debian
===================================================================
--- vdr/vdradmin-am/trunk/debian/NEWS.Debian	2006-11-10 23:27:13 UTC (rev 3714)
+++ vdr/vdradmin-am/trunk/debian/NEWS.Debian	2006-11-11 01:01:13 UTC (rev 3715)
@@ -1,3 +1,12 @@
+vdradmin-am (3.5.0-1) unstable; urgency=low
+
+  The auto timer functionallity in VDRAdmin-AM will probably be dropped in future
+  versions (See upstream changelog for details). Autotimers will then be done with
+  the EPGSearch plugin. See README.Debian for details on how to move your auto
+  timer settings to the EPGSearch plugin
+
+ -- Tobias Grimm <tg at e-tobi.net>  Fri, 10 Nov 2006 20:18:35 +0100
+
 vdradmin (0.96-4) unstable; urgency=low
 
   The most important change in this release is that vdradmin from 

Modified: vdr/vdradmin-am/trunk/debian/README.Debian
===================================================================
--- vdr/vdradmin-am/trunk/debian/README.Debian	2006-11-10 23:27:13 UTC (rev 3714)
+++ vdr/vdradmin-am/trunk/debian/README.Debian	2006-11-11 01:01:13 UTC (rev 3715)
@@ -1,19 +1,23 @@
 vdradmin for Debian
--------------------
+===================
 
-This package provides a working config-file under /var/lib/vdradmin/vdradmind.conf, 
-this files uses a standard-username and standard-password (linvdr/linvdr), you 
-should change this before you enable the vdradmin-service in 
-/etc/default/vdradmin, alternatively you can generate a new config with:
+  Configuration file
+  ------------------
 
-vdradmin --config
+  This package provides a working config-file under /var/lib/vdradmin/vdradmind.conf, 
+  this files uses a standard-username and standard-password (linvdr/linvdr), you 
+  should change this before you enable the vdradmin-service in 
+  /etc/default/vdradmin, alternatively you can generate a new config with:
 
+  vdradmin --config
+
  -- Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>, Fri,  6 Aug 2004 22:57:28 +0200
  
 
-To hide vdradmin behind apache:
+  To hide vdradmin behind apache
+  ------------------------------
 
-  you will need apache with mod_proxy and these lines in httpd.conf:
+  You will need apache with mod_proxy and these lines in httpd.conf:
 
   <IfModule mod_proxy.c>
     ProxyRequests Off
@@ -21,3 +25,27 @@
   </IfModule>
 
  -- Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>, Wed,  1 Oct 2003 21:07:47 +0200
+
+
+  Moving auto timers to EPGSearch:
+  --------------------------------
+
+  The auto timer functionallity in VDRAdmin-AM will probably be dropped in
+  future versions (See upstream changelog for details). Autotimers will then be
+  done with the EPGSearch plugin. To move your auto timer settings from VDRAdmin
+  to EPGSerach, use the conversion script provided by the upstream autor:
+
+    /usr/share/vdradmin-am/autotimer2searchtimer.pl
+
+  (pass -h to see help on all available options)
+
+  If you have installed VDRAdmin-AM and VDR on the same machine, another script: 
+
+    /usr/share/vdradmin-am/at2epgsearch
+
+  ...makes this a little bit easier. Just run this script without any arguments
+  and the autotimers will be converted from /var/lib/vdradmin-am/vdradmin.at to
+  /var/lib/vdr/plugins/epgsearch/epgsearch.conf (default match mode is:
+  "every word of the search term must match").
+
+ -- Tobias Grimm <tg at e-tobi.net>  Fri, 10 Nov 2006 20:18:35 +0100

Added: vdr/vdradmin-am/trunk/debian/at2epgsearch
===================================================================
--- vdr/vdradmin-am/trunk/debian/at2epgsearch	2006-11-10 23:27:13 UTC (rev 3714)
+++ vdr/vdradmin-am/trunk/debian/at2epgsearch	2006-11-11 01:01:13 UTC (rev 3715)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+autotimer2searchtimer="/usr/share/vdradmin-am/autotimer2searchtimer.pl"
+svdrpsend="/usr/lib/vdr/svdrpsend.pl"
+vdradmin_at="/var/lib/vdradmin-am/vdradmind.at"
+epgsearch_dir="/var/lib/vdr/plugins/epgsearch"
+epgsearch_conf="$epgsearch_dir/epgsearch.conf"
+
+error()
+{
+    echo "ERROR: $1"
+    exit 1
+}
+
+[ ! -s "$vdradmin_at" ] && error "No VDRAdmim-AM auto timers found"
+[ ! -d "$epgsearch_dir" ] && error "No vdr-plugin-epgsearch installation found"
+
+if $svdrpsend HELP 2>/dev/null | grep -q epgsearch ; then
+    $autotimer2searchtimer -i "$vdradmin_at" -s
+else
+    [ -s "$epgsearch_conf" ] && \
+      error "VDR must be running with the EPGSearch plugin loaded"
+
+    $autotimer2searchtimer -i "$vdradmin_at" -o "$epgsearch_conf"
+    chown vdr:vdr "$epgsearch_conf"
+fi

Modified: vdr/vdradmin-am/trunk/debian/rules
===================================================================
--- vdr/vdradmin-am/trunk/debian/rules	2006-11-10 23:27:13 UTC (rev 3714)
+++ vdr/vdradmin-am/trunk/debian/rules	2006-11-11 01:01:13 UTC (rev 3715)
@@ -36,6 +36,9 @@
 # Remove shell extensions
 	@cp vdradmind.pl vdradmind
 	@cp vdradmind.pl.1 vdradmind.1
+
+# Set permissions
+	chmod a+x $(CURDIR)/debian/at2epgsearch
         
 # Build architecture-independent files here.
 binary-indep: install

Modified: vdr/vdradmin-am/trunk/debian/vdradmin-am.install
===================================================================
--- vdr/vdradmin-am/trunk/debian/vdradmin-am.install	2006-11-10 23:27:13 UTC (rev 3714)
+++ vdr/vdradmin-am/trunk/debian/vdradmin-am.install	2006-11-11 01:01:13 UTC (rev 3715)
@@ -2,4 +2,5 @@
 template/                usr/share/vdradmin-am/
 convert.pl               usr/share/vdradmin-am/
 autotimer2searchtimer.pl usr/share/vdradmin-am/
+debian/at2epgsearch      usr/share/vdradmin-am/
 vdradmind                usr/bin/