Updated VDRAdmin form 3.6.5 to 3.6.7 (stable)

diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin
index 3857e5e2108dc08d89c87b60082013c20fe5768c..17be5a74ffea7c07d46d0df60f3bbac14bfb5caa 100644 (file)
--- a/config/rootfiles/packages/vdradmin
+++ b/config/rootfiles/packages/vdradmin
@@ -1,7 +1,3 @@
-etc/rc.d/init.d/vdradmin
-etc/rc.d/rc0.d/K01vdradmin
-etc/rc.d/rc6.d/K01vdradmin
-etc/rc.d/rc3.d/S99vdradmin

 #etc/vdradmin
 etc/vdradmin/vdradmind.conf
 usr/bin/vdradmind
 #etc/vdradmin
 etc/vdradmin/vdradmind.conf
 usr/bin/vdradmind


@@ -24,40 +20,13 @@ usr/bin/vdradmind
 #usr/share/doc/vdradmin/contrib/user.css.example
 #usr/share/doc/vdradmin/contrib/vdradmind.bl_example
 #usr/share/locale/cs/LC_MESSAGES/vdradmin.mo
 #usr/share/doc/vdradmin/contrib/user.css.example
 #usr/share/doc/vdradmin/contrib/vdradmind.bl_example
 #usr/share/locale/cs/LC_MESSAGES/vdradmin.mo

-#usr/share/locale/cs_CZ.utf8
-#usr/share/locale/cs_CZ.utf8/LC_MESSAGES
-#usr/share/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo

 usr/share/locale/de/LC_MESSAGES/vdradmin.mo
 usr/share/locale/de/LC_MESSAGES/vdradmin.mo

-#usr/share/locale/de_DE.utf8
-#usr/share/locale/de_DE.utf8/LC_MESSAGES
-usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
-#usr/share/locale/en_US.utf8
-#usr/share/locale/en_US.utf8/LC_MESSAGES
-usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo

 #usr/share/locale/es/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/es/LC_MESSAGES/vdradmin.mo

-#usr/share/locale/es_ES.utf8
-#usr/share/locale/es_ES.utf8/LC_MESSAGES
-#usr/share/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo

 #usr/share/locale/fi/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/fi/LC_MESSAGES/vdradmin.mo

-#usr/share/locale/fi_FI.utf8
-#usr/share/locale/fi_FI.utf8/LC_MESSAGES
-#usr/share/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo

 #usr/share/locale/fr/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/fr/LC_MESSAGES/vdradmin.mo

-#usr/share/locale/fr_FR.utf8
-#usr/share/locale/fr_FR.utf8/LC_MESSAGES
-#usr/share/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo

 #usr/share/locale/it/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/it/LC_MESSAGES/vdradmin.mo

-#usr/share/locale/it_IT.utf8
-#usr/share/locale/it_IT.utf8/LC_MESSAGES
-#usr/share/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo

 #usr/share/locale/nl/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/nl/LC_MESSAGES/vdradmin.mo

-#usr/share/locale/nl_NL.utf8
-#usr/share/locale/nl_NL.utf8/LC_MESSAGES
-#usr/share/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo

 #usr/share/locale/ru/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/ru/LC_MESSAGES/vdradmin.mo

-#usr/share/locale/ru_RU.utf8
-#usr/share/locale/ru_RU.utf8/LC_MESSAGES
-#usr/share/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo

 #usr/share/man/man1/vdradmind.1
 usr/share/vdradmin
 #usr/share/vdradmin/lib
 #usr/share/man/man1/vdradmind.1
 usr/share/vdradmin
 #usr/share/vdradmin/lib


@@ -205,3 +174,11 @@ usr/share/vdradmin
 #usr/share/vdradmin/template/default/timer_new.html
 #usr/share/vdradmin/template/default/tv.html
 #usr/share/vdradmin/template/default/vdr_cmds.html
 #usr/share/vdradmin/template/default/timer_new.html
 #usr/share/vdradmin/template/default/tv.html
 #usr/share/vdradmin/template/default/vdr_cmds.html

+etc/rc.d/init.d/vdradmin
+etc/rc.d/rc0.d/K01vdradmin
+etc/rc.d/rc6.d/K01vdradmin
+etc/rc.d/rc3.d/S99vdradmin
+#usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
+#usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
+var/log/vdradmin
+var/run/vdradmin

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index ee4aa7305bbb62ca829fc6b516cbf767b4570a76..b1d12db423eb1159769952657881942cd343653b 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -184,7 +184,6 @@
 * libogg-1.1.4
 * liboping-1.3.4
 * libpcap-1.0.0
 * libogg-1.1.4
 * liboping-1.3.4
 * libpcap-1.0.0

-* libpng-1.2.12

 * libpng-1.2.44
 * libpri-1.4.10.2
 * libsafe_2.0-16
 * libpng-1.2.44
 * libpri-1.4.10.2
 * libsafe_2.0-16


@@ -333,7 +332,6 @@
 * teamspeak-2.0.24.1
 * texinfo-4.8
 * tftp-hpa-0.48
 * teamspeak-2.0.24.1
 * texinfo-4.8
 * tftp-hpa-0.48

-* tiff-3.8.2

 * tiff-3.9.4
 * traceroute-2.0.12
 * tripwire-2.4.1.2
 * tiff-3.9.4
 * traceroute-2.0.12
 * tripwire-2.4.1.2


@@ -348,7 +346,7 @@
 * v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire
 * v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire-xen
 * vdr-1.6.0
 * v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire
 * v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire-xen
 * vdr-1.6.0

-* vdradmin-am-3.6.5
+* vdradmin-am-3.6.7

 * vim-7.0
 * vlan.1.9
 * vlc-0.8.6i
 * vim-7.0
 * vlan.1.9
 * vlc-0.8.6i

diff --git a/lfs/vdradmin b/lfs/vdradmin
index 901e254544040406d6ff92b318994e5e551d613c..43c2a085c903af0025062f52f01e6ac682d14702 100644 (file)
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -25,7 +25,7 @@
 
 include Config
 
 
 include Config
 

-VER        = 3.6.5
+VER        = 3.6.7

 
 THISAPP    = vdradmin-am-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 
 THISAPP    = vdradmin-am-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2


@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdradmin
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdradmin

-PAK_VER    = 2
+PAK_VER    = 3

 
 DEPS       = "perl-gettext vdr"
 
 
 DEPS       = "perl-gettext vdr"
 


@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = 34ac04af6d1b0495f10cd06e85abb990
+$(DL_FILE)_MD5 = 8b1b2f8bbff26cbb47e79d5b55dbd3c1

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -83,5 +83,7 @@ $(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
        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

        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)