Fix patchs

diff --git a/debian/patches/changeset_r3170.patch b/debian/patches/changeset_r3170.patch
index 7562a41e035470513edfc0a8b656465973c3d133..f820edcd32ad4695b80e3e77151a95a7316d8c1c 100644 (file)
--- a/debian/patches/changeset_r3170.patch
+++ b/debian/patches/changeset_r3170.patch
@@ -1,9 +1,9 @@
 Use json_encode to ensure compatibility with JQuery 1.4.\r
 \r
-Index: /trunk/roundcubemail/program/include/rcube_template.php\r
+Index: roundcubemail/program/include/rcube_template.php\r
 ===================================================================\r
---- /trunk/roundcubemail/program/include/rcube_template.php (revision 2980)\r
-+++ /trunk/roundcubemail/program/include/rcube_template.php (revision 3170)\r
+--- roundcubemail/program/include/rcube_template.php (revision 2980)\r
++++ roundcubemail/program/include/rcube_template.php (revision 3170)\r
 @@ -415,10 +415,10 @@\r
          $out = '';\r
          if (!$this->framed && !empty($this->js_env)) {\r
@@ -17,10 +17,10 @@ Index: /trunk/roundcubemail/program/include/rcube_template.php
 +                $args[$i] = json_encode($arg);\r
              }\r
              $parent = $this->framed || preg_match('/^parent\./', $method);\r
-Index: /trunk/roundcubemail/program/include/rcube_shared.inc\r
+Index: roundcubemail/program/include/rcube_shared.inc\r
 ===================================================================\r
---- /trunk/roundcubemail/program/include/rcube_shared.inc (revision 3132)\r
-+++ /trunk/roundcubemail/program/include/rcube_shared.inc (revision 3170)\r
+--- roundcubemail/program/include/rcube_shared.inc (revision 3132)\r
++++ roundcubemail/program/include/rcube_shared.inc (revision 3170)\r
 @@ -106,95 +106,4 @@\r
      exit;\r
      }\r
@@ -117,10 +117,10 @@ Index: /trunk/roundcubemail/program/include/rcube_shared.inc
 -  return json_serialize($arr);\r
  }\r
  \r
-Index: /trunk/roundcubemail/program/include/rcube_json_output.php\r
+Index: roundcubemail/program/include/rcube_json_output.php\r
 ===================================================================\r
---- /trunk/roundcubemail/program/include/rcube_json_output.php (revision 2905)\r
-+++ /trunk/roundcubemail/program/include/rcube_json_output.php (revision 3170)\r
+--- roundcubemail/program/include/rcube_json_output.php (revision 2905)\r
++++ roundcubemail/program/include/rcube_json_output.php (revision 3170)\r
 @@ -240,5 +240,5 @@\r
            $response['callbacks'] = $this->callbacks;\r
  \r
@@ -135,10 +135,10 @@ Index: /trunk/roundcubemail/program/include/rcube_json_output.php
 +                $args[$i] = json_encode($arg);\r
              }\r
  \r
-Index: /trunk/roundcubemail/program/steps/mail/func.inc\r
+Index: roundcubemail/program/steps/mail/func.inc\r
 ===================================================================\r
---- /trunk/roundcubemail/program/steps/mail/func.inc (revision 3099)\r
-+++ /trunk/roundcubemail/program/steps/mail/func.inc (revision 3170)\r
+--- roundcubemail/program/steps/mail/func.inc (revision 3099)\r
++++ roundcubemail/program/steps/mail/func.inc (revision 3170)\r
 @@ -523,5 +523,5 @@\r
    if (is_array($quota)) {\r
      $OUTPUT->add_script('$(document).ready(function(){\r
@@ -146,10 +146,10 @@ Index: /trunk/roundcubemail/program/steps/mail/func.inc
 +      rcmail.set_quota('.json_encode($quota).')});', 'foot');\r
      $quota = '';\r
      }\r
-Index: /trunk/roundcubemail/program/steps/mail/compose.inc\r
+Index: roundcubemail/program/steps/mail/compose.inc\r
 ===================================================================\r
---- /trunk/roundcubemail/program/steps/mail/compose.inc (revision 3166)\r
-+++ /trunk/roundcubemail/program/steps/mail/compose.inc (revision 3170)\r
+--- roundcubemail/program/steps/mail/compose.inc (revision 3166)\r
++++ roundcubemail/program/steps/mail/compose.inc (revision 3170)\r
 @@ -507,5 +507,5 @@\r
        JQ(Q(rcube_label('revertto'))),\r
        JQ(Q(rcube_label('nospellerrors'))),\r

diff --git a/debian/patches/changeset_r3202.patch b/debian/patches/changeset_r3202.patch
index 2b7b94063f46d8e9ff9570b1c5c48823412d7f02..645734beb28dc823301c6438653ab8c2032ff520 100644 (file)
--- a/debian/patches/changeset_r3202.patch
+++ b/debian/patches/changeset_r3202.patch
@@ -1,9 +1,9 @@
 Compatibility with jQuery 1.4.\r
 \r
-Index: /trunk/roundcubemail/program/include/rcube_json_output.php\r
+Index: roundcubemail/program/include/rcube_json_output.php\r
 ===================================================================\r
---- /trunk/roundcubemail/program/include/rcube_json_output.php (revision 3175)\r
-+++ /trunk/roundcubemail/program/include/rcube_json_output.php (revision 3202)\r
+--- roundcubemail/program/include/rcube_json_output.php (revision 3175)\r
++++ roundcubemail/program/include/rcube_json_output.php (revision 3202)\r
 @@ -219,5 +219,4 @@\r
              send_nocacheing_headers();\r
              header('Content-Type: text/plain; charset=' . $this->get_charset());\r