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

[Tobias Grimm]

Author: tiber-guest
Date: 2007-01-09 09:57:14 +0100 (Tue, 09 Jan 2007)
New Revision: 3848

Modified:
   vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
   vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch
Log:
* Updated 01_dvdarchive-path.dpatch

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/changelog	2007-01-07 23:57:16 UTC (rev 3847)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/changelog	2007-01-09 08:57:14 UTC (rev 3848)
@@ -8,6 +8,7 @@
   [ Tobias Grimm ]
   * New upstream release
   * Build-Depend on vdr-dev (>=1.4.5-1)
+  * Updated 01_dvdarchive-path.dpatch
 
  -- Tobias Grimm <tg at e-tobi.net>  Sun,  7 Jan 2007 22:46:57 +0100
 

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch	2007-01-07 23:57:16 UTC (rev 3847)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch	2007-01-09 08:57:14 UTC (rev 3848)
@@ -9,11 +9,11 @@
 ## DP: Set path to dvdarchive.sh script.
 
 @DPATCH@
-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())
+diff -urNad vdr-plugin-extrecmenu-0.12c~/mymenurecordings.c vdr-plugin-extrecmenu-0.12c/mymenurecordings.c
+--- vdr-plugin-extrecmenu-0.12c~/mymenurecordings.c	2007-01-01 19:13:42.000000000 +0100
++++ vdr-plugin-extrecmenu-0.12c/mymenurecordings.c	2007-01-09 09:55:00.000000000 +0100
+@@ -313,7 +313,7 @@
+  if(wasdvd&&!cControl::Control())
   {
    char *cmd=NULL;
 -  asprintf(&cmd,"dvdarchive.sh umount \"%s\"",*strescape(myReplayControl::LastReplayed(),"'\\\"$"));
@@ -21,12 +21,14 @@
    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);
+@@ -574,8 +574,8 @@
+         {
+           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);
+           isyslog("[extrecmenu] dvdarchive.sh returns %d",result);