From 7793811565a5848faa5b10dc906621aea38d0506 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <bernat@debian.org>
Date: Mon, 18 Jan 2010 22:18:46 +0000
Subject: [PATCH] Fix patchs

---
 debian/patches/changeset_r3170.patch | 30 ++++++++++++++--------------
 debian/patches/changeset_r3202.patch |  6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/debian/patches/changeset_r3170.patch b/debian/patches/changeset_r3170.patch
index 7562a41..f820edc 100644
--- 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.
 
-Index: /trunk/roundcubemail/program/include/rcube_template.php
+Index: roundcubemail/program/include/rcube_template.php
 ===================================================================
---- /trunk/roundcubemail/program/include/rcube_template.php (revision 2980)
-+++ /trunk/roundcubemail/program/include/rcube_template.php (revision 3170)
+--- roundcubemail/program/include/rcube_template.php (revision 2980)
++++ roundcubemail/program/include/rcube_template.php (revision 3170)
 @@ -415,10 +415,10 @@
          $out = '';
          if (!$this->framed && !empty($this->js_env)) {
@@ -17,10 +17,10 @@ Index: /trunk/roundcubemail/program/include/rcube_template.php
 +                $args[$i] = json_encode($arg);
              }
              $parent = $this->framed || preg_match('/^parent\./', $method);
-Index: /trunk/roundcubemail/program/include/rcube_shared.inc
+Index: roundcubemail/program/include/rcube_shared.inc
 ===================================================================
---- /trunk/roundcubemail/program/include/rcube_shared.inc (revision 3132)
-+++ /trunk/roundcubemail/program/include/rcube_shared.inc (revision 3170)
+--- roundcubemail/program/include/rcube_shared.inc (revision 3132)
++++ roundcubemail/program/include/rcube_shared.inc (revision 3170)
 @@ -106,95 +106,4 @@
      exit;
      }
@@ -117,10 +117,10 @@ Index: /trunk/roundcubemail/program/include/rcube_shared.inc
 -  return json_serialize($arr);
  }
  
-Index: /trunk/roundcubemail/program/include/rcube_json_output.php
+Index: roundcubemail/program/include/rcube_json_output.php
 ===================================================================
---- /trunk/roundcubemail/program/include/rcube_json_output.php (revision 2905)
-+++ /trunk/roundcubemail/program/include/rcube_json_output.php (revision 3170)
+--- roundcubemail/program/include/rcube_json_output.php (revision 2905)
++++ roundcubemail/program/include/rcube_json_output.php (revision 3170)
 @@ -240,5 +240,5 @@
            $response['callbacks'] = $this->callbacks;
  
@@ -135,10 +135,10 @@ Index: /trunk/roundcubemail/program/include/rcube_json_output.php
 +                $args[$i] = json_encode($arg);
              }
  
-Index: /trunk/roundcubemail/program/steps/mail/func.inc
+Index: roundcubemail/program/steps/mail/func.inc
 ===================================================================
---- /trunk/roundcubemail/program/steps/mail/func.inc (revision 3099)
-+++ /trunk/roundcubemail/program/steps/mail/func.inc (revision 3170)
+--- roundcubemail/program/steps/mail/func.inc (revision 3099)
++++ roundcubemail/program/steps/mail/func.inc (revision 3170)
 @@ -523,5 +523,5 @@
    if (is_array($quota)) {
      $OUTPUT->add_script('$(document).ready(function(){
@@ -146,10 +146,10 @@ Index: /trunk/roundcubemail/program/steps/mail/func.inc
 +	rcmail.set_quota('.json_encode($quota).')});', 'foot');
      $quota = '';
      }
-Index: /trunk/roundcubemail/program/steps/mail/compose.inc
+Index: roundcubemail/program/steps/mail/compose.inc
 ===================================================================
---- /trunk/roundcubemail/program/steps/mail/compose.inc (revision 3166)
-+++ /trunk/roundcubemail/program/steps/mail/compose.inc (revision 3170)
+--- roundcubemail/program/steps/mail/compose.inc (revision 3166)
++++ roundcubemail/program/steps/mail/compose.inc (revision 3170)
 @@ -507,5 +507,5 @@
        JQ(Q(rcube_label('revertto'))),
        JQ(Q(rcube_label('nospellerrors'))),
diff --git a/debian/patches/changeset_r3202.patch b/debian/patches/changeset_r3202.patch
index 2b7b940..645734b 100644
--- a/debian/patches/changeset_r3202.patch
+++ b/debian/patches/changeset_r3202.patch
@@ -1,9 +1,9 @@
 Compatibility with jQuery 1.4.
 
-Index: /trunk/roundcubemail/program/include/rcube_json_output.php
+Index: roundcubemail/program/include/rcube_json_output.php
 ===================================================================
---- /trunk/roundcubemail/program/include/rcube_json_output.php (revision 3175)
-+++ /trunk/roundcubemail/program/include/rcube_json_output.php (revision 3202)
+--- roundcubemail/program/include/rcube_json_output.php (revision 3175)
++++ roundcubemail/program/include/rcube_json_output.php (revision 3202)
 @@ -219,5 +219,4 @@
              send_nocacheing_headers();
              header('Content-Type: text/plain; charset=' . $this->get_charset());
-- 
2.39.2