diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7f3dddc..6d709d2 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -147,3 +147,6 @@ lhanisch
Eric Valette
for adding support for EnhancedAC3
+
+carel
+ for reporting "plugin doesn't honor APIVERSION" error in new Makefile
diff --git a/HISTORY b/HISTORY
index 5bfe74e..d6fe6db 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,9 @@
VDR Plugin 'streamdev' Revision History
---------------------------------------
-
+
+- added --remove-destination to cp commands installing plugins
+- fixed "plugin doesn't honor APIVERSION" (reported by carel@vdrportal)
+- updated Italian translation (thanks to Diego Pierotto)
- config option "client may suspend" hidden if not applicable
- updated and enhanced README
- separated language resources of client and server
diff --git a/Makefile b/Makefile
index 25410b4..aee80df 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile,v 1.21.2.1 2010/06/14 10:40:11 schmirl Exp $
+# $Id: Makefile,v 1.21.2.2 2010/06/20 19:11:15 schmirl Exp $
# The main source file name.
#
@@ -81,12 +81,14 @@ all: client server
client:
$(MAKE) -C ./tools
$(MAKE) -C ./client
+ # installs to $(LIBDIR)/libvdr-streamdev-client.so.$(APIVERSION)
server:
$(MAKE) -C ./tools
$(MAKE) -C ./libdvbmpeg
$(MAKE) -C ./remux
$(MAKE) -C ./server
+ # installs to $(LIBDIR)/libvdr-streamdev-server.so.$(APIVERSION)
dist: clean
@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/client/Makefile b/client/Makefile
index 8c3e565..204053f 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile,v 1.1.2.1 2010/06/14 10:40:11 schmirl Exp $
+# $Id: Makefile,v 1.1.2.2 2010/06/20 19:12:56 schmirl Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -70,7 +70,7 @@ libvdr-$(PLUGIN).so: $(CLIENTOBJS) $(COMMONOBJS) ../tools/sockettools.a
%.so:
$(CXX) $(CXXFLAGS) -shared $^ -o $@
- @cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
dist: clean
@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/client/po/it_IT.po b/client/po/it_IT.po
index 068be7c..f7268e0 100644
--- a/client/po/it_IT.po
+++ b/client/po/it_IT.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-06-14 13:05+0200\n"
-"PO-Revision-Date: 2008-04-13 23:42+0100\n"
+"PO-Revision-Date: 2010-06-19 03:58+0100\n"
"Last-Translator: Diego Pierotto \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -45,8 +45,8 @@ msgid "Filter Streaming"
msgstr "Filtra trasmissione"
msgid "Minimum Priority"
-msgstr ""
+msgstr "Priorità minima"
msgid "Maximum Priority"
-msgstr ""
+msgstr "Priorità massima"
diff --git a/common.c b/common.c
index 47834fd..953b644 100644
--- a/common.c
+++ b/common.c
@@ -10,7 +10,7 @@
using namespace std;
-const char *VERSION = "0.5.0-rc1";
+const char *VERSION = "0.5.0-rc2";
const char cMenuEditIpItem::IpCharacters[] = "0123456789.";
diff --git a/server/Makefile b/server/Makefile
index 91c2a93..7d46645 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile,v 1.1.2.1 2010/06/14 10:40:20 schmirl Exp $
+# $Id: Makefile,v 1.1.2.2 2010/06/20 19:12:56 schmirl Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -76,7 +76,7 @@ libvdr-$(PLUGIN).so: $(SERVEROBJS) $(COMMONOBJS) \
%.so:
$(CXX) $(CXXFLAGS) -shared $^ -o $@
- @cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
clean:
@-rm -f $(COMMONOBJS) $(SERVEROBJS) $(DEPFILE) $(PODIR)/*.mo $(PODIR)/*.pot *.so *.tgz core* *~
diff --git a/server/po/it_IT.po b/server/po/it_IT.po
index d51f62a..c5eed57 100644
--- a/server/po/it_IT.po
+++ b/server/po/it_IT.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-06-14 13:06+0200\n"
-"PO-Revision-Date: 2008-04-13 23:42+0100\n"
+"PO-Revision-Date: 2010-06-19 03:58+0100\n"
"Last-Translator: Diego Pierotto \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -72,14 +72,14 @@ msgid "HTTP Streamtype"
msgstr "Tipo flusso HTTP"
msgid "Multicast Streaming Server"
-msgstr ""
+msgstr "Server trasmissione Multicast"
msgid "Start IGMP Server"
-msgstr ""
+msgstr "Avvia Server IGMP"
msgid "Multicast Client Port"
-msgstr ""
+msgstr "Porta Client Multicast"
msgid "Multicast Streamtype"
-msgstr ""
+msgstr "Tipo flusso Multicast"