mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-11 19:55:52 +02:00
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
This commit is contained in:
@@ -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
|
||||
@@ -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/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_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_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_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_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_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_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_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
|
||||
@@ -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
|
||||
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
|
||||
|
||||
@@ -347,7 +347,7 @@
|
||||
* 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
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 3.6.5
|
||||
VER = 3.6.7
|
||||
|
||||
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
|
||||
PAK_VER = 2
|
||||
PAK_VER = 3
|
||||
|
||||
DEPS = "perl-gettext vdr"
|
||||
|
||||
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 34ac04af6d1b0495f10cd06e85abb990
|
||||
$(DL_FILE)_MD5 = 8b1b2f8bbff26cbb47e79d5b55dbd3c1
|
||||
|
||||
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
|
||||
mkdir /var/log/vdradmin
|
||||
mkdir /var/run/vdradmin
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
|
||||
Reference in New Issue
Block a user