r101 - in vdr: . vdr-plugin-osdteletext vdr-plugin-osdteletext/branches vdr-plugin-osdteletext/branches/upstream vdr-plugin-osdteletext/branches/upstream/current vdr-plugin-osdteletext/branches/upstream/current/debian vdr-plugin-osdteletext/branches/upstream/current/debian/patches

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Wed, 23 Feb 2005 13:30:56 +0100


Author: tschmidt
Date: 2005-02-23 13:30:56 +0100 (Wed, 23 Feb 2005)
New Revision: 101

Added:
   vdr/vdr-plugin-osdteletext/
   vdr/vdr-plugin-osdteletext/branches/
   vdr/vdr-plugin-osdteletext/branches/upstream/
   vdr/vdr-plugin-osdteletext/branches/upstream/current/
   vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/
   vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/changelog
   vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/control
   vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/
   vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/00list
   vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/01_Makefile-fPIC-fix.dpatch
   vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/01_Makefile.dpatch
   vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/watch
   vdr/vdr-plugin-osdteletext/tags/
Log:
[svn-inject] Installing original source of vdr-plugin-osdteletext

Added: vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/changelog
===================================================================
--- vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/changelog	2005-02-23 12:28:50 UTC (rev 100)
+++ vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/changelog	2005-02-23 12:30:56 UTC (rev 101)
@@ -0,0 +1,49 @@
+vdr-plugin-osdteletext (0.3.2-5) unstable; urgency=low
+
+  * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+    - 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
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Wed,  6 Oct 2004 22:18:23 +0200
+
+vdr-plugin-osdteletext (0.3.2-4) unstable; urgency=low
+
+  * taken over from vdrdevel by Thomas Günther <tom@toms-cafe.de>
+    - Adapted control file to alioth packages
+    - Using patchlevel.sh and custom control field "vdr-patchlevel"
+    - Added Makefile-fPIC-fix patch to fix potential FTBFS
+
+ -- Tobias Grimm <tg@e-tobi.net>  Tue,  28 Sep 2004 21:50:00 +0200
+
+vdr-plugin-osdteletext (0.3.2-3) unstable; urgency=low
+
+  * Using dh_install
+  * Using dpatch
+  * Convert upstream changes to dpatch
+  * Removed debian/vdr-plugin-dvdselect.substvars
+  * Fixed debhelper version in Build-Depends
+  * Added debian/watch file for uscan
+  * Removed debian/dirs
+
+ -- Thomas Günther <tom@toms-cafe.de>  Wed, 30 Jun 2004 01:31:10 +0200
+
+vdr-plugin-osdteletext (0.3.2-2) unstable; urgency=low
+
+  * integrated patchlevel info
+
+ -- Peter Siering <ps@ctmagazin.de>  Tue, 13 Jan 2004 23:45:00 +0200
+
+vdr-plugin-osdteletext (0.3.2-1) unstable; urgency=low
+
+  * New upstream release
+  * fixed some bugs in debian packaging
+
+ -- Tobias Grimm <tg@e-tobi.net>  Tue,  2 Dec 2003 22:21:54 +0100
+
+vdr-plugin-osdteletext (0.3.1-1) unstable; urgency=low
+
+  * debianized
+
+ -- Tobias Grimm <tg@e-tobi.net>  Fri, 31 Oct 2003 21:00:00 +0200

Added: vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/control
===================================================================
--- vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/control	2005-02-23 12:28:50 UTC (rev 100)
+++ vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/control	2005-02-23 12:30:56 UTC (rev 101)
@@ -0,0 +1,15 @@
+Source: vdr-plugin-osdteletext
+Section: misc
+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
+Standards-Version: 3.6.1
+
+Package: vdr-plugin-osdteletext
+Architecture: any
+Depends: ${shlibs:Depends}, vdr (>= 1.2.6)
+Conflicts: vdr (>=1.2.7)
+Description: Teletext plugin for vdr
+ This plugin displays teletext directly on the OSD.
+XB-VDR-Patchlevel: ${patchlevel}

Added: vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/00list	2005-02-23 12:28:50 UTC (rev 100)
+++ vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/00list	2005-02-23 12:30:56 UTC (rev 101)
@@ -0,0 +1,2 @@
+01_Makefile
+01_Makefile-fPIC-fix

Added: vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-02-23 12:28:50 UTC (rev 100)
+++ vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-02-23 12:30:56 UTC (rev 101)
@@ -0,0 +1,37 @@
+#!/bin/sh -e
+## 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
++++ vdrdevel-plugin-osdteletext/Makefile	Sun Sep 12 17:32:35 2004
+@@ -16,7 +16,7 @@
+ ### The C++ compiler and options:
+ 
+ CXX      ?= g++
+-CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual
+ # for debugging:
+ #CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
+ 


Property changes on: vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/01_Makefile-fPIC-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + 

Added: vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/01_Makefile.dpatch
===================================================================
--- vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/01_Makefile.dpatch	2005-02-23 12:28:50 UTC (rev 100)
+++ vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/01_Makefile.dpatch	2005-02-23 12:30:56 UTC (rev 101)
@@ -0,0 +1,44 @@
+#!/bin/sh -e
+## 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
+@@ -67,8 +67,6 @@
+ ### Targets:
+ 
+ all: libvdr-$(PLUGIN).so
+-	@install -d ../../man
+-	@install README ../../man/$(PLUGIN).man
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+@@ -84,3 +82,7 @@
+ 
+ clean:
+ 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
++
++install:
++	@install -d ../../man
++	@install README ../../man/$(PLUGIN).man


Property changes on: vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/patches/01_Makefile.dpatch
___________________________________________________________________
Name: svn:executable
   + 

Added: vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/watch
===================================================================
--- vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/watch	2005-02-23 12:28:50 UTC (rev 100)
+++ vdr/vdr-plugin-osdteletext/branches/upstream/current/debian/watch	2005-02-23 12:30:56 UTC (rev 101)
@@ -0,0 +1,2 @@
+version=2
+http://www.wiesweg-online.de/linux/linux.html .*/vdr-osdteletext-(.*)\.tgz