[SCM] vdr-plugin-remotetimers packaging repository branch, master, updated. debian/0.1.7-1-1-g2c02e19
etobi
git at e-tobi.net
Sun Mar 24 09:40:39 UTC 2013
The following commit has been merged in the master branch:
commit 2c02e195caca59b00ddacbd87cf6c97735a17074
Author: etobi <git at e-tobi.net>
Date: Sun Mar 24 10:39:41 2013 +0100
* Added Makefile-1.7.36.patch from upstream homepage
* Standards-Version: 3.9.4
* Build-depend in vdr-dev (>= 1.7.42)
* Use debhelper 9
diff --git a/Makefile b/Makefile
index db45d64..c3b1125 100644
--- a/Makefile
+++ b/Makefile
@@ -6,107 +6,110 @@
# 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.
-#
+
PLUGIN = remotetimers
### 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
-
### 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 = $(call PKGCFG,libdir)
+LOCDIR = $(call PKGCFG,locdir)
+PLGCFG = $(call PKGCFG,plgcfg)
+#
+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)
+
+### Allow user defined options to overwrite defaults:
-### Test whether VDR has locale support
-VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile)
+-include $(PLGCFG)
### 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 svdrp.o menu.o menuitems.o setup.o moverec.o watcher.o i18n.o
-.PHONY: all i18n dist clean
-all: libvdr-$(PLUGIN).so i18n
+### The main target:
+
+all: $(SOFILE) i18n
### Implicit rules:
%.o: %.c
- $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
-# Dependencies:
+### Dependencies:
MAKEDEP = $(CXX) -MM -MG
DEPFILE = .dependencies
$(DEPFILE): Makefile
- @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+ @$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-include $(DEPFILE)
### Internationalization (I18N):
PODIR = po
-
-ifneq ($(strip $(VDRLOCALE)),)
-
-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 $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
I18Npot = $(PODIR)/$(PLUGIN).pot
%.mo: %.po
msgfmt -c -o $@ $<
$(I18Npot): $(wildcard *.c) menu.h
- xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktrREMOTETIMERS -ktrNOOP --msgid-bugs-address='<vdrdev at schmirler.de>' -o $@ $^
+ xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktrREMOTETIMERS -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<vdrdev at schmirler.de>' -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 $< $@
-
-i18n: $(I18Nmsgs)
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+ install -D -m644 $< $@
-else
+.PHONY: i18n
+i18n: $(I18Nmo) $(I18Npot)
-i18n:
- @### nothing to do
-endif
+install-i18n: $(I18Nmsgs)
### Targets:
-libvdr-$(PLUGIN).so: $(OBJS)
- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
- @cp $@ $(LIBDIR)/$@.$(APIVERSION)
+$(SOFILE): $(OBJS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+
+install-lib: $(SOFILE)
+ install -D $^ $(DESTDIR)$(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/debian/README.source b/debian/README.source
deleted file mode 100644
index 54d6fec..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-This package uses the dpatch system to save and apply patches to the
-upstream source code of the software that is packaged. For details
-about how to use dpatch read
-
- /usr/share/doc/dpatch/README.source.gz
-
-from the dpatch package.
diff --git a/debian/changelog b/debian/changelog
index ae66ba7..1550b15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vdr-plugin-remotetimers (0.1.7-2) UNRELEASED; urgency=low
+
+ * Added Makefile-1.7.36.patch from upstream homepage
+ * Standards-Version: 3.9.4
+ * Build-depend in vdr-dev (>= 1.7.42)
+ * Use debhelper 9
+
+ -- Tobias Grimm <etobi at debian.org> Sun, 24 Mar 2013 10:37:07 +0100
+
vdr-plugin-remotetimers (0.1.7-1) unstable; urgency=low
* New upstream release
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 44afb7e..e105839 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: video
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.18), gettext, svdrpservice-dev
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), vdr-dev (>= 1.7.42), gettext, pkg-config, svdrpservice-dev
+Standards-Version: 3.9.4
Homepage: http://vdr.schmirler.de
Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-remotetimers.git
Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr-plugin-remotetimers.git
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 26bf656..0000000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-libvdr-remotetimers.so.* usr/lib/vdr/plugins/
-locale usr/share/
diff --git a/debian/patches/02_Makefile_locale_fix.patch b/debian/patches/02_Makefile_locale_fix.patch
deleted file mode 100644
index 4f81d7f..0000000
--- a/debian/patches/02_Makefile_locale_fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_Makefile_locale_fix.dpatch by Oliver Grassl <O.Grassl at gmx.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Small fixes to include the locale-files in the package.
-
- at DPATCH@
-Index: vdr-plugin-remotetimers-0.1.5/Makefile
-===================================================================
---- vdr-plugin-remotetimers-0.1.5.orig/Makefile 2011-03-01 12:20:41.000000000 +0100
-+++ vdr-plugin-remotetimers-0.1.5/Makefile 2011-04-19 20:57:01.000000000 +0200
-@@ -32,9 +32,6 @@
-
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
-
--### Test whether VDR has locale support
--VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile)
--
- ### The name of the distribution archive:
-
- ARCHIVE = $(PLUGIN)-$(VERSION)
-@@ -71,8 +68,6 @@
-
- PODIR = po
-
--ifneq ($(strip $(VDRLOCALE)),)
--
- LOCALEDIR = $(VDRDIR)/locale
- I18Npo = $(wildcard $(PODIR)/*.po)
- I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
-@@ -94,12 +89,6 @@
-
- i18n: $(I18Nmsgs)
-
--else
--
--i18n:
-- @### nothing to do
--endif
--
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
diff --git a/debian/patches/Makefile-1.7.36.patch b/debian/patches/Makefile-1.7.36.patch
new file mode 100644
index 0000000..94338c4
--- /dev/null
+++ b/debian/patches/Makefile-1.7.36.patch
@@ -0,0 +1,157 @@
+Index: vdr-plugin-remotetimers/Makefile
+===================================================================
+--- vdr-plugin-remotetimers.orig/Makefile 2012-07-15 17:21:17.000000000 +0200
++++ vdr-plugin-remotetimers/Makefile 2013-03-24 10:35:16.000000000 +0100
+@@ -6,107 +6,110 @@
+ # 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.
+-#
++
+ PLUGIN = remotetimers
+
+ ### 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
+-
+ ### 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 = $(call PKGCFG,libdir)
++LOCDIR = $(call PKGCFG,locdir)
++PLGCFG = $(call PKGCFG,plgcfg)
++#
++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)
++
++### Allow user defined options to overwrite defaults:
+
+-### Test whether VDR has locale support
+-VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile)
++-include $(PLGCFG)
+
+ ### 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 svdrp.o menu.o menuitems.o setup.o moverec.o watcher.o i18n.o
+
+-.PHONY: all i18n dist clean
+-all: libvdr-$(PLUGIN).so i18n
++### The main target:
++
++all: $(SOFILE) i18n
+
+ ### Implicit rules:
+
+ %.o: %.c
+- $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
++ $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+
+-# Dependencies:
++### Dependencies:
+
+ MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+ $(DEPFILE): Makefile
+- @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
++ @$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+ -include $(DEPFILE)
+
+ ### Internationalization (I18N):
+
+ PODIR = po
+-
+-ifneq ($(strip $(VDRLOCALE)),)
+-
+-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 $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot = $(PODIR)/$(PLUGIN).pot
+
+ %.mo: %.po
+ msgfmt -c -o $@ $<
+
+ $(I18Npot): $(wildcard *.c) menu.h
+- xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktrREMOTETIMERS -ktrNOOP --msgid-bugs-address='<vdrdev at schmirler.de>' -o $@ $^
++ xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktrREMOTETIMERS -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<vdrdev at schmirler.de>' -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 $< $@
+-
+-i18n: $(I18Nmsgs)
++$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
++ install -D -m644 $< $@
+
+-else
++.PHONY: i18n
++i18n: $(I18Nmo) $(I18Npot)
+
+-i18n:
+- @### nothing to do
+-endif
++install-i18n: $(I18Nmsgs)
+
+ ### Targets:
+
+-libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+- @cp $@ $(LIBDIR)/$@.$(APIVERSION)
++$(SOFILE): $(OBJS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++
++install-lib: $(SOFILE)
++ install -D $^ $(DESTDIR)$(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/debian/patches/series b/debian/patches/series
index fa8f224..a054b77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
01_include_path.patch
-02_Makefile_locale_fix.patch
+Makefile-1.7.36.patch
diff --git a/debian/rules b/debian/rules
index 9f487b6..25d9982 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
-
%:
dh $@
-override_dh_auto_build:
- dh_auto_build -- all $(MAKE_OPTIONS)
-
-override_dh_auto_clean:
- $(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
- rm -rf locale libvdr-*.so.*
-
override_dh_gencontrol:
sh /usr/share/vdr-dev/dependencies.sh
dh_gencontrol
diff --git a/svdrp.h b/svdrp.h
index 357078b..b40b4ca 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -23,7 +23,7 @@
#define _REMOTETIMERS_SVDRP__H
#include <stdlib.h>
-#include "../svdrpservice/svdrpservice.h"
+#include <svdrpservice.h>
#include <vdr/tools.h>
#include <vdr/plugin.h>
--
vdr-plugin-remotetimers packaging repository
More information about the pkg-vdr-dvb-changes
mailing list