vdr: fix packages names for updating from 1.6 to 2.x.

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 60f64973602d7fdd4f91c7c2d41fc94be95f54c7..0dd2c0f4628ab3960e895a583e00d7213fbbf570 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
 PAK_VER    = 6
 
 PROG       = vdr
 PAK_VER    = 6
 

-DEPS       = "vdr-streamdev"
+DEPS       = "vdr_streamdev"

 
 MAKE_OPTIONS = \
        PREFIX=/usr \
 
 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 d77f4570213cf6eee5e73b36e5e1de21a6ca9de5..dfda864d829c15ef9b2a40e3e7a4b72a0d175bee 100644 (file)
--- 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)
 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"
 
 
 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 c5b7f992fc0f64dd67edcdcee70dbb9ffc222680..31aa6553b848c7b813a031e76c7dbbbea4718e44 100644 (file)
--- 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)
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

-PROG       = vdr-streamdev
+PROG       = vdr_streamdev

 PAK_VER    = 1
 
 DEPS       = "vdr"
 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 59f43036d36db30be43119786a2f5a46113ec7e1..73ee5e9c04453c5f21dc761a75e6b8c3450b8499 100644 (file)
--- 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)
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

-PROG       = vdr-vnsiserver3
+PROG       = vdr_vnsiserver3

 PAK_VER    = 1
 
 DEPS       = "vdr"
 PAK_VER    = 1
 
 DEPS       = "vdr"

diff --git a/lfs/vdradmin b/lfs/vdradmin
index c9187b49deaebf723c5dcf0f1ce80aebc5a980ac..b38ecca4d1e89d42784abe24701e282dce93b610 100644 (file)
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # 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        #
 #                                                                             #
 # 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
 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
 
 ###############################################################################
 # Top-level Rules

diff --git a/make.sh b/make.sh
index 2cba3505b178acf12d7bb6106085d7db52aa6b26..d52b0e1b5f9ac8c2262f42c0a58edb0c2f6cf5fe 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -664,9 +664,9 @@ buildipfire() {
   ipfiremake faad2
   ipfiremake ffmpeg
   ipfiremake vdr
   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
   ipfiremake w_scan
   ipfiremake icecast
   ipfiremake icegenerator