[vdr-plugin-svdrposd] 01/01: Imported Upstream version 1.0.0
Tobias Grimm
tiber-guest at alioth.debian.org
Sun Sep 15 08:48:27 UTC 2013
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-svdrposd.
commit da8731ab2470017768cbae57f4367a30c468eeee
Author: etobi <git at e-tobi.net>
Date: Sun Sep 15 10:43:20 2013 +0200
Imported Upstream version 1.0.0
---
HISTORY | 6 ++++++
Makefile | 57 ++++++++++++++++++++++++++++++++----------------------
debian/changelog | 6 ++++++
debian/control | 2 +-
debian/install | 2 +-
debian/rules | 10 ----------
svdrposd.c | 2 +-
7 files changed, 49 insertions(+), 36 deletions(-)
diff --git a/HISTORY b/HISTORY
index dacac73..e2c79c8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,11 +1,17 @@
VDR Plugin 'svdrpext/svdrposd' Revision History
-----------------------------------------------
+2013-06-07: Version 1.0.0
+
+- Updated Makefile for VDR 1.7.36
+
2011-08-01: Version 0.1.1
+
- fixed line termination of SVDRP replies. Each line ended with \r\r\n
(reported by Henrik Niehaus)
2009-10-07: Version 0.1.0
+
- renamed plugin from svdrpext to svdrposd
- new command LSTO
- number of items parameter to OSDI is now optional
diff --git a/Makefile b/Makefile
index 7523f0d..5add219 100644
--- a/Makefile
+++ b/Makefile
@@ -6,70 +6,81 @@
# 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 = svdrposd
### 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:
+### The directory environment:
-CXX ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+# 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)
+PLGCFG = $(call PKGCFG,plgcfg)
+#
+TMPDIR ?= /tmp
-### The directory environment:
+### The compiler options:
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+export CFLAGS = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
-### Allow user defined options to overwrite defaults:
+### The version number of VDR's plugin API:
--include $(VDRDIR)/Make.config
+APIVERSION = $(call PKGCFG,apiversion)
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
+### Allow user defined options to overwrite defaults:
-#VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+-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 status.o
-.PHONY: all dist clean
-all: libvdr-$(PLUGIN).so
+### The main target:
+
+all: $(SOFILE)
### 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)
### 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
dist: clean
@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/debian/changelog b/debian/changelog
index 7cab599..b56440a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-svdrposd (1.0.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Tobias Grimm <etobi at debian.org> Sun, 15 Sep 2013 10:43:31 +0200
+
vdr-plugin-svdrposd (0.1.1-13) unstable; urgency=low
* Build-depend on vdr-dev (>= 2.0.0)
diff --git a/debian/control b/debian/control
index 131f1c4..a7fe945 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
Build-Depends: debhelper (>= 9), vdr-dev (>= 2.0.0), pkg-config
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://vdr.schmirler.de
Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-svdrposd.git
Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr-plugin-svdrposd.git
diff --git a/debian/install b/debian/install
index d4af8c3..fb54f11 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-libvdr-svdrposd.so.* usr/lib/vdr/plugins/
+usr/lib/vdr/plugins/libvdr-svdrposd.so.* usr/lib/vdr/plugins/
diff --git a/debian/rules b/debian/rules
index 1ca5e6d..25d9982 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,19 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
-CXXFLAGS += $(shell pkg-config vdr --variable=cxxflags) $(LDFLAGS)
-
%:
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/svdrposd.c b/svdrposd.c
index c0247b1..50ff372 100644
--- a/svdrposd.c
+++ b/svdrposd.c
@@ -16,7 +16,7 @@
#define SVDRPOSD_BUFSIZE KILOBYTE(4)
-static const char *VERSION = "0.1.1";
+static const char *VERSION = "1.0.0";
static const char *DESCRIPTION = "Publish OSD menu via SVDRP";
class cPluginSvdrpOsd : public cPlugin {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-svdrposd.git
More information about the pkg-vdr-dvb-changes
mailing list