From 08434343ee20012f5c22f7fadc65181ad035b386 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 20 Apr 2013 22:11:45 +0200 Subject: [PATCH] vdr: change vdrplugin version back to 2.0.0. --- config/rootfiles/packages/vdr-epgsearch | 8 ++++---- config/rootfiles/packages/vdr-streamdev | 2 +- config/rootfiles/packages/vdr-vnsiserver3 | 2 +- lfs/vdr | 5 +++-- lfs/vdr-epgsearch | 12 ++++++------ lfs/vdr-streamdev | 6 +++--- lfs/vdr-vnsiserver3 | 6 +++--- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/config/rootfiles/packages/vdr-epgsearch b/config/rootfiles/packages/vdr-epgsearch index 33ad71b11..193d79f9c 100644 --- 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 91ed7b115..458e7d810 100644 --- 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 89012453c..4eee28233 100644 --- 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 adabb6711..60f649736 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # 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 4d147fae8..d1f3a44f2 100644 --- a/lfs/vdr-epgsearch +++ b/lfs/vdr-epgsearch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # 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 ace90eb34..c5b7f992f 100644 --- a/lfs/vdr-streamdev +++ b/lfs/vdr-streamdev @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # 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 8ba223dc1..59f43036d 100644 --- a/lfs/vdr-vnsiserver3 +++ b/lfs/vdr-vnsiserver3 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # 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 -- 2.39.2