r5974 - in /vdr/vdradmin-am/trunk/debian: changelog control patches/03_cfgfiles-fhs.dpatch

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Wed Dec  5 01:11:19 2007
New Revision: 5974

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5974
Log:
* New upstream release (closes: #416377)

Modified:
    vdr/vdradmin-am/trunk/debian/changelog
    vdr/vdradmin-am/trunk/debian/control
    vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch

Modified: vdr/vdradmin-am/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/changelog?rev=5974&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/changelog (original)
+++ vdr/vdradmin-am/trunk/debian/changelog Wed Dec  5 01:11:19 2007
@@ -1,10 +1,10 @@
-vdradmin-am (3.5.3-5) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
+vdradmin-am (3.6.0-1) unstable; urgency=low
+
+  * New upstream release (closes: #416377)
   * Fixed clean target (closes: #442756)
   * Updated debian/copyright
 
- -- Tobias Grimm <tg at e-tobi.net>  Tue, 18 Sep 2007 22:28:54 +0200
+ -- Tobias Grimm <tg at e-tobi.net>  Wed, 05 Dec 2007 02:10:40 +0100
 
 vdradmin-am (3.5.3-4) unstable; urgency=low
 

Modified: vdr/vdradmin-am/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/control?rev=5974&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/control (original)
+++ vdr/vdradmin-am/trunk/debian/control Wed Dec  5 01:11:19 2007
@@ -11,7 +11,7 @@
 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
-Suggests: vdr, libauthen-sasl-perl, vdr-plugin-epgsearch (>= 0.9.20)
+Suggests: vdr, libauthen-sasl-perl, vdr-plugin-epgsearch (>= 0.9.21)
 Provides: vdradmin
 Replaces: vdradmin
 Conflicts: vdradmin

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=5974&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch (original)
+++ vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch Wed Dec  5 01:11:19 2007
@@ -6,10 +6,10 @@
 ## DP: with the FHS (vdradmin changes these files at runtime)
 
 @DPATCH@
-diff -urNad vdradmin-am-3.4.5/vdradmind.pl /tmp/dpep.mLrIzJ/vdradmin-am-3.4.5/vdradmind.pl
---- vdradmin-am-3.4.5/vdradmind.pl	2006-05-14 20:08:55.455513500 +0200
-+++ /tmp/dpep.mLrIzJ/vdradmin-am-3.4.5/vdradmind.pl	2006-05-14 21:56:11.128785750 +0200
-@@ -117,9 +117,9 @@
+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 @@
  $CONFIG{SERVERHOST} = "0.0.0.0";
  $CONFIG{SERVERPORT} = 8001;
  $CONFIG{LOCAL_NET}  = "0.0.0.0/32";
@@ -22,13 +22,13 @@
  $CONFIG{VDRVFAT}    = 1;
  
  #
-@@ -221,15 +221,15 @@
+@@ -259,15 +259,15 @@
      bindtextdomain("vdradmin", "${BASENAME}locale");
  } else {
      $ETCDIR        = "/etc/vdradmin";
 -    $TEMPLATEDIR   = "/usr/share/vdradmin/template";
 +    $TEMPLATEDIR   = "/usr/share/vdradmin-am/template";
-     $LOGFILE       = "/var/log/$CONFIG{LOGFILE}";
+     $LOGDIR        = "/var/log";
      $PIDFILE       = "/var/run/vdradmind.pid";
 -    $CONFFILE      = "${ETCDIR}/vdradmind.conf";
 -    $AT_FILENAME   = "${ETCDIR}/vdradmind.at";