[SCM] vdr-plugin-graphlcd packaging repository branch, master, updated. debian/0.1.5-17-5-g895886e
etobi
git at e-tobi.net
Wed May 9 20:36:30 UTC 2012
The following commit has been merged in the master branch:
commit d958814995b74663f392b784da008c8c7cce6d96
Author: etobi <git at e-tobi.net>
Date: Wed May 9 22:23:21 2012 +0200
Merging changes from the yaVDR team - thx guys!
diff --git a/debian/changelog b/debian/changelog
index d0bdd80..d8f33ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,104 @@
+vdr-plugin-graphlcd (0.3.0+git20120329-1) unstable; urgency=low
+
+ * Merging changes from the yaVDR team - thx guys!
+
+ -- Tobias Grimm <etobi at debian.org> Wed, 09 May 2012 22:22:38 +0200
+
+vdr-plugin-graphlcd (0.3.0+git20120329-0yavdr0~precise) precise; urgency=medium
+
+ * New upstream snapshot
+
+ -- Reiner Paulus <flex0r at gmx.net> Thu, 29 Mar 2012 17:04:03 +0200
+
+vdr-plugin-graphlcd (0.3.0+git20120314-0yavdr4~precise) precise; urgency=medium
+
+ * rebuild
+
+ -- Holger Schvestka <hotzenplotz5 at gmx.de> Sun, 25 Mar 2012 22:22:55 +0200
+
+vdr-plugin-graphlcd (0.3.0+git20120314-0yavdr3~precise) precise; urgency=medium
+
+ * revoked last change
+ * don't install fonts.conf
+ * removed dependency to ttf-bitstream-vera
+ * added uup to vdr-plugin-graphlcd.groups
+ * added prerm script
+
+ -- Gerald Dachs <gda at dachsweb.de> Thu, 22 Mar 2012 12:49:38 +0100
+
+vdr-plugin-graphlcd (0.3.0+git20120314-0yavdr2~precise) precise; urgency=medium
+
+ * Add user vdr to group uucp
+
+ -- Gerald Dachs <gda at dachsweb.de> Thu, 22 Mar 2012 11:40:56 +0100
+
+vdr-plugin-graphlcd (0.3.0+git20120314-0yavdr1~precise) precise; urgency=medium
+
+ * rebuild
+
+ -- Holger Schvestka <hotzenplotz5 at gmx.de> Thu, 15 Mar 2012 10:14:54 +0100
+
+vdr-plugin-graphlcd (0.3.0+git20120314-0yavdr0~precise) precise; urgency=medium
+
+ * New upstream snapshot
+ * Build-Depend on vdr-dev (>=1.7.26)
+
+ -- Holger Schvestka <hotzenplotz5 at gmx.de> Wed, 14 Mar 2012 09:13:31 +0100
+
+vdr-plugin-graphlcd (0.3.0+git20120310-0yavdr~precise) precise; urgency=medium
+
+ * New upstream snapshot
+
+ -- Reiner Paulus <flex0r at gmx.net> Sat, 10 Mar 2012 12:15:42 +0100
+
+vdr-plugin-graphlcd (0.3.0+git20120125-0yavdr0~oneiric) oneiric; urgency=medium
+
+ * New upstream snapshot
+
+ -- Reiner Paulus <flex0r at gmx.net> Wed, 25 Jan 2012 20:16:04 +0100
+
+vdr-plugin-graphlcd (0.3.0+git20110829-2yavdr1~precise) precise; urgency=medium
+
+ * added connect disconnect patch from superelchi
+
+ -- Gerald Dachs <gda at dachsweb.de> Tue, 06 Sep 2011 13:43:12 +0200
+
+vdr-plugin-graphlcd (0.3.0+git20110829-1yavdr1~precise) precise; urgency=medium
+
+ * New upstream snapshot (touchcol branch)
+
+ -- Gerald Dachs <gda at dachsweb.de> Mon, 29 Aug 2011 11:41:03 +0200
+
+vdr-plugin-graphlcd (0.1.9+git20110811-1yavdr5~precise) precise; urgency=medium
+
+ * added missing fonts
+
+ -- Gerald Dachs <gda at dachsweb.de> Fri, 26 Aug 2011 13:13:12 +0200
+
+vdr-plugin-graphlcd (0.1.9+git20110811-1yavdr2~precise) precise; urgency=low
+
+ * added skins to package
+
+ -- Gerald Dachs <gda at dachsweb.de> Sun, 14 Aug 2011 00:55:27 +0200
+
+vdr-plugin-graphlcd (0.1.9+git20110811-1yavdr1~precise) precise; urgency=low
+
+ * New upstream snapshot
+
+ -- Gerald Dachs <gda at dachsweb.de> Thu, 11 Aug 2011 14:17:21 +0200
+
+vdr-plugin-graphlcd (0.1.9+git20110424-1yavdr0~precise) precise; urgency=low
+
+ * vdr -> group lp
+ * New upstream release
+ * added build-dep. libglcdskin1-dev
+ * Standards-Version: 3.9.1
+ * Removed 91_graphlcd-0.1.5-1.7.3.dpatch
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Install /usr/share/locale
+
+ -- Holger Schvestka <hotzenplotz5 at gmx.de> Sun, 24 Apr 2011 12:54:31 +0100
+
vdr-plugin-graphlcd (0.1.5-17) experimental; urgency=low
* Fixed debian/preinst
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 4e81a55..e517d44 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,11 @@ 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>, Thomas Schmidt <tschmidt at debian.org>
Origin: ctvdr
-Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), libglcddrivers1-dev (>= 0.1.4), libglcdgraphics2-dev (>= 0.1.5), libfreetype6-dev
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7), cdbs, vdr-dev (>= 1.7.26), libglcddrivers1-dev (>= 0.1.9), libglcdgraphics2-dev (>= 0.1.9), libfreetype6-dev, libglcdskin1-dev
+Standards-Version: 3.9.1
Package: vdr-plugin-graphlcd
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}, ttf-bitstream-vera
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
Description: GraphLCD Plugin for VDR
A plugin to support graphical LC Displays with VDR.
diff --git a/debian/install b/debian/install
index fd604e1..dbb9248 100644
--- a/debian/install
+++ b/debian/install
@@ -1,6 +1,8 @@
libvdr-graphlcd.so.* usr/lib/vdr/plugins/
-graphlcd/fonts/*.fnt usr/share/vdr-plugin-graphlcd/fonts/
+graphlcd/fonts usr/share/vdr-plugin-graphlcd/
graphlcd/logos usr/share/vdr-plugin-graphlcd/
-graphlcd/logonames.alias.1.3 etc/vdr/plugins/graphlcd/
+graphlcd/skins usr/share/vdr-plugin-graphlcd/
+graphlcd/channels.alias etc/vdr/plugins/graphlcd/
debian/plugin.graphlcd.conf etc/vdr/plugins/
-debian/fonts.conf etc/vdr/plugins/graphlcd
+debian/vdr-plugin-graphlcd.groups usr/share/vdr/groups.d/
+debian/tmp/usr/share/locale
diff --git a/debian/links b/debian/links
index 67d36cc..41ea307 100644
--- a/debian/links
+++ b/debian/links
@@ -1,8 +1,7 @@
-usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf usr/share/vdr-plugin-graphlcd/fonts/Vera.ttf
-usr/share/fonts/truetype/ttf-bitstream-vera/VeraBd.ttf usr/share/vdr-plugin-graphlcd/fonts/VeraBd.ttf
-
usr/share/vdr-plugin-graphlcd/fonts var/lib/vdr/plugins/graphlcd/fonts
usr/share/vdr-plugin-graphlcd/logos var/lib/vdr/plugins/graphlcd/logos
-
-etc/vdr/plugins/graphlcd/logonames.alias.1.3 var/lib/vdr/plugins/graphlcd/logonames.alias
+usr/share/vdr-plugin-graphlcd/logos_bmp var/lib/vdr/plugins/graphlcd/logos_bmp
+usr/share/vdr-plugin-graphlcd/skins var/lib/vdr/plugins/graphlcd/skins
+etc/vdr/plugins/graphlcd/channels.alias var/lib/vdr/plugins/graphlcd/channels.alias
etc/vdr/plugins/graphlcd/fonts.conf var/lib/vdr/plugins/graphlcd/fonts.conf
+
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 525275b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_Makefile-fPIC-fix
-02_freetype2
-90_graphlcd-0.1.5-1.5.3
-91_graphlcd-0.1.5-1.7.3
diff --git a/debian/patches/01_Makefile-fPIC-fix.dpatch b/debian/patches/01_Makefile-fPIC-fix.dpatch
deleted file mode 100644
index 5569499..0000000
--- a/debian/patches/01_Makefile-fPIC-fix.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## Makefile-fPIC-fix patch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds -fPIC to Makefiles to fix potential FTBFS.
-
- at DPATCH@
-diff -urNad vdr-plugin-graphlcd-0.1.2~/Makefile vdr-plugin-graphlcd-0.1.2/Makefile
---- vdr-plugin-graphlcd-0.1.2~/Makefile 2005-10-22 14:20:19.000000000 +0200
-+++ vdr-plugin-graphlcd-0.1.2/Makefile 2005-10-22 14:20:54.000000000 +0200
-@@ -16,7 +16,7 @@
- ### The C++ compiler and options:
-
- CXX ?= g++
--CXXFLAGS ?= -g -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -g -Wall -Woverloaded-virtual
-
- ### The directory environment:
-
diff --git a/debian/patches/02_freetype2.dpatch b/debian/patches/02_freetype2.dpatch
deleted file mode 100644
index 94dc2e3..0000000
--- a/debian/patches/02_freetype2.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_freetype2.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vdr-plugin-graphlcd-0.1.5~/Makefile vdr-plugin-graphlcd-0.1.5/Makefile
---- vdr-plugin-graphlcd-0.1.5~/Makefile 2008-05-13 09:04:12.000000000 +0200
-+++ vdr-plugin-graphlcd-0.1.5/Makefile 2008-05-13 09:06:23.000000000 +0200
-@@ -50,9 +50,11 @@
- ### Includes and Defines (add further entries here):
-
- INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(INSTALLPREFIX)/include
-+INCLUDES += $(shell freetype-config --cflags)
-
- DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
- DEFINES += -D_GNU_SOURCE
-+DEFINES += -DHAVE_FREETYPE2
-
-
- ### The object files (add further files here):
-@@ -83,7 +85,7 @@
-
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -L$(INSTALLPREFIX)/lib -shared $(OBJS) -lglcddrivers -lglcdgraphics -lstdc++ -o $@
-+ $(CXX) $(CXXFLAGS) -L$(INSTALLPREFIX)/lib -shared $(OBJS) -lglcddrivers -lglcdgraphics -lstdc++ $(shell freetype-config --libs) -o $@
- @cp $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
diff --git a/debian/patches/90_graphlcd-0.1.5-1.5.3.dpatch b/debian/patches/90_graphlcd-0.1.5-1.5.3.dpatch
deleted file mode 100644
index 66e8fbf..0000000
--- a/debian/patches/90_graphlcd-0.1.5-1.5.3.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_xineliboutput-1.5.3.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.5.3.
-
- at DPATCH@
---- xineliboutput-1.5.3/layout.c
-+++ xineliboutput-1.5.3/layout.c
-@@ -65,7 +65,11 @@ bool cFontElement::Load(const std::strin
- file += "/fonts/";
- file += url.substr(4, pos - 4);
- }
-+#if APIVERSNUM >= 10503
-+ return font.LoadFT2(file, cCharSetConv::SystemCharacterTable(), size);
-+#else
- return font.LoadFT2(file, I18nCharSets()[Setup.OSDLanguage], size);
-+#endif
- }
- else
- {
diff --git a/debian/patches/91_graphlcd-0.1.5-1.7.3.dpatch b/debian/patches/91_graphlcd-0.1.5-1.7.3.dpatch
deleted file mode 100644
index 8bf4f42..0000000
--- a/debian/patches/91_graphlcd-0.1.5-1.7.3.dpatch
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 91_graphlcd-0.1.5-1.7.3.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Quick'n'dirty fix for VDR >= 1.7.3.
-
- at DPATCH@
---- graphlcd-0.1.5/display.c
-+++ graphlcd-0.1.5/display.c
-@@ -383,8 +383,13 @@ void cGraphLCDDisplay::Action(void)
- if (CurrTime != LastTime || update)
- {
- // but only, if something has changed
-+#if APIVERSNUM >= 10703
-+ if (replay.total / DEFAULTFRAMESPERSECOND != replay.totalLast / DEFAULTFRAMESPERSECOND ||
-+ replay.current / DEFAULTFRAMESPERSECOND != replay.currentLast / DEFAULTFRAMESPERSECOND ||
-+#else
- if (replay.total / FRAMESPERSEC != replay.totalLast / FRAMESPERSEC ||
- replay.current / FRAMESPERSEC != replay.currentLast / FRAMESPERSEC ||
-+#endif
- CurrTime/60 != LastTime/60 ||
- update)
- {
-@@ -1330,14 +1335,22 @@ void cGraphLCDDisplay::DisplayProgramme(
-
- bool cGraphLCDDisplay::IndexIsGreaterAsOneHour(int Index) const
- {
-+#if APIVERSNUM >= 10703
-+ int h = (Index / DEFAULTFRAMESPERSECOND) / 3600;
-+#else
- int h = (Index / FRAMESPERSEC) / 3600;
-+#endif
- return h > 0;
- }
-
- const char * cGraphLCDDisplay::IndexToMS(int Index) const
- {
- static char buffer[16];
-+#if APIVERSNUM >= 10703
-+ int s = (Index / DEFAULTFRAMESPERSECOND);
-+#else
- int s = (Index / FRAMESPERSEC);
-+#endif
- int m = s / 60;
- s %= 60;
- snprintf(buffer, sizeof(buffer), "%02d:%02d", m, s);
---- graphlcd-0.1.5/state.c
-+++ graphlcd-0.1.5/state.c
-@@ -40,7 +40,11 @@ cGraphLCDState::cGraphLCDState(cGraphLCD
- replay.control = NULL;
- replay.mode = eReplayNormal;
- replay.current = 0;
-+#if APIVERSNUM >= 10703
-+ replay.currentLast = DEFAULTFRAMESPERSECOND;
-+#else
- replay.currentLast = FRAMESPERSEC;
-+#endif
- replay.total = 0;
- replay.totalLast = 1;
-
-@@ -303,7 +307,11 @@ void cGraphLCDState::Replaying(const cCo
- replay.name = Name;
- }
- }
-+#if APIVERSNUM >= 10703
-+ replay.currentLast = DEFAULTFRAMESPERSECOND;
-+#else
- replay.currentLast = FRAMESPERSEC;
-+#endif
- replay.totalLast = 1;
- mutex.Unlock();
- }
diff --git a/debian/plugin.graphlcd.conf b/debian/plugin.graphlcd.conf
index b9f5aa7..5259923 100644
--- a/debian/plugin.graphlcd.conf
+++ b/debian/plugin.graphlcd.conf
@@ -1 +1 @@
--c /etc/graphlcd.conf -d simlcd
+-c /etc/graphlcd.conf -d simlcd -s touchcol
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000..b9bac8b
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+
+ # Change owner of directory for temporary files
+ /bin/chown -R vdr:vdr /var/lib/vdr/plugins/graphlcd || true
+
+ # Make vdr a member of the groups required by the plugin
+ /bin/sh /usr/lib/vdr/vdr-groups.sh --add vdr-plugin-graphlcd
+fi
+
+#DEBHELPER#
diff --git a/debian/preinst b/debian/preinst
deleted file mode 100644
index 1159239..0000000
--- a/debian/preinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-set -e
-
-# remove old fonts and logos directories
-if [ "$1" = "install" -o "$1" = "upgrade" ]; then
- rm -rf /etc/vdr/plugins/graphlcd/fonts
- rm -rf /etc/vdr/plugins/graphlcd/logos
-fi
-
-#DEBHELPER#
diff --git a/debian/prerm b/debian/prerm
new file mode 100644
index 0000000..882c270
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+ remove|upgrade|deconfigure)
+ # Remove vdr from groups required by the plugin
+ /bin/sh /usr/lib/vdr/vdr-groups.sh --remove vdr-plugin-graphlcd
+ ;;
+ failed-upgrade)
+ ;;
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/rules b/debian/rules
index b81598f..7d001e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+#include /usr/share/cdbs/1/rules/dpatch.mk
DEB_INSTALL_CHANGELOGS_ALL = HISTORY
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/vdr-plugin-graphlcd.groups b/debian/vdr-plugin-graphlcd.groups
new file mode 100644
index 0000000..9cc0bda
--- /dev/null
+++ b/debian/vdr-plugin-graphlcd.groups
@@ -0,0 +1 @@
+lp uucp
--
vdr-plugin-graphlcd packaging repository
More information about the pkg-vdr-dvb-changes
mailing list