r104 - in vdr/vdr-plugin-osdteletext/trunk/debian: . patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Wed, 23 Feb 2005 13:31:22 +0100
Author: tschmidt
Date: 2005-02-23 13:31:22 +0100 (Wed, 23 Feb 2005)
New Revision: 104
Added:
vdr/vdr-plugin-osdteletext/trunk/debian/dirs
vdr/vdr-plugin-osdteletext/trunk/debian/patches/02_tmp-path-fix.dpatch
vdr/vdr-plugin-osdteletext/trunk/debian/postinst
Modified:
vdr/vdr-plugin-osdteletext/trunk/debian/changelog
vdr/vdr-plugin-osdteletext/trunk/debian/control
vdr/vdr-plugin-osdteletext/trunk/debian/patches/00list
vdr/vdr-plugin-osdteletext/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-osdteletext/trunk/debian/patches/01_Makefile.dpatch
vdr/vdr-plugin-osdteletext/trunk/debian/watch
Log:
Load newtrunk into vdr/vdr-plugin-osdteletext/trunk.
Modified: vdr/vdr-plugin-osdteletext/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/changelog 2005-02-23 12:31:01 UTC (rev 103)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/changelog 2005-02-23 12:31:22 UTC (rev 104)
@@ -1,10 +1,33 @@
+vdr-plugin-osdteletext (0.3.2-7) 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 /var/cache/vdr/vtx/ to vdr:vdr in
+ debian/postinst
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sun, 2 Jan 2005 15:36:05 +0100
+
+vdr-plugin-osdteletext (0.3.2-6) 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:56:21 +0200
+
vdr-plugin-osdteletext (0.3.2-5) unstable; urgency=low
* Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - First upload to the official archive (closes: #275404)
- Changed Maintainer to Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
- Added myself and Tobias Grimm <tg@e-tobi.net> as Uploaders
- Cleaned up debian/rules a little bit
- Converted debian/changelog to UTF8
+ - Updated debian/watch
+ - Changed package-description a little bit
+ - Changed path of the tmp-files from /vtx to /var/cache/vdr/vtx
-- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Wed, 6 Oct 2004 22:18:23 +0200
Modified: vdr/vdr-plugin-osdteletext/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/control 2005-02-23 12:31:01 UTC (rev 103)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/control 2005-02-23 12:31:22 UTC (rev 104)
@@ -3,13 +3,13 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
Uploaders: Tobias Grimm <tg@e-tobi.net>, Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
-Build-Depends: debhelper (>= 4.1.16), vdr-dev (>= 1.2.6-5), dpatch
+Build-Depends: debhelper (>= 4.1.16), vdr-dev (>= 1.2.6-6), dpatch (>= 2.0.9)
Standards-Version: 3.6.1
Package: vdr-plugin-osdteletext
Architecture: any
-Depends: ${shlibs:Depends}, vdr (>= 1.2.6)
+Depends: ${shlibs:Depends}, vdr (>= 1.2.6-6)
Conflicts: vdr (>=1.2.7)
Description: Teletext plugin for vdr
- This plugin displays teletext directly on the OSD.
+ This plugin for vdr displays teletext directly on the OSD of vdr.
XB-VDR-Patchlevel: ${patchlevel}
Added: vdr/vdr-plugin-osdteletext/trunk/debian/dirs
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/dirs 2005-02-23 12:31:01 UTC (rev 103)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/dirs 2005-02-23 12:31:22 UTC (rev 104)
@@ -0,0 +1 @@
+var/cache/vdr
Modified: vdr/vdr-plugin-osdteletext/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/patches/00list 2005-02-23 12:31:01 UTC (rev 103)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/patches/00list 2005-02-23 12:31:22 UTC (rev 104)
@@ -1,2 +1,3 @@
01_Makefile
01_Makefile-fPIC-fix
+02_tmp-path-fix
Modified: vdr/vdr-plugin-osdteletext/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-02-23 12:31:01 UTC (rev 103)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-02-23 12:31:22 UTC (rev 104)
@@ -1,27 +1,10 @@
-#!/bin/sh -e
+#!/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 Makefile to fix potential FTBFS.
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
diff -urNad /usr/src/cvs/vdrdevel-plugin-osdteletext/Makefile vdrdevel-plugin-osdteletext/Makefile
--- /usr/src/cvs/vdrdevel-plugin-osdteletext/Makefile Sun Sep 12 17:31:27 2004
Property changes on: vdr/vdr-plugin-osdteletext/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: vdr/vdr-plugin-osdteletext/trunk/debian/patches/01_Makefile.dpatch
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/patches/01_Makefile.dpatch 2005-02-23 12:31:01 UTC (rev 103)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/patches/01_Makefile.dpatch 2005-02-23 12:31:22 UTC (rev 104)
@@ -1,27 +1,10 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
## 01_Makefile.dpatch
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Move installation of README and man page from all to install.
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
--- osdteletext.orig/Makefile
+++ osdteletext/Makefile
Property changes on: vdr/vdr-plugin-osdteletext/trunk/debian/patches/01_Makefile.dpatch
___________________________________________________________________
Name: svn:executable
-
+ *
Added: vdr/vdr-plugin-osdteletext/trunk/debian/patches/02_tmp-path-fix.dpatch
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/patches/02_tmp-path-fix.dpatch 2005-02-23 12:31:01 UTC (rev 103)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/patches/02_tmp-path-fix.dpatch 2005-02-23 12:31:22 UTC (rev 104)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 02_tmp-path.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change the patch for the temporary files, so that they do not
+## DP: get stored on /vtx/
+
+@DPATCH@
+diff -urNad vdr-plugin-osdteletext/menu.c /tmp/dpep.nm4T2V/vdr-plugin-osdteletext/menu.c
+--- vdr-plugin-osdteletext/menu.c 2003-10-05 19:41:28.000000000 +0200
++++ /tmp/dpep.nm4T2V/vdr-plugin-osdteletext/menu.c 2004-10-07 22:54:51.000000000 +0200
+@@ -20,7 +20,7 @@
+ #include "txtrecv.h"
+
+
+-#define TXTROOT "/vtx"
++#define TXTROOT "/var/cache/vdr/vtx"
+
+ #define GET_HUNDREDS(x) ( ( (x) - ((x)%100) ) /100 )
+ #define GET_TENS(x) ( (( (x) - ((x)%10) )%100 ) /10 )
+diff -urNad vdr-plugin-osdteletext/txtrecv.c /tmp/dpep.nm4T2V/vdr-plugin-osdteletext/txtrecv.c
+--- vdr-plugin-osdteletext/txtrecv.c 2003-12-02 17:20:21.000000000 +0100
++++ /tmp/dpep.nm4T2V/vdr-plugin-osdteletext/txtrecv.c 2004-10-07 22:55:47.000000000 +0200
+@@ -9,7 +9,7 @@
+ #include <signal.h>
+ #include <errno.h>
+
+-#define TXTROOT "/vtx"
++#define TXTROOT "/var/cache/vdr/vtx"
+
+ #ifdef ALTERNATIVE_STORAGE
+ TextPages teletextPages;
+@@ -53,7 +53,7 @@
+ buf=0x00; fwrite(&buf,1,1,fd);
+ buf=0x00; fwrite(&buf,1,1,fd);
+ if (!fwrite(pagebuf,1,24*40,fd) && ferror(fd) && errno==ENOSPC) {
+- esyslog("Osd-Teletext: Error: No space left on /vtx");
++ esyslog("Osd-Teletext: Error: No space left on /var/cache/vdr/vtx");
+ }
+ fclose (fd);
+ }
Added: vdr/vdr-plugin-osdteletext/trunk/debian/postinst
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/postinst 2005-02-23 12:31:01 UTC (rev 103)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/postinst 2005-02-23 12:31:22 UTC (rev 104)
@@ -0,0 +1,48 @@
+#! /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-dir is correctly owned
+ [ ! -d /var/cache/vdr/vtx ] || chown -R vdr:vdr /var/cache/vdr/vtx
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+
Modified: vdr/vdr-plugin-osdteletext/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/watch 2005-02-23 12:31:01 UTC (rev 103)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/watch 2005-02-23 12:31:22 UTC (rev 104)
@@ -1,2 +1,2 @@
version=2
-http://www.wiesweg-online.de/linux/linux.html .*/vdr-osdteletext-(.*)\.tgz
+http://www.wiesweg-online.de/linux/linux.html .*/vdr-osdteletext-(.*)\.tgz debian uupdate