r79 - in vdr/vdr-plugin-console/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2005-02-23 13:03:49 +0100 (Wed, 23 Feb 2005)
New Revision: 79

Modified:
   vdr/vdr-plugin-console/trunk/debian/changelog
   vdr/vdr-plugin-console/trunk/debian/control
   vdr/vdr-plugin-console/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
   vdr/vdr-plugin-console/trunk/debian/patches/02_menu.h-fix.dpatch
Log:
integrated changes for vdr-plugin-console 0.5.1-15 from the cvs-repository

Modified: vdr/vdr-plugin-console/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/changelog	2005-02-23 11:58:35 UTC (rev 78)
+++ vdr/vdr-plugin-console/trunk/debian/changelog	2005-02-23 12:03:49 UTC (rev 79)
@@ -1,3 +1,11 @@
+vdr-plugin-console (0.5.1-15) unstable; urgency=low
+
+  * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+    - Build-depend on dpatch (>= 2.0.9)
+    - Converted existing dpatch-files to the new short format
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Tue, 26 Oct 2004 12:18:03 +0200
+
 vdr-plugin-console (0.5.1-14) unstable; urgency=low
 
   * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>

Modified: vdr/vdr-plugin-console/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/control	2005-02-23 11:58:35 UTC (rev 78)
+++ vdr/vdr-plugin-console/trunk/debian/control	2005-02-23 12:03:49 UTC (rev 79)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.1.16), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.1.16), dpatch (>= 2.0.9)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-console

Modified: vdr/vdr-plugin-console/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-02-23 11:58:35 UTC (rev 78)
+++ vdr/vdr-plugin-console/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-02-23 12:03:49 UTC (rev 79)
@@ -1,27 +1,10 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
 ## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Adds -fPIC to Makefile 
 
-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 /usr/src/self-compiled/vdr/plugins/console/vdr-plugin-console-0.5.1/Makefile vdr-plugin-console-0.5.1/Makefile
 --- /usr/src/self-compiled/vdr/plugins/console/vdr-plugin-console-0.5.1/Makefile	2003-09-10 10:19:14.000000000 +0200

Modified: vdr/vdr-plugin-console/trunk/debian/patches/02_menu.h-fix.dpatch
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/patches/02_menu.h-fix.dpatch	2005-02-23 11:58:35 UTC (rev 78)
+++ vdr/vdr-plugin-console/trunk/debian/patches/02_menu.h-fix.dpatch	2005-02-23 12:03:49 UTC (rev 79)
@@ -1,27 +1,10 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
 ## 02_menu.h-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 menu.h, so that the plugin works with vdr (>=1.2.5pre3)
 
-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 /usr/src/self-compiled/vdr/plugins/console/vdr-plugin-console-0.5.1/menu.h vdr-plugin-console-0.5.1/menu.h
 --- /usr/src/self-compiled/vdr/plugins/console/vdr-plugin-console-0.5.1/menu.h	2002-12-31 13:09:24.000000000 +0100