vdr/vdr-plugin-osdteletext/debian/patches 01_Makefile.dpatch 01_Makefile-fPIC-fix.dpatch 02_tmp-path-fix.dpatch

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Tue, 26 Oct 2004 10:49:13 +0000


Update of /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-osdteletext/debian/patches
In directory haydn:/tmp/cvs-serv32046/vdr-plugin-osdteletext/debian/patches

Modified Files:
	01_Makefile.dpatch 01_Makefile-fPIC-fix.dpatch 
	02_tmp-path-fix.dpatch 
Log Message:
* build-dep on dpatch (>= 2.0.9)
* converted dpatch-files to short format

Index: 02_tmp-path-fix.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-osdteletext/debian/patches/02_tmp-path-fix.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 02_tmp-path-fix.dpatch	7 Oct 2004 21:02:40 -0000	1.1
+++ 02_tmp-path-fix.dpatch	26 Oct 2004 10:49:11 -0000	1.2
@@ -1,4 +1,5 @@
 #! /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.

Index: 01_Makefile.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-osdteletext/debian/patches/01_Makefile.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 01_Makefile.dpatch	6 Oct 2004 20:30:40 -0000	1.1
+++ 01_Makefile.dpatch	26 Oct 2004 10:49:11 -0000	1.2
@@ -1,26 +1,9 @@
-#!/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

Index: 01_Makefile-fPIC-fix.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-osdteletext/debian/patches/01_Makefile-fPIC-fix.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 01_Makefile-fPIC-fix.dpatch	6 Oct 2004 20:30:40 -0000	1.1
+++ 01_Makefile-fPIC-fix.dpatch	26 Oct 2004 10:49:11 -0000	1.2
@@ -1,26 +1,9 @@
-#!/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