r2690 - in vdr/vdr-plugin-extrecmenu/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-05-02 21:18:23 +0000 (Tue, 02 May 2006)
New Revision: 2690

Removed:
   vdr/vdr-plugin-extrecmenu/trunk/debian/patches/90_APIVERSION.dpatch
Modified:
   vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
   vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list
   vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch
Log:
' New upstream release
- Removed 90_APIVERSION.dpatch
- Updated 01_dvdarchive-path.dpatch


Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/changelog	2006-05-02 21:17:39 UTC (rev 2689)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/changelog	2006-05-02 21:18:23 UTC (rev 2690)
@@ -1,9 +1,12 @@
-vdr-plugin-extrecmenu (0.9a-2) unstable; urgency=low
+vdr-plugin-extrecmenu (0.10-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-  
+  * (NOT RELEASED YET)
+  * New upstream release
   * Thomas Schmidt <tschmidt at debian.org>
     - Build-Depend on vdr-dev (>=1.4.0-1)
+  * Tobias Grimm <tg at e-tobi.net>
+    - Removed 90_APIVERSION.dpatch
+    - Updated 01_dvdarchive-path.dpatch
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 30 Apr 2006 22:31:43 +0200
 
@@ -20,8 +23,6 @@
 
 vdr-plugin-extrecmenu (0.9-2) unstable; urgency=low
 
-  * NOT RELEASED YET
-
   * Thomas Schmidt <tschmidt at debian.org>
     - Build-Depend on vdr-dev (>=1.3.47-1)
 

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list	2006-05-02 21:17:39 UTC (rev 2689)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list	2006-05-02 21:18:23 UTC (rev 2690)
@@ -1,5 +1,3 @@
 01_dvdarchive-path
 02_fix-jumpplay
 03_fix-cmdsubmenu
-
-90_APIVERSION

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch	2006-05-02 21:17:39 UTC (rev 2689)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch	2006-05-02 21:18:23 UTC (rev 2690)
@@ -9,11 +9,24 @@
 ## DP: Set path to dvdarchive.sh script.
 
 @DPATCH@
---- extrecmenu-0.9/mymenurecordings.c
-+++ extrecmenu-0.9/mymenurecordings.c
-@@ -220,1 +220,1 @@
--  asprintf(&cmd,"dvdarchive.sh umount \"%s\"",myReplayControl::LastReplayed());
-+  asprintf(&cmd,"/usr/share/vdr-plugin-extrecmenu/dvdarchive.sh umount \"%s\"",myReplayControl::LastReplayed());
-@@ -397,1 +397,1 @@
--      asprintf(&msg,"dvdarchive.sh mount \"%s\" \"%s\"",path,name); // call the dvdarchive.sh script
-+      asprintf(&msg,"/usr/share/vdr-plugin-extrecmenu/dvdarchive.sh mount \"%s\" \"%s\"",path,name); // call the dvdarchive.sh script
+diff -urNad vdr-plugin-extrecmenu-0.10~/mymenurecordings.c vdr-plugin-extrecmenu-0.10/mymenurecordings.c
+--- vdr-plugin-extrecmenu-0.10~/mymenurecordings.c	2006-05-02 18:55:04.000000000 +0200
++++ vdr-plugin-extrecmenu-0.10/mymenurecordings.c	2006-05-02 23:07:42.000000000 +0200
+@@ -299,7 +299,7 @@
+  if(mysetup.wasdvd&&!cControl::Control())
+  {
+   char *cmd=NULL;
+-  asprintf(&cmd,"dvdarchive.sh umount \"%s\"",*strescape(myReplayControl::LastReplayed(),"'\\\"$"));
++  asprintf(&cmd,"/usr/share/vdr-plugin-extrecmenu/dvdarchive.sh umount \"%s\"",*strescape(myReplayControl::LastReplayed(),"'\\\"$"));
+   isyslog("[extrecmenu] calling %s to unmount dvd",cmd);
+   int result=SystemExec(cmd);
+   if(result)
+@@ -494,7 +494,7 @@
+        free(msg);
+        strcpy(path,recording->FileName());
+        name=strrchr(path,'/')+1;
+-       asprintf(&msg,"dvdarchive.sh mount \"%s\" '%s'",*strescape(path,"'"),*strescape(name,"'\\\"$"));
++       asprintf(&msg,"/usr/share/vdr-plugin-extrecmenu/dvdarchive.sh mount \"%s\" '%s'",*strescape(path,"'"),*strescape(name,"'\\\"$"));
+  
+        isyslog("[extrecmenu] calling %s to mount dvd",msg);
+        int result=SystemExec(msg);

Deleted: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/90_APIVERSION.dpatch
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/90_APIVERSION.dpatch	2006-05-02 21:17:39 UTC (rev 2689)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/90_APIVERSION.dpatch	2006-05-02 21:18:23 UTC (rev 2690)
@@ -1,20 +0,0 @@
-#! /bin/sh -e
-## 90_APIVERSION.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support for the APIVERSION define as introduced in VDR-1.3.47.
-
-case "$1" in
-    -patch)
-        sed -i -e s/VDRVERSION/APIVERSION/g Makefile
-        ;;
-    -unpatch)
-        sed -i -e s/APIVERSION/VDRVERSION/g Makefile
-        ;;
-     *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-        ;;
-esac
-
-exit 0