r109 - in vdr/vdr-plugin-prefermenu/trunk: . debian debian/patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Wed, 23 Feb 2005 13:36:30 +0100
Author: tschmidt
Date: 2005-02-23 13:36:29 +0100 (Wed, 23 Feb 2005)
New Revision: 109
Added:
vdr/vdr-plugin-prefermenu/trunk/debian/
vdr/vdr-plugin-prefermenu/trunk/debian/changelog
vdr/vdr-plugin-prefermenu/trunk/debian/control
vdr/vdr-plugin-prefermenu/trunk/debian/copyright
vdr/vdr-plugin-prefermenu/trunk/debian/docs
vdr/vdr-plugin-prefermenu/trunk/debian/install
vdr/vdr-plugin-prefermenu/trunk/debian/patches/
vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list
vdr/vdr-plugin-prefermenu/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-prefermenu/trunk/debian/patches/02_Makefile-GNU_SOURCE-fix.dpatch
vdr/vdr-plugin-prefermenu/trunk/debian/postinst
vdr/vdr-plugin-prefermenu/trunk/debian/rules
vdr/vdr-plugin-prefermenu/trunk/debian/watch
Log:
Load newtrunk into vdr/vdr-plugin-prefermenu/trunk.
Added: vdr/vdr-plugin-prefermenu/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/changelog 2005-02-23 12:36:13 UTC (rev 108)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/changelog 2005-02-23 12:36:29 UTC (rev 109)
@@ -0,0 +1,68 @@
+vdr-plugin-prefermenu (0.6.2-3) unstable; urgency=low
+
+ !!! unreleased !!!
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - Build-depend and Depend on vdr (>=1.2.6-6)
+ - Change owner/group of the config file to vdr:vdr in
+ debian/postinst
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sun, 2 Jan 2005 15:29:45 +0100
+
+vdr-plugin-prefermenu (0.6.2-2) unstable; urgency=low
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - Build-depend on dpatch (>= 2.0.9)
+ - Converted existing dpatch-files to the new short format
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Tue, 26 Oct 2004 11:58:06 +0200
+
+vdr-plugin-prefermenu (0.6.2-1) unstable; urgency=low
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - First upload to the official archive (closes: #273311)
+ - New upstream release
+ - Added watch-file
+ - Added patchlevel-mechanism, to be compatible with c't-vdr
+ - Use dpatch, so build-dep on dpatch
+ - Add 01_Makefile-fPIC-fix.dpatch
+ - Use dh_install
+ - Changed maintainer to Debian VDR and DVB Packaging Team
+ <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+ - Changed architecture to any
+ * Tobias Grimm <tg@e-tobi.net>
+ - Added 02_Makefile-GNU_SOURCE-fix.dpatch to enable GNU extensions
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sat, 25 Sep 2004 11:59:12 +0200
+
+vdr-plugin-prefermenu (0.5.3-5) unstable; urgency=low
+
+ * Rebuild for vdr 1.2.6
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 16 Nov 2003 15:06:41 +0100
+
+vdr-plugin-prefermenu (0.5.3-4) unstable; urgency=low
+
+ * Rebuild for vdr 1.2.5
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Wed, 17 Sep 2003 20:26:09 +0200
+
+vdr-plugin-prefermenu (0.5.3-3) unstable; urgency=low
+
+ * changed the plugin-dir to /usr/lib/vdr/plugins, to be FHS compliant
+ Thanks to Henning Glawe <glaweh@physik.fu-berlin.de> for pointing me
+ to this one
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 14 Sep 2003 16:29:16 +0200
+
+vdr-plugin-prefermenu (0.5.3-2) unstable; urgency=low
+
+ * Revised german translations
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sat, 13 Sep 2003 10:52:22 +0200
+
+vdr-plugin-prefermenu (0.5.3-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sat, 13 Sep 2003 10:27:16 +0200
Added: vdr/vdr-plugin-prefermenu/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/control 2005-02-23 12:36:13 UTC (rev 108)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/control 2005-02-23 12:36:29 UTC (rev 109)
@@ -0,0 +1,16 @@
+Source: vdr-plugin-prefermenu
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Uploaders: Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.2.6-6), dpatch (>= 2.0.9)
+Standards-Version: 3.6.1
+
+Package: vdr-plugin-prefermenu
+Architecture: any
+Depends: ${shlibs:Depends}, vdr (>=1.2.6-6)
+Conflicts: vdr (>=1.2.7)
+Description: Plugin that implements a preferred channels menu
+ This plugin for vdr implements a preferred channels menu.
+ It makes it easy to switch to your favourite chanels.
+XB-VDR-Patchlevel: ${patchlevel}
Added: vdr/vdr-plugin-prefermenu/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/copyright 2005-02-23 12:36:13 UTC (rev 108)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/copyright 2005-02-23 12:36:29 UTC (rev 109)
@@ -0,0 +1,26 @@
+This package was debianized by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> on
+Thu, 13 Sept 2003 10:30:00 +0200.
+
+It was downloaded from http://www.olivierjacques.com/vdr/prefermenu
+
+Upstream Authors: Maxime Guilbot <maxime.guilbot@online.fr>
+ Olivier Jacques <vdr@olivierjacques.com>
+
+Copyright:
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ see /usr/share/common-licenses/GPL
+
Added: vdr/vdr-plugin-prefermenu/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/docs 2005-02-23 12:36:13 UTC (rev 108)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/docs 2005-02-23 12:36:29 UTC (rev 109)
@@ -0,0 +1,2 @@
+README
+TESTS
Added: vdr/vdr-plugin-prefermenu/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/install 2005-02-23 12:36:13 UTC (rev 108)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/install 2005-02-23 12:36:29 UTC (rev 109)
@@ -0,0 +1 @@
+libvdr-*.so.* usr/lib/vdr/plugins
Added: vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list 2005-02-23 12:36:13 UTC (rev 108)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list 2005-02-23 12:36:29 UTC (rev 109)
@@ -0,0 +1,2 @@
+01_Makefile-fPIC-fix
+02_Makefile-GNU_SOURCE-fix
Added: vdr/vdr-plugin-prefermenu/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-02-23 12:36:13 UTC (rev 108)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-02-23 12:36:29 UTC (rev 109)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile
+
+@DPATCH@
+diff -urNad /usr/src/self-compiled/vdr/plugins/prefermenu/vdr-plugin-prefermenu-0.6.2/Makefile vdr-plugin-prefermenu-0.6.2/Makefile
+--- /usr/src/self-compiled/vdr/plugins/prefermenu/vdr-plugin-prefermenu-0.6.2/Makefile 2004-08-05 22:48:29.000000000 +0200
++++ vdr-plugin-prefermenu-0.6.2/Makefile 2004-08-05 22:49:27.000000000 +0200
+@@ -16,7 +16,7 @@
+ ### The C++ compiler and options:
+
+ CXX ?= g++
+-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
+
+ ### The directory environment:
+
Added: vdr/vdr-plugin-prefermenu/trunk/debian/patches/02_Makefile-GNU_SOURCE-fix.dpatch
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/patches/02_Makefile-GNU_SOURCE-fix.dpatch 2005-02-23 12:36:13 UTC (rev 108)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/patches/02_Makefile-GNU_SOURCE-fix.dpatch 2005-02-23 12:36:29 UTC (rev 109)
@@ -0,0 +1,18 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## makefile
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add -D_GNU_SOURCE to enable GNU extensions
+
+@DPATCH@
+--- vdr-plugin-pvr350-0.0.2/Makefile.orig Thu Feb 26 01:11:15 2004
++++ vdr-plugin-pvr350-0.0.2/Makefile Thu Feb 26 01:11:34 2004
+@@ -43,6 +43,7 @@
+ INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
++DEFINES += -D_GNU_SOURCE
+
+ ### The object files (add further files here):
+
Added: vdr/vdr-plugin-prefermenu/trunk/debian/postinst
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/postinst 2005-02-23 12:36:13 UTC (rev 108)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/postinst 2005-02-23 12:36:29 UTC (rev 109)
@@ -0,0 +1,49 @@
+#! /bin/sh
+# postinst script for vdr
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+# Any necessary prompting should almost always be confined to the
+# post-installation script, and should be protected with a conditional
+# so that unnecessary prompting doesn't happen if a package's
+# installation fails and the `postinst' is called with `abort-upgrade',
+# `abort-remove' or `abort-deconfigure'.
+
+# source debconf lib
+. /usr/share/debconf/confmodule
+
+case "$1" in
+ configure)
+ # ensure that the config-file is correctly owned
+ [ ! -e /var/lib/vdr/plugins/prefermenu.conf ] || \
+ chown vdr:vdr /var/lib/vdr/plugins/prefermenu.conf
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+
Added: vdr/vdr-plugin-prefermenu/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/rules 2005-02-23 12:36:13 UTC (rev 108)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/rules 2005-02-23 12:36:29 UTC (rev 109)
@@ -0,0 +1,97 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=4
+
+# include dpatch stuff
+include /usr/share/dpatch/dpatch.make
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+VDR=vdr
+PACKAGE=$(VDR)-plugin-prefermenu
+VDRDIR=/usr/include/$(VDR)
+DVBDIR=/usr/include
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+
+ touch configure-stamp
+
+
+build: patch-stamp build-stamp
+
+build-stamp: configure-stamp
+ dh_testdir
+
+ $(MAKE) all DVBDIR=/usr/include VDRDIR=/usr/include/vdr LIBDIR=.
+
+ touch build-stamp
+
+clean: clean-patched unpatch
+
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ rm -f libvdr-*.so*
+ make clean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ dh_install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installexamples
+ dh_installmenu
+ dh_installcron
+ dh_installman
+ dh_installinfo
+ dh_installchangelogs
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+
+ # VDR can be customized with quite a lot of different patches, which can make
+ # the plugins binary incompatible.
+ # Although Debian will not provide different binary packages for VDR, we
+ # will include a patchlevel info, which is created at compile time and can
+ # be checked before a plugin is loaded.
+
+ [ -r $(VDRDIR)/patchlevel ] || echo 'patchlevel=' >> debian/$(PACKAGE).substvars
+ [ ! -r $(VDRDIR)/patchlevel ] || cat $(VDRDIR)/patchlevel >> debian/$(PACKAGE).substvars
+
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure
Property changes on: vdr/vdr-plugin-prefermenu/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-prefermenu/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/watch 2005-02-23 12:36:13 UTC (rev 108)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/watch 2005-02-23 12:36:29 UTC (rev 109)
@@ -0,0 +1,2 @@
+version=2
+http://famillejacques.free.fr/vdr/prefermenu/vdr-prefermenu-(.*).tgz