From 58ccbbd4f276050f7f2b5930725eae4cf5957887 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 23 Apr 2013 21:25:36 +0200
Subject: [PATCH] vdr: fix packages names for updating from 1.6 to 2.x.

---
 config/rootfiles/packages/{vdr-epgsearch => vdr_epgsearch}  | 0
 config/rootfiles/packages/{vdr-streamdev => vdr_streamdev}  | 0
 .../rootfiles/packages/{vdr-vnsiserver3 => vdr_vnsiserver3} | 0
 lfs/vdr                                                     | 2 +-
 lfs/{vdr-epgsearch => vdr_epgsearch}                        | 4 ++--
 lfs/{vdr-streamdev => vdr_streamdev}                        | 2 +-
 lfs/{vdr-vnsiserver3 => vdr_vnsiserver3}                    | 2 +-
 lfs/vdradmin                                                | 6 +++---
 make.sh                                                     | 6 +++---
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename config/rootfiles/packages/{vdr-epgsearch => vdr_epgsearch} (100%)
 rename config/rootfiles/packages/{vdr-streamdev => vdr_streamdev} (100%)
 rename config/rootfiles/packages/{vdr-vnsiserver3 => vdr_vnsiserver3} (100%)
 rename lfs/{vdr-epgsearch => vdr_epgsearch} (98%)
 rename lfs/{vdr-streamdev => vdr_streamdev} (99%)
 rename lfs/{vdr-vnsiserver3 => vdr_vnsiserver3} (99%)

diff --git a/config/rootfiles/packages/vdr-epgsearch b/config/rootfiles/packages/vdr_epgsearch
similarity index 100%
rename from config/rootfiles/packages/vdr-epgsearch
rename to config/rootfiles/packages/vdr_epgsearch
diff --git a/config/rootfiles/packages/vdr-streamdev b/config/rootfiles/packages/vdr_streamdev
similarity index 100%
rename from config/rootfiles/packages/vdr-streamdev
rename to config/rootfiles/packages/vdr_streamdev
diff --git a/config/rootfiles/packages/vdr-vnsiserver3 b/config/rootfiles/packages/vdr_vnsiserver3
similarity index 100%
rename from config/rootfiles/packages/vdr-vnsiserver3
rename to config/rootfiles/packages/vdr_vnsiserver3
diff --git a/lfs/vdr b/lfs/vdr
index 60f649736..0dd2c0f46 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
 PAK_VER    = 6
 
-DEPS       = "vdr-streamdev"
+DEPS       = "vdr_streamdev"
 
 MAKE_OPTIONS = \
 	PREFIX=/usr \
diff --git a/lfs/vdr-epgsearch b/lfs/vdr_epgsearch
similarity index 98%
rename from lfs/vdr-epgsearch
rename to lfs/vdr_epgsearch
index d77f45702..dfda864d8 100644
--- a/lfs/vdr-epgsearch
+++ b/lfs/vdr_epgsearch
@@ -31,8 +31,8 @@ DL_FILE    = $(THISAPP).tgz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/epgsearch-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = vdr-epgsearch
-PAK_VER    = 1
+PROG       = vdr_epgsearch
+PAK_VER    = 6
 
 DEPS       = "vdr"
 
diff --git a/lfs/vdr-streamdev b/lfs/vdr_streamdev
similarity index 99%
rename from lfs/vdr-streamdev
rename to lfs/vdr_streamdev
index c5b7f992f..31aa6553b 100644
--- a/lfs/vdr-streamdev
+++ b/lfs/vdr_streamdev
@@ -32,7 +32,7 @@ DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = vdr-streamdev
+PROG       = vdr_streamdev
 PAK_VER    = 1
 
 DEPS       = "vdr"
diff --git a/lfs/vdr-vnsiserver3 b/lfs/vdr_vnsiserver3
similarity index 99%
rename from lfs/vdr-vnsiserver3
rename to lfs/vdr_vnsiserver3
index 59f43036d..73ee5e9c0 100644
--- a/lfs/vdr-vnsiserver3
+++ b/lfs/vdr_vnsiserver3
@@ -31,7 +31,7 @@ DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = vdr-vnsiserver3
+PROG       = vdr_vnsiserver3
 PAK_VER    = 1
 
 DEPS       = "vdr"
diff --git a/lfs/vdradmin b/lfs/vdradmin
index c9187b49d..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        #
@@ -33,9 +33,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdradmin
-PAK_VER    = 4
+PAK_VER    = 5
 
-DEPS       = "perl-gettext vdr vdr-epgsearch"
+DEPS       = "perl-gettext vdr vdr_epgsearch"
 
 ###############################################################################
 # Top-level Rules
diff --git a/make.sh b/make.sh
index 2cba3505b..d52b0e1b5 100755
--- a/make.sh
+++ b/make.sh
@@ -664,9 +664,9 @@ buildipfire() {
   ipfiremake faad2
   ipfiremake ffmpeg
   ipfiremake vdr
-  ipfiremake vdr-streamdev
-  ipfiremake vdr-vnsiserver3
-  ipfiremake vdr-epgsearch
+  ipfiremake vdr_streamdev
+  ipfiremake vdr_vnsiserver3
+  ipfiremake vdr_epgsearch
   ipfiremake w_scan
   ipfiremake icecast
   ipfiremake icegenerator
-- 
2.39.2