r451 - in vdr/vdr-plugin-osdteletext/trunk/debian: . patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Mon, 11 Apr 2005 20:25:43 +0000
Author: tschmidt
Date: 2005-04-11 20:25:42 +0000 (Mon, 11 Apr 2005)
New Revision: 451
Modified:
vdr/vdr-plugin-osdteletext/trunk/debian/changelog
vdr/vdr-plugin-osdteletext/trunk/debian/control
vdr/vdr-plugin-osdteletext/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-osdteletext/trunk/debian/patches/02_tmp-path-fix.dpatch
vdr/vdr-plugin-osdteletext/trunk/debian/watch
Log:
vdr-plugin-osdteletext:
- New upstream release
- Updated 01_Makefile-fPIC-fix and 02_tmp-path-fix dpatches
- Depend/Build-Depend on vdr (>=1.3.23-1)
- Conflict with vdr (>=1.3.24)
- Do not use "debian uupdate" in debian/watch anymore
Modified: vdr/vdr-plugin-osdteletext/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/changelog 2005-04-11 19:30:46 UTC (rev 450)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/changelog 2005-04-11 20:25:42 UTC (rev 451)
@@ -1,3 +1,16 @@
+vdr-plugin-osdteletext (0.4.2-1) experimental; urgency=low
+
+ * (NOT RELEASED YET) New upstream release
+
+ * Thomas Schmidt <tschmidt@debian.org>
+ - New upstream release
+ - Updated 01_Makefile-fPIC-fix and 02_tmp-path-fix dpatches
+ - Depend/Build-Depend on vdr (>=1.3.23-1)
+ - Conflict with vdr (>=1.3.24)
+ - Do not use "debian uupdate" in debian/watch anymore
+
+ -- Thomas Schmidt <tschmidt@debian.org> Mon, 11 Apr 2005 22:02:06 +0200
+
vdr-plugin-osdteletext (0.3.2+1-1) unstable; urgency=low
* Thomas Schmidt <tschmidt@debian.org>
Modified: vdr/vdr-plugin-osdteletext/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/control 2005-04-11 19:30:46 UTC (rev 450)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/control 2005-04-11 20:25:42 UTC (rev 451)
@@ -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 <tschmidt@debian.org>
-Build-Depends: debhelper (>= 4.1.16), vdr-dev (>= 1.2.6-6), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>= 4.1.16), vdr-dev (>= 1.3.23-1), dpatch (>= 2.0.9)
Standards-Version: 3.6.1
Package: vdr-plugin-osdteletext
Architecture: any
-Depends: ${shlibs:Depends}, vdr (>= 1.2.6-6)
-Conflicts: vdr (>=1.2.7)
+Depends: ${shlibs:Depends}, vdr (>= 1.3.23-1)
+Conflicts: vdr (>=1.3.24)
Description: Teletext plugin for vdr
This plugin for vdr displays teletext directly on the OSD of vdr.
XB-VDR-Patchlevel: ${patchlevel}
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-04-11 19:30:46 UTC (rev 450)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-04-11 20:25:42 UTC (rev 451)
@@ -6,14 +6,14 @@
## DP: Adds -fPIC to Makefile to fix potential FTBFS.
@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
-+++ vdrdevel-plugin-osdteletext/Makefile Sun Sep 12 17:32:35 2004
-@@ -16,7 +16,7 @@
+diff -urNad vdr-plugin-osdteletext-0.4.2/Makefile /tmp/dpep.CAHkI5/vdr-plugin-osdteletext-0.4.2/Makefile
+--- vdr-plugin-osdteletext-0.4.2/Makefile 2005-04-11 22:07:10.152089600 +0200
++++ /tmp/dpep.CAHkI5/vdr-plugin-osdteletext-0.4.2/Makefile 2005-04-11 22:08:49.973177944 +0200
+@@ -15,6 +15,8 @@
+
### The C++ compiler and options:
- CXX ?= g++
--CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
++CXX ?= g++
+CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual
# for debugging:
#CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
Modified: 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-04-11 19:30:46 UTC (rev 450)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/patches/02_tmp-path-fix.dpatch 2005-04-11 20:25:42 UTC (rev 451)
@@ -7,36 +7,39 @@
## 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 @@
+diff -urNad vdr-plugin-osdteletext-0.4.2/menu.c /tmp/dpep.xY84Ch/vdr-plugin-osdteletext-0.4.2/menu.c
+--- vdr-plugin-osdteletext-0.4.2/menu.c 2005-04-11 22:12:46.119278280 +0200
++++ /tmp/dpep.xY84Ch/vdr-plugin-osdteletext-0.4.2/menu.c 2005-04-11 22:12:46.400235568 +0200
+@@ -21,7 +21,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 GET_HUNDREDS(x) ( ( (x) - ((x)%256) ) /256 )
+ #define GET_TENS(x) ( (( (x) - ((x)%16) )%256 ) /16 )
+diff -urNad vdr-plugin-osdteletext-0.4.2/osdteletext.c /tmp/dpep.xY84Ch/vdr-plugin-osdteletext-0.4.2/osdteletext.c
+--- vdr-plugin-osdteletext-0.4.2/osdteletext.c 2005-03-03 18:11:50.000000000 +0100
++++ /tmp/dpep.xY84Ch/vdr-plugin-osdteletext-0.4.2/osdteletext.c 2005-04-11 22:20:16.918746344 +0200
+@@ -122,7 +122,7 @@
+ // Return a string that describes all known command line options.
+ return " -d --directory=DIR the directory where the temporary\n"
+ " files will be stored\n"
+- " (default: /vtx, recommended: /tmp/vtx)\n"
++ " (default: /var/cache/vdr/vtx)\n"
+ " -n --max-cache=NUM maximum size in megabytes of cache used\n"
+ " to store the pages on the harddisk\n"
+ " (default: a calculated value below 50 MB)\n"
+diff -urNad vdr-plugin-osdteletext-0.4.2/txtrecv.c /tmp/dpep.xY84Ch/vdr-plugin-osdteletext-0.4.2/txtrecv.c
+--- vdr-plugin-osdteletext-0.4.2/txtrecv.c 2005-04-11 22:12:46.120278128 +0200
++++ /tmp/dpep.xY84Ch/vdr-plugin-osdteletext-0.4.2/txtrecv.c 2005-04-11 22:14:57.506304416 +0200
+@@ -26,7 +26,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
--#define TXTROOT "/vtx"
-+#define TXTROOT "/var/cache/vdr/vtx"
+-const char *RootDir::root = "/vtx";
++const char *RootDir::root = "/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);
- }
+ void RootDir::setRootDir(const char *newRoot) {
+ root=newRoot;
Modified: vdr/vdr-plugin-osdteletext/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/watch 2005-04-11 19:30:46 UTC (rev 450)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/watch 2005-04-11 20:25:42 UTC (rev 451)
@@ -1,2 +1,2 @@
version=2
-http://www.wiesweg-online.de/linux/linux.html .*/vdr-osdteletext-(.*)\.tgz debian uupdate
+http://www.wiesweg-online.de/linux/linux.html .*/vdr-osdteletext-(.*)\.tgz