vdr/vdr/debian/patches 01_gcc3.4-FTBFS-fix.dpatch 01_vdr_1.2.6-3.1.diff.gz.dpatch 02_Makefile-CFGDIR.dpatch 03_cmdsubmenu.dpatch opt-20_elchiaio4d+1.dpatch opt-21_ttxtsubs.dpatch opt-22_8bitcolor.dpatch opt-23_osdpip-0.0.3.dpatch opt-24_jumpplay-0.4.dpatch dpatch.sh

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 17 Oct 2004 12:30:23 +0000


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

Modified Files:
	01_gcc3.4-FTBFS-fix.dpatch 01_vdr_1.2.6-3.1.diff.gz.dpatch 
	02_Makefile-CFGDIR.dpatch 03_cmdsubmenu.dpatch 
	opt-20_elchiaio4d+1.dpatch opt-21_ttxtsubs.dpatch 
	opt-22_8bitcolor.dpatch opt-23_osdpip-0.0.3.dpatch 
	opt-24_jumpplay-0.4.dpatch 
Removed Files:
	dpatch.sh 
Log Message:
* converted existing dpatch-files to the new short format
* build-depend on dpatch (>= 2.0.9)
* removed debian/patches/dpatch.sh

--- dpatch.sh DELETED ---

Index: 02_Makefile-CFGDIR.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/02_Makefile-CFGDIR.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 02_Makefile-CFGDIR.dpatch	15 Jul 2004 19:26:52 -0000	1.2
+++ 02_Makefile-CFGDIR.dpatch	17 Oct 2004 12:30:19 -0000	1.3
@@ -1,4 +1,4 @@
-#! /bin/sh debian/patches/dpatch.sh
+#! /bin/sh /usr/share/dpatch/dpatch-run
 
 ## 01_Makefile-CFGDIR.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
 ##

Index: opt-20_elchiaio4d+1.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/opt-20_elchiaio4d+1.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- opt-20_elchiaio4d+1.dpatch	1 Aug 2004 10:43:48 -0000	1.1
+++ opt-20_elchiaio4d+1.dpatch	17 Oct 2004 12:30:19 -0000	1.2
@@ -1,4 +1,4 @@
-#!/bin/sh debian/patches/dpatch.sh
+#!/bin/sh /usr/share/dpatch/dpatch-run
 
 ## elchiaio4d by Andy Grobb (Elchi) and Rolf Ahrenberg 
 ## (see HISTORY-ElchiAIO for all contributors)

Index: opt-24_jumpplay-0.4.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/opt-24_jumpplay-0.4.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- opt-24_jumpplay-0.4.dpatch	7 Aug 2004 23:18:45 -0000	1.1
+++ opt-24_jumpplay-0.4.dpatch	17 Oct 2004 12:30:20 -0000	1.2
@@ -1,4 +1,4 @@
-#!/bin/sh debian/patches/dpatch.sh
+#!/bin/sh /usr/share/dpatch/dpatch-run
 
 ## jumpplay patch (version 0.4) by Thomas Günther <tom@toms-cafe.de>
 ##

Index: 01_vdr_1.2.6-3.1.diff.gz.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/01_vdr_1.2.6-3.1.diff.gz.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 01_vdr_1.2.6-3.1.diff.gz.dpatch	15 Jul 2004 19:26:52 -0000	1.2
+++ 01_vdr_1.2.6-3.1.diff.gz.dpatch	17 Oct 2004 12:30:19 -0000	1.3
@@ -1,4 +1,4 @@
-#! /bin/sh debian/patches/dpatch.sh
+#! /bin/sh /usr/share/dpatch/dpatch-run
 
 ## 01_vdr_1.2.6-3.1.diff.gz.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
 ##

Index: opt-21_ttxtsubs.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/opt-21_ttxtsubs.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- opt-21_ttxtsubs.dpatch	7 Aug 2004 22:50:09 -0000	1.1
+++ opt-21_ttxtsubs.dpatch	17 Oct 2004 12:30:20 -0000	1.2
@@ -1,4 +1,4 @@
-#!/bin/sh debian/patches/dpatch.sh
+#!/bin/sh /usr/share/dpatch/dpatch-run
 
 ## ttxtsubs patch from ttxtsubs plugin 0.0.5
 ## Ragnar Sundblad <ragge@nada.kth.se>

Index: opt-22_8bitcolor.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/opt-22_8bitcolor.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- opt-22_8bitcolor.dpatch	7 Aug 2004 23:12:10 -0000	1.1
+++ opt-22_8bitcolor.dpatch	17 Oct 2004 12:30:20 -0000	1.2
@@ -1,4 +1,4 @@
-#!/bin/sh debian/patches/dpatch.sh
+#!/bin/sh /usr/share/dpatch/dpatch-run
 
 ## 8bitcolor by Andreas Regel <andreas.regel@gmx.de>
 ##

Index: opt-23_osdpip-0.0.3.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/opt-23_osdpip-0.0.3.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- opt-23_osdpip-0.0.3.dpatch	7 Aug 2004 23:12:10 -0000	1.1
+++ opt-23_osdpip-0.0.3.dpatch	17 Oct 2004 12:30:20 -0000	1.2
@@ -1,4 +1,4 @@
-#!/bin/sh debian/patches/dpatch.sh
+#!/bin/sh /usr/share/dpatch/dpatch-run
 
 ## osdpip-patch by Sascha Volkenandt <sascha@akv-soft.de>
 ##

Index: 01_gcc3.4-FTBFS-fix.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/01_gcc3.4-FTBFS-fix.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 01_gcc3.4-FTBFS-fix.dpatch	2 Aug 2004 10:56:52 -0000	1.1
+++ 01_gcc3.4-FTBFS-fix.dpatch	17 Oct 2004 12:30:19 -0000	1.2
@@ -1,26 +1,9 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
 ## 01_gcc3.4-FTBFS-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fix for a FTBFS-Bug with gcc 3.4 (#262744)
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
 
 @DPATCH@
 diff -urNad /home/chelli/vdr/cvs/vdr/vdr/config.h vdr/config.h

Index: 03_cmdsubmenu.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/03_cmdsubmenu.dpatch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 03_cmdsubmenu.dpatch	15 Jul 2004 19:26:52 -0000	1.5
+++ 03_cmdsubmenu.dpatch	17 Oct 2004 12:30:19 -0000	1.6
@@ -1,4 +1,4 @@
-#!/bin/sh debian/patches/dpatch.sh
+#!/bin/sh /usr/share/dpatch/dpatch-run
 
 ## submenu patch
 ##