Bug #1196

5 files changed, 57 insertions, 52 deletions

diff --git a/chanman/CHANGELOG b/chanman/CHANGELOG
index b1a31b3..c9049ba 100644
--- a/chanman/CHANGELOG
+++ b/chanman/CHANGELOG
@@ -1,5 +1,10 @@
-2012-07-09  Lado Kumsiashvii  <herrlado@gmail.com>
-    * I18N Fix: http://projects.vdr-developer.org/versions/show/299
+-0.0.11 
+	* Bug #1194: Enter Empty Group, Click OK => segfault
+	* Bug #1196: adopt vdr 1.7.34 Makfile for plugins
+	
+-0.0.10
+	* I18N Fix: http://projects.vdr-developer.org/versions/show/299
+
 -0.9
 * On entering a submenu, check if the current channel is in this group set the entry es curren (selector on it) => http://projects.vdr-developer.org/issues/778
 * Doesnt compile on vdr 1.7.27 => http://projects.vdr-developer.org/issues/1001
@@ -13,3 +18,4 @@
 * In the 5th(a) version we have a correction on IconPatch.If you have the patch and you want to use the Icons change "config.h".
 * In the 5th(b). Another stupid bug.
 * In version 0.0.6. Pressing key "0" in group, sort it alphabetically; Pressing key 1-9 in the first menu works as in a mobile phone (eg. 1-->"ABC", 2-->"DEF", etc.). In the setup if you want you can setup the old style (change by number); Bugfix on setup (now you really use the setting you change).
+* see HISTORY
\ No newline at end of file
diff --git a/chanman/Makefile b/chanman/Makefile
index 38572fe..7a98416 100644
--- a/chanman/Makefile
+++ b/chanman/Makefile
@@ -1,60 +1,65 @@
 #
-# Makefile for a Video Disk Recorder plugin
+# Makefile for a Video Disk Recorder plugin chanman
 #
-# $Id$
+# $Id:$
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = chanman
 
 ### The version number of this plugin (taken from the main source file):
 
-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+#
+TMPDIR ?= /tmp
 
-### Allow user defined options to overwrite defaults:
+### The compiler options:
 
--include $(VDRDIR)/Make.config
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
+### The version number of VDR's plugin API:
 
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
 OBJS = $(PLUGIN).o
 
+### The main target:
+
+all: $(SOFILE) i18n
+
 ### Implicit rules:
 
 %.o: %.cc
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-# Dependencies:
+### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
@@ -66,37 +71,40 @@ $(DEPFILE): Makefile
 ### Internationalization (I18N):
 
 PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.cc)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<herrlado@gmail.com>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
+$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	install -D -m644 $< $@
 
 .PHONY: i18n
-i18n: $(I18Nmsgs)
+i18n: $(I18Nmo) $(I18Npot)
+
+install-i18n: $(I18Nmsgs)
 
 ### Targets:
 
-all: libvdr-$(PLUGIN).so i18n
+$(SOFILE): $(OBJS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+
+install-lib: $(SOFILE)
+	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
 
-libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+install: install-lib install-i18n
 
-dist: clean
+dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
diff --git a/chanman/chanman.h b/chanman/chanman.h
index 1efe005..8661a8e 100755
--- a/chanman/chanman.h
+++ b/chanman/chanman.h
@@ -1,6 +1,6 @@
 static const char *DESCRIPTION    = trNOOP( "Channel manager plugin" );
 static const char *MAINMENUENTRY  = trNOOP( "Channel manager" );
-static const char *VERSION        = "0.0.10";
+static const char *VERSION        = "0.0.11";
 
 enum eChannelSortMode { csmNumber, csmName, csmProvider, csmSrcProvider, csmSrcName , csmSrcFrequency};
 
diff --git a/chanman/debian/changelog b/chanman/debian/changelog
index 30c07e0..8c45a3c 100644
--- a/chanman/debian/changelog
+++ b/chanman/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-chanman (0.0.11-1) unstable; urgency=low
+	* Bug #1194: Enter Empty Group, Click OK => segfault
+	* Bug #1196: adopt vdr 1.7.34 Makfile for plugins
+ -- lado <herrlado@gmail.com>  
+
+
 vdr-plugin-chanman (0.0.10-1) unstable; urgency=low
   * http://projects.vdr-developer.org/versions/show/299
 
diff --git a/chanman/debian/control~ b/chanman/debian/control~
deleted file mode 100644
index 38cf15f..0000000
--- a/chanman/debian/control~
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: vdr-plugin-chanman
-Section: video
-Priority: extra
-Maintainer: root <root@unknown>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), vdr-dev (>= 1.7.21-4yavdr1~natty), gettext
-Standards-Version: 3.8.4
-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-chanman/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-chanman/trunk/
-Homepage: <url://example.com>
-
-Package: vdr-plugin-chanman
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>