Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2013-05-18 16:53:10 +02:00
4 changed files with 7 additions and 7 deletions

View File

@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/epgsearch-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_epgsearch
PAK_VER = 6
PAK_VER = 7
DEPS = "vdr"
DEPS = ""
VDRPLUGVER = 2.0.0

View File

@@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_streamdev
PAK_VER = 1
PAK_VER = 2
DEPS = "vdr"
DEPS = ""
VDRPLUGVER = 2.0.0

View File

@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_vnsiserver3
PAK_VER = 1
PAK_VER = 2
DEPS = "vdr"
DEPS = ""
VDRPLUGVER = 2.0.0

View File

@@ -29,7 +29,7 @@ OLD_DIR="/opt/vdr/etc"
NEW_DIR="/etc/vdr"
for conf in ${OLD_DIR}/*.conf; do
[ -f "${conf}" ] && continue
[ -f "${conf}" ] || continue
conf="$(basename ${conf})"
mv -b "${OLD_DIR}/${conf}" "${NEW_DIR}/${conf}"