[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 464d238a61a102ff0729f2cc3c23f05dab03aa87

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 464d238a61a102ff0729f2cc3c23f05dab03aa87

[git]

[-- Attachment #1: Type: text/plain, Size: 2759 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  464d238a61a102ff0729f2cc3c23f05dab03aa87 (commit)
       via  139e30d135846bcca03f1b1f1823780521fff1dd (commit)
       via  25023ab9e9493ed668aea1f07cd3a7e89e825ef2 (commit)
      from  1bc8f877ed6aed3ef249d0505f104492ce16297b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 464d238a61a102ff0729f2cc3c23f05dab03aa87
Merge: 1bc8f87 139e30d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat May 18 16:53:10 2013 +0200

    Merge branch 'master' into next

-----------------------------------------------------------------------

Summary of changes:
 lfs/vdr_epgsearch      | 4 ++--
 lfs/vdr_streamdev      | 4 ++--
 lfs/vdr_vnsiserver3    | 4 ++--
 src/paks/vdr/update.sh | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch
index dfda864..509efb1 100644
--- a/lfs/vdr_epgsearch
+++ b/lfs/vdr_epgsearch
@@ -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
 
diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev
index 59dbd04..c230a69 100644
--- a/lfs/vdr_streamdev
+++ b/lfs/vdr_streamdev
@@ -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
 
diff --git a/lfs/vdr_vnsiserver3 b/lfs/vdr_vnsiserver3
index 73ee5e9..77d066b 100644
--- a/lfs/vdr_vnsiserver3
+++ b/lfs/vdr_vnsiserver3
@@ -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
 
diff --git a/src/paks/vdr/update.sh b/src/paks/vdr/update.sh
index 2e11608..6233897 100644
--- a/src/paks/vdr/update.sh
+++ b/src/paks/vdr/update.sh
@@ -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}"


hooks/post-receive
--
IPFire 2.x development tree