Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

[people/teissler/ipfire-2.x.git] / lfs / vdradmin

diff --git a/lfs/vdradmin b/lfs/vdradmin
index 3bd788f0e2a2a4b31e597e03f286383d0ea3d91a..b38ecca4d1e89d42784abe24701e282dce93b610 100644 (file)
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 3.6.7
+VER        = 3.6.9
 
 THISAPP    = vdradmin-am-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -33,9 +33,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdradmin
-PAK_VER    = 4
+PAK_VER    = 5
 
-DEPS       = "perl-gettext vdr"
+DEPS       = "perl-gettext vdr vdr_epgsearch"
 
 ###############################################################################
 # Top-level Rules
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8b1b2f8bbff26cbb47e79d5b55dbd3c1
+$(DL_FILE)_MD5 = d5cd89325f5a5dca5846a905b17d0bc2
 
 install : $(TARGET)
 
@@ -83,8 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && ./install-ipfire.sh
        install -v -m 644 $(DIR_SRC)/config/vdradmin/vdradmind.conf \
                 /etc/vdradmin/vdradmind.conf
-       mkdir /var/log/vdradmin
-       mkdir /var/run/vdradmin
-       mkdir /var/cache/vdradmin
+       mkdir -pv /var/log/vdradmin
+       mkdir -pv /var/run/vdradmin
+       mkdir -pv /var/cache/vdradmin
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)