Imported Debian patch 0.1.1-6

diff --git a/debian/changelog b/debian/changelog
index cd80e9d18fe435984f46c07e508fe80efbd17c5b..1f7181fa36554886c97bcb86a321fc440343ee15 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+roundcube (0.1.1-6) unstable; urgency=low
+
+  * Fix use_packaged_tinymce patch which was incorrect after switch to
+    tinymce2 package.
+
+ -- Vincent Bernat <bernat@debian.org>  Sun, 22 Jun 2008 12:19:16 +0200
+
 roundcube (0.1.1-5) unstable; urgency=low
 
   * Fix ordering of message-id in message headers, thanks to Reinhard

diff --git a/debian/patches/use_packaged_tinymce.patch b/debian/patches/use_packaged_tinymce.patch
index 2d4857222f0d44180ed8309d5530e3fe61e47b89..9732de9e97a34c5eefd7b0d6e3a1d2a9288b831c 100644 (file)
--- a/debian/patches/use_packaged_tinymce.patch
+++ b/debian/patches/use_packaged_tinymce.patch
@@ -7,7 +7,7 @@ Index: roundcube-0.1~rc2/program/steps/mail/sendmail.inc
        {
        // add the image to the MIME message
 -      $img_file = $INSTALL_PATH . '/' . $searchstr . $image_name;
-+      $img_file = '/usr/share/tinymce/www/plugins/emotions/images/' . $image_name;
++      $img_file = '/usr/share/tinymce2/www/plugins/emotions/images/' . $image_name;
        if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name))
          $OUTPUT->show_message("emoticonerror", 'error');