X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fvdradmin;h=b38ecca4d1e89d42784abe24701e282dce93b610;hp=00e00f46a289184ebd2bd3852dac733151470b24;hb=5a2935b1b335077e7df76ae3dbd75331056bd198;hpb=0f8a65cbe11e12bcf212a3663541c87d362e7972

diff --git a/lfs/vdradmin b/lfs/vdradmin
index 00e00f46a..b38ecca4d 100644
--- 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.4
+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    = 1
+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 = ae3efed3f803d8524098f15a365c7838
+$(DL_FILE)_MD5 = d5cd89325f5a5dca5846a905b17d0bc2
 
 install : $(TARGET)
 
@@ -78,7 +78,13 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_SRC) && mv -vf vdradmin-am-$(VER) vdradmin && mv -vf vdradmin /opt
-	cp src/initscripts/init.d/vdradmin /etc/init.d
+	export "LANG=de_DE"
+	cp $(DIR_SRC)/config/vdradmin/install-ipfire.sh $(DIR_APP)/
+	cd $(DIR_APP) && ./install-ipfire.sh
+	install -v -m 644 $(DIR_SRC)/config/vdradmin/vdradmind.conf \
+		 /etc/vdradmin/vdradmind.conf
+	mkdir -pv /var/log/vdradmin
+	mkdir -pv /var/run/vdradmin
+	mkdir -pv /var/cache/vdradmin
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)