vdr: change vdrplugin version back to 2.0.0.

diff --git a/config/rootfiles/packages/vdr-epgsearch b/config/rootfiles/packages/vdr-epgsearch
index 33ad71b11985b5210850207d6cbdd58f61949a66..193d79f9c8f3454b01f5fd2ec87211cb1a2a2ab1 100644 (file)
--- a/config/rootfiles/packages/vdr-epgsearch
+++ b/config/rootfiles/packages/vdr-epgsearch
@@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf
 etc/vdr/plugins/epgsearch
 etc/vdr/plugins/epgsearch/conf.d
 usr/bin/createcats
-usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.1
-usr/lib/vdr/libvdr-epgsearch.so.2.0.1
-usr/lib/vdr/libvdr-epgsearchonly.so.2.0.1
-usr/lib/vdr/libvdr-quickepgsearch.so.2.0.1
+usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.0
+usr/lib/vdr/libvdr-epgsearch.so.2.0.0
+usr/lib/vdr/libvdr-epgsearchonly.so.2.0.0
+usr/lib/vdr/libvdr-quickepgsearch.so.2.0.0
 #var/lib/vdr
 #var/lib/vdr/data
 var/lib/vdr/data/epgsearch

diff --git a/config/rootfiles/packages/vdr-streamdev b/config/rootfiles/packages/vdr-streamdev
index 91ed7b11543e6b5170d88f2607ea5981b58f9f60..458e7d810238b4c90e6b869b35283925ef3eb605 100644 (file)
--- a/config/rootfiles/packages/vdr-streamdev
+++ b/config/rootfiles/packages/vdr-streamdev
@@ -5,4 +5,4 @@ etc/vdr/plugins/streamdev-server/streamdevhosts.conf
 #usr/lib/vdr
 #usr/lib/vdr/bin
 usr/lib/vdr/bin/externremux.sh
-usr/lib/vdr/libvdr-streamdev-server.so.2.0.1
+usr/lib/vdr/libvdr-streamdev-server.so.2.0.0

diff --git a/config/rootfiles/packages/vdr-vnsiserver3 b/config/rootfiles/packages/vdr-vnsiserver3
index 89012453c62e1a6f7143509e8106542b8313015a..4eee2823311ea30129c1e4582cfe88d877af0ebc 100644 (file)
--- a/config/rootfiles/packages/vdr-vnsiserver3
+++ b/config/rootfiles/packages/vdr-vnsiserver3
@@ -1,4 +1,4 @@
 etc/sysconfig/vdr-plugins.d/vnsiserver3.conf
 etc/vdr/plugins/vnsiserver3
 etc/vdr/plugins/vnsiserver3/allowed_hosts.conf
-usr/lib/vdr/libvdr-vnsiserver3.so.2.0.1
+usr/lib/vdr/libvdr-vnsiserver3.so.2.0.0

diff --git a/lfs/vdr b/lfs/vdr
index adabb6711eb2e42bedccfd78ca1e586ae6330539..60f64973602d7fdd4f91c7c2d41fc94be95f54c7 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -25,6 +25,7 @@
 include Config
 
 VER        = 2.0.1
+VDRPLUGVER = 2.0.0
 THISAPP    = vdr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 
@@ -109,7 +110,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install-bin install-dirs install-includes $(MAKE_OPTIONS)
        mv -v /usr/bin/vdr /usr/sbin/vdr
 
-       sed -e "s/VDR_PLUGIN_VERSION/$(VER)/" \
+       sed -e "s/VDR_PLUGIN_VERSION/$(VDRPLUGVER)/" \
                < $(DIR_SRC)/config/vdr/runvdr > /usr/sbin/runvdr
        chmod 755 /usr/sbin/runvdr
 

diff --git a/lfs/vdr-epgsearch b/lfs/vdr-epgsearch
index 4d147fae8184d80cf1462146d4834f5cc2f3cc01..d1f3a44f213548ceaa88da68523a68b7ac28a016 100644 (file)
--- a/lfs/vdr-epgsearch
+++ b/lfs/vdr-epgsearch
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -36,7 +36,7 @@ PAK_VER    = 1
 
 DEPS       = "vdr"
 
