[vdr-plugin-remotetimers] 04/05: New upstream release
Tobias Grimm
tiber-guest at moszumanska.debian.org
Sat Feb 14 10:11:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-remotetimers.
commit 03f5afd39f235ba597328b96dce6e10edacaae6d
Author: etobi <git at e-tobi.net>
Date: Tue Feb 10 09:50:17 2015 +0100
New upstream release
---
debian/changelog | 6 ++
debian/control | 4 +-
debian/patches/01_include_path.patch | 8 +-
debian/patches/Makefile-1.7.36.patch | 157 -----------------------------------
debian/patches/series | 1 -
5 files changed, 12 insertions(+), 164 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1d7e530..9dd50e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-remotetimers (1.0.1-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Tobias Grimm <etobi at debian.org> Tue, 10 Feb 2015 09:50:11 +0100
+
vdr-plugin-remotetimers (0.1.7-3) unstable; urgency=low
* Build-depend on vdr-dev (>= 2.0.0)
diff --git a/debian/control b/debian/control
index fdca6c2..b9b03c3 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 (>= 9), vdr-dev (>= 2.0.0), gettext, pkg-config, svdrpservice-dev
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 9), vdr-dev (>= 2.1.9), gettext, pkg-config, svdrpservice-dev
+Standards-Version: 3.9.5
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/patches/01_include_path.patch b/debian/patches/01_include_path.patch
index 342a420..00d89bb 100644
--- a/debian/patches/01_include_path.patch
+++ b/debian/patches/01_include_path.patch
@@ -5,15 +5,15 @@
## DP: Set correct include path to svdrpservice.h.
@DPATCH@
-Index: vdr-plugin-remotetimers-0.1.5/svdrp.h
+Index: vdr-plugin-remotetimers/svdrp.h
===================================================================
---- vdr-plugin-remotetimers-0.1.5.orig/svdrp.h 2011-03-01 13:07:26.000000000 +0100
-+++ vdr-plugin-remotetimers-0.1.5/svdrp.h 2011-04-19 20:56:50.000000000 +0200
+--- vdr-plugin-remotetimers.orig/svdrp.h 2015-02-10 09:50:31.065983854 +0100
++++ vdr-plugin-remotetimers/svdrp.h 2015-02-10 09:50:49.217915804 +0100
@@ -23,7 +23,7 @@
#define _REMOTETIMERS_SVDRP__H
#include <stdlib.h>
--#include "../svdrpservice/svdrpservice.h"
+-#include "svdrpservice.h"
+#include <svdrpservice.h>
#include <vdr/tools.h>
#include <vdr/plugin.h>
diff --git a/debian/patches/Makefile-1.7.36.patch b/debian/patches/Makefile-1.7.36.patch
deleted file mode 100644
index 94338c4..0000000
--- a/debian/patches/Makefile-1.7.36.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-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 a054b77..aa22a93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_include_path.patch
-Makefile-1.7.36.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-remotetimers.git
More information about the pkg-vdr-dvb-changes
mailing list