r7363 - in /vdr/vdradmin-am/trunk/debian: changelog control copyright patches/00list patches/03_cfgfiles-fhs.dpatch patches/04_epg_filename.dpatch patches/05_ipv6-support.dpatch vdradmin-am.init watch

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Fri Aug 1 20:14:28 UTC 2008 

Author: tiber-guest
Date: Fri Aug  1 20:14:28 2008
New Revision: 7363

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7363
Log:
* New upstream release
* Fixed hompage and debian/watch to match the new upstream location
* Removed 04_epg_filename.dpatch
* Removed 05_ipv6-support.dpatch - ipv6 support can now be enabled by
  the --ipv6 switch, which is the default for the daemon installed
  by this package
* Depend on lsb-base and use LSB init-functions for init script log
  messages

Removed:
    vdr/vdradmin-am/trunk/debian/patches/04_epg_filename.dpatch
    vdr/vdradmin-am/trunk/debian/patches/05_ipv6-support.dpatch
Modified:
    vdr/vdradmin-am/trunk/debian/changelog
    vdr/vdradmin-am/trunk/debian/control
    vdr/vdradmin-am/trunk/debian/copyright
    vdr/vdradmin-am/trunk/debian/patches/00list
    vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch
    vdr/vdradmin-am/trunk/debian/vdradmin-am.init
    vdr/vdradmin-am/trunk/debian/watch