-VDR_VER    = 2.0.1
+VDRPLUGVER = 2.0.0
 
 ###############################################################################
 # Top-level Rules
@@ -85,13 +85,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                LOCALEDIR=$$(pwd)/locale all
 
        cd $(DIR_APP) && install -m 755 libvdr-conflictcheckonly.so \
-               /usr/lib/vdr/libvdr-conflictcheckonly.so.$(VDR_VER)
+               /usr/lib/vdr/libvdr-conflictcheckonly.so.$(VDRPLUGVER)
        cd $(DIR_APP) && install -m 755 libvdr-epgsearchonly.so \
-               /usr/lib/vdr/libvdr-epgsearchonly.so.$(VDR_VER)
+               /usr/lib/vdr/libvdr-epgsearchonly.so.$(VDRPLUGVER)
        cd $(DIR_APP) && install -m 755 libvdr-epgsearch.so \
-               /usr/lib/vdr/libvdr-epgsearch.so.$(VDR_VER)
+               /usr/lib/vdr/libvdr-epgsearch.so.$(VDRPLUGVER)
        cd $(DIR_APP) && install -m 755 libvdr-quickepgsearch.so \
-               /usr/lib/vdr/libvdr-quickepgsearch.so.$(VDR_VER)
+               /usr/lib/vdr/libvdr-quickepgsearch.so.$(VDRPLUGVER)
 
        install -m 644 \
                $(DIR_SRC)/config/vdr/plugins.d/epgsearch.conf \

diff --git a/lfs/vdr-streamdev b/lfs/vdr-streamdev
index ace90eb34e667aa858e0838b10a14520ff444be2..c5b7f992fc0f64dd67edcdcee70dbb9ffc222680 100644 (file)
--- a/lfs/vdr-streamdev
+++ b/lfs/vdr-streamdev
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -37,7 +37,7 @@ PAK_VER    = 1
 
 DEPS       = "vdr"
 
-VDR_VER    = 2.0.1
+VDRPLUGVER = 2.0.0
 
 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)
@@ -92,7 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        -mkdir -pv /etc/vdr/plugins/streamdev-server /usr/lib/vdr/bin
        cd $(DIR_APP) && install -m 755 server/libvdr-streamdev-server.so \
-               /usr/lib/vdr/libvdr-streamdev-server.so.$(VDR_VER)
+               /usr/lib/vdr/libvdr-streamdev-server.so.$(VDRPLUGVER)
        ln -svf ../../svdrphosts.conf \
                /etc/vdr/plugins/streamdev-server/streamdevhosts.conf
        cd $(DIR_APP) && install -m 755 streamdev-server/externremux.sh \

diff --git a/lfs/vdr-vnsiserver3 b/lfs/vdr-vnsiserver3
index 8ba223dc1d31ce3a5ec65e555162f9d1e2dbd98c..59f43036d36db30be43119786a2f5a46113ec7e1 100644 (file)
--- a/lfs/vdr-vnsiserver3
+++ b/lfs/vdr-vnsiserver3
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -36,7 +36,7 @@ PAK_VER    = 1
 
 DEPS       = "vdr"
 
-VDR_VER    = 2.0.1
+VDRPLUGVER = 2.0.0
 
 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)
@@ -90,7 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        -mkdir -pv /etc/vdr/plugins/vnsiserver3
        cd $(DIR_APP) && install -m 755 libvdr-vnsiserver3.so \
-               /usr/lib/vdr/libvdr-vnsiserver3.so.$(VDR_VER)
+               /usr/lib/vdr/libvdr-vnsiserver3.so.$(VDRPLUGVER)
        ln -svf ../../svdrphosts.conf /etc/vdr/plugins/vnsiserver3/allowed_hosts.conf
        install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver3.conf \
                /etc/sysconfig/vdr-plugins.d