vdr/vdr/debian/patches dpatch.sh 01_vdr_1.2.6-3.1.diff.gz.dpatch 02_Makefile-CFGDIR.dpatch 03_cmdsubmenu.dpatch

[Tobias Grimm]

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

Modified Files:
	01_vdr_1.2.6-3.1.diff.gz.dpatch 02_Makefile-CFGDIR.dpatch 
	03_cmdsubmenu.dpatch 
Added Files:
	dpatch.sh 
Log Message:
extracted common patch code

Index: 03_cmdsubmenu.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/03_cmdsubmenu.dpatch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 03_cmdsubmenu.dpatch	28 May 2004 07:22:17 -0000	1.4
+++ 03_cmdsubmenu.dpatch	15 Jul 2004 19:26:52 -0000	1.5
@@ -1,27 +1,10 @@
-#!/bin/sh -e
+#!/bin/sh debian/patches/dpatch.sh
+
 ## submenu patch
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Adds submenus within the commands and recording commands menu.
 ## DP: To create a submenu entry, prefix the name by one ore more "-".
-
-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 vdr-1.2.6.orig/Makefile vdr-1.2.6/Makefile

Index: 02_Makefile-CFGDIR.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/02_Makefile-CFGDIR.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 02_Makefile-CFGDIR.dpatch	1 May 2004 13:11:14 -0000	1.1
+++ 02_Makefile-CFGDIR.dpatch	15 Jul 2004 19:26:52 -0000	1.2
@@ -1,26 +1,9 @@
-#! /bin/sh -e
+#! /bin/sh debian/patches/dpatch.sh
+
 ## 01_Makefile-CFGDIR.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
-
-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/test/vdr/Makefile vdr/Makefile

--- NEW FILE: dpatch.sh ---
set -e

patch=$1
[ $# -eq 2 ] && action=$2

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"

case "$action" in
    '-patch')
	patch $patch_opts -p1 < $patch
	;;
    '-unpatch')
	patch $patch_opts -p1 -R < $patch
	;;
    *)
	echo >&2 "`basename $patch`: script expects -patch|-unpatch as argument"
	exit 1
	;;
esac

exit 0

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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 01_vdr_1.2.6-3.1.diff.gz.dpatch	24 Apr 2004 10:47:35 -0000	1.1
+++ 01_vdr_1.2.6-3.1.diff.gz.dpatch	15 Jul 2004 19:26:52 -0000	1.2
@@ -1,29 +1,11 @@
-#! /bin/sh -e
+#! /bin/sh debian/patches/dpatch.sh
+
 ## 01_vdr_1.2.6-3.1.diff.gz.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: New patch generated from vdr 1.2.6-3.1 diff.gz
 
-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@
-
 --- vdr-1.2.6.orig/PLUGINS/src/osddemo/Makefile
 +++ vdr-1.2.6/PLUGINS/src/osddemo/Makefile
 @@ -16,7 +16,7 @@