Update README,HISTORY

enhance Makefile for make dist

5 files changed, 90 insertions, 12 deletions

diff --git a/HISTORY b/HISTORY
index 1748308..3c2e56e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,11 @@
 VDR Plugin 'dvdswitch' Revision History
 ---------------------------------------
 
+2010-12-21:
+- Add french translation from http://www.vdr-portal.de/board/thread.php?postid=488211#post488211
+- Fix some GCC warnings (asprintf, realpath)
+- Use Make.global - Make sure that necessary options are included
+
 2009-10-03: Version 0.1.5
 - Fix some GCC-4.4 warnings
 
diff --git a/Makefile b/Makefile
index 9d6aabb..87580ab 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -49,7 +49,8 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o helpers.o tools.o imagelist-item.o imagelist.o dvdlist-item.o dvdlist.o dvdplugin.o menu-item.o menu.o setup.o setup-itypes.o commands.o
+OBJS = $(PLUGIN).o helpers.o tools.o imagelist-item.o imagelist.o dvdlist-item.o \
+        dvdlist.o dvdplugin.o menu-item.o menu.o setup.o setup-itypes.o commands.o
 
 ### Implicit rules:
 
@@ -77,7 +78,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address=' ' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o $@ $^
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
@@ -96,7 +97,7 @@ all: libvdr-$(PLUGIN).so i18n
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
@@ -107,4 +108,4 @@ dist: clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
diff --git a/README b/README
index a40a815..6c4a984 100644
--- a/README
+++ b/README
@@ -1,11 +1,83 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Andreas Schmidt(Darkside) <vdrl@schmidtie.de>
+Written by:                  2005 - 2006 Andreas Schmidt(Darkside) <vdrl-at-schmidtie.de>
+                             2009 - 2010 Andreas Brachold <vdr07-at-deltab.de>
 
-Project's homepage:          None
+Project's homepage:          http://projects.vdr-developer.org/projects/plg-dvdswitch/wiki
 
-Latest version available at: http://download.schmidtie.de/dvdswitch.tar.bz2
+Latest version available at: http://projects.vdr-developer.org/projects/plg-dvdswitch/files
+
+This plugin for VDR is free software: you can redistribute it and/or 
+modify it under the terms of the GNU General Public License as published 
+by the Free Software Foundation, version 2 of the License.
+
+This plugin for VDR is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this plugin for VDR. If not, see <http://www.gnu.org/licenses/>.
 
 See the file COPYING for license information.
 
 Description:
+------------
+The dvdswitch plugin functions as a kind of a DVD changer. It makes it possible 
+to select images and play them with the DVD plugin.
+
+Check follow requirements:
+-------------------------
+* dvd-plugin installed (http://sourceforge.net/projects/dvdplugin/)
+
+
+Install vdr-plugin-dvdswitch:
+---------------------------
+Unpack the vdr-plugin-dvdswitch tarball to $VDRSOURCE/PLUGINS/src directory.
+Variable $VDRSOURCE stands for a directory, where source archive of VDR package 
+was be decompressed.
+
+#> cd $VDRSOURCE/PLUGINS/src
+#> tar -xzvf vdr-dvdswitch-0.0.1.tgz
+#> ln -s dvdswitch-0.0.1 dvdswitch
+
+Compile the plugin (from VDR's source directory)
+
+Change the working directory to VDR source root and compile this plugin 
+like all other VDR plugins.
+
+#> cd $VDRSOURCE
+#> make plugins
+
+After everything has been compiled without errors, copy the plugin to their 
+target directory.
+
+#> make install
+
+
+how to anonymously get the current source
+-----------------------------------------
+
+git clone git://projects.vdr-developer.org/vdr-plugin-dvdswitch.git dvdswitch
+
+how to make a new release
+-------------------------
+
+adapt version in dvdswitch.c and HISTORY
+
+set date in HISTORY
+
+#> git commit
+#> git status # must be clean
+#> git tag -a -m 'new release' '0.0.1'
+#> git push --tags
+
+Build package
+
+#> make dist
+
+in the project configuration, add new version 0.0.1
+upload vdr-dvdswitch-0.0.1.tgz
+
+announce new version at vdr@linuxtv.org
+
diff --git a/po/de_DE.po b/po/de_DE.po
index 709fb2c..0adff39 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vdr-dvdswitch-plugin 0.1.4\n"
-"Report-Msgid-Bugs-To:  \n"
-"POT-Creation-Date: 2010-12-21 13:09+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-12-21 21:35+0100\n"
 "PO-Revision-Date: 2009-10-03 14:03+0200\n"
 "Last-Translator:\n"
 "Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 26c4a66..b26c14b 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To:  \n"
-"POT-Creation-Date: 2010-12-21 13:09+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-12-21 21:35+0100\n"
 "PO-Revision-Date: 2010-12-21 12:59+0100\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"