Modified: vdr/vdradmin-am/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/changelog?rev=7363&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/changelog (original)
+++ vdr/vdradmin-am/trunk/debian/changelog Fri Aug  1 20:14:28 2008
@@ -1,3 +1,16 @@
+vdradmin-am (3.6.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixed hompage and debian/watch to match the new upstream location
+  * Removed 04_epg_filename.dpatch
+  * Removed 05_ipv6-support.dpatch - ipv6 support can now be enabled by
+    the --ipv6 switch, which is the default for the daemon installed
+    by this package
+  * Depend on lsb-base and use LSB init-functions for init script log
+    messages
+
+ -- Tobias Grimm <tg at e-tobi.net>  Fri, 01 Aug 2008 20:46:08 +0200
+
 vdradmin-am (3.6.1-2) unstable; urgency=low
 
   * Removed reference of $DAEMON_OPTS in /etc/default/vdradmin-am,

Modified: vdr/vdradmin-am/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/control?rev=7363&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/control (original)
+++ vdr/vdradmin-am/trunk/debian/control Fri Aug  1 20:14:28 2008
@@ -7,11 +7,13 @@
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdradmin-am/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/
-Homepage: http://andreas.vdr-developer.org/
+Homepage: http://andreas.vdr-developer.org/vdradmin-am/index.html
 
 Package: vdradmin-am
 Architecture: all
-Depends: ${perl:Depends}, libcompress-zlib-perl, libtemplate-perl, liburi-perl, libio-socket-inet6-perl, libsocket6-perl, liblocale-gettext-perl | libintl-perl, adduser
+Depends: ${perl:Depends}, libcompress-zlib-perl, libtemplate-perl, liburi-perl,
+ libio-socket-inet6-perl, libsocket6-perl, liblocale-gettext-perl | libintl-perl,
+ adduser, lsb-base
 Suggests: vdr, libauthen-sasl-perl, vdr-plugin-epgsearch (>= 0.9.23)
 Provides: vdradmin
 Replaces: vdradmin

Modified: vdr/vdradmin-am/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/copyright?rev=7363&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/copyright (original)
+++ vdr/vdradmin-am/trunk/debian/copyright Fri Aug  1 20:14:28 2008
@@ -1,5 +1,5 @@
 Upstream Homepage:
-    http://andreas.vdr-developer.org/
+    http://andreas.vdr-developer.org/vdradmin-am/index.html
 
 Upstream Authors:
     Andreas Mair <mail at andreas.vdr-developer.org> (current vdradmin-am)

Modified: vdr/vdradmin-am/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/00list?rev=7363&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/00list (original)
+++ vdr/vdradmin-am/trunk/debian/patches/00list Fri Aug  1 20:14:28 2008
@@ -1,6 +1,4 @@
 01_dist-var
 02_search-path.dpatch
 03_cfgfiles-fhs
-04_epg_filename
-05_ipv6-support
 06_template-cache

Modified: vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch?rev=7363&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch (original)
+++ vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch Fri Aug  1 20:14:28 2008
@@ -6,10 +6,10 @@
 ## DP: with the FHS (vdradmin changes these files at runtime)
 
 @DPATCH@
-diff -urNad vdradmin-am-3.6.0~/vdradmind.pl vdradmin-am-3.6.0/vdradmind.pl
---- vdradmin-am-3.6.0~/vdradmind.pl	2007-12-05 00:17:11.000000000 +0100
-+++ vdradmin-am-3.6.0/vdradmind.pl	2007-12-05 00:21:07.000000000 +0100
-@@ -131,9 +131,9 @@
+diff -urNad vdradmin-am-3.6.2~/vdradmind.pl vdradmin-am-3.6.2/vdradmind.pl
+--- vdradmin-am-3.6.2~/vdradmind.pl	2008-08-01 20:51:48.000000000 +0200
++++ vdradmin-am-3.6.2/vdradmind.pl	2008-08-01 20:52:56.000000000 +0200
+@@ -132,9 +132,9 @@
  $CONFIG{SERVERHOST} = "0.0.0.0";
  $CONFIG{SERVERPORT} = 8001;
  $CONFIG{LOCAL_NET}  = "0.0.0.0/32";
@@ -19,10 +19,10 @@
 +$CONFIG{VIDEODIR}   = "/var/lib/video";
 +$CONFIG{VDRCONFDIR} = "/var/lib/vdr";
 +$CONFIG{EPGIMAGES}  = "/var/cache/vdr/epgimages";
- $CONFIG{VDRVFAT}    = 1;
  
  #
-@@ -259,15 +259,15 @@
+ $CONFIG{TEMPLATE}   = "default";
+@@ -261,15 +261,15 @@
      bindtextdomain("vdradmin", "${BASENAME}locale");
  } else {
      $ETCDIR        = "/etc/vdradmin";

Modified: vdr/vdradmin-am/trunk/debian/vdradmin-am.init
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/vdradmin-am.init?rev=7363&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/vdradmin-am.init (original)
+++ vdr/vdradmin-am/trunk/debian/vdradmin-am.init Fri Aug  1 20:14:28 2008
@@ -22,12 +22,14 @@
 GROUP=vdradmin-am
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/vdradmind
-NAME=vdradmin
+NAME=vdradmind
 DESC="VDR Webadministration interface"
 PIDFILE=/var/run/vdradmin.pid
 NICE="10"
 
 test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
 
 # Include vdradmin defaults if available
 if [ -f /etc/default/vdradmin-am ] ; then
@@ -61,14 +63,15 @@
 start_daemon()
 {
     if [ "$ENABLED" != "0" ] ; then
+        log_daemon_msg "Starting $DESC" $NAME
         init_language_environment
         create_logfile
         LANG=$LANG start-stop-daemon --start \
           -c $USER:$GROUP -b -m --nicelevel $NICE --pidfile $PIDFILE \
-          --exec $DAEMON -- -nf
-	echo "$NAME."
+          --exec $DAEMON -- -nf --ipv6
+	log_end_msg $?
     else
-        echo -n "- aborted (to enable the daemon, edit /etc/default/vdradmin-am)"
+        log_warning_msg "VDRAdmin-AM disabled - enable in /etc/default/vdradmin-am"
     fi
 }
 
@@ -87,21 +90,19 @@
 
 stop_daemon()
 {
+    log_daemon_msg "Stopping $DESC" $NAME
     start-stop-daemon --stop -q -o --pidfile $PIDFILE > /dev/null
+    log_end_msg $?
 }
 
 case "$1" in
     start)
-        echo -n "Starting $DESC: "
         start_daemon 
         ;;
     stop)
-        echo -n "Stopping $DESC: "
         stop_daemon
-        echo "$NAME."
         ;;
   restart|force-reload)
-        echo -n "Restarting $DESC: "
         stop_daemon
         start_daemon
         ;;
@@ -117,3 +118,4 @@
 esac
 
 exit 0
+

Modified: vdr/vdradmin-am/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/watch?rev=7363&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/watch (original)
+++ vdr/vdradmin-am/trunk/debian/watch Fri Aug  1 20:14:28 2008
@@ -1,3 +1,3 @@
 version=2
-http://andreas.vdr-developer.org/download.html \
+http://andreas.vdr-developer.org/vdradmin-am/download.html \
   download/vdradmin-am-(.*)\.tar\.bz2

More information about the pkg-vdr-dvb-changes mailing list