Imported Debian patch 0.1.1-7

diff --git a/debian/changelog b/debian/changelog
index 1f7181fa36554886c97bcb86a321fc440343ee15..72b02554117b2dd63040687763223ad7bed2df4f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+roundcube (0.1.1-7) unstable; urgency=low
+
+  * Another fix for incorrect tinymce path. This should be the last one!
+
+ -- Vincent Bernat <bernat@debian.org>  Sun, 22 Jun 2008 12:36:59 +0200
+
 roundcube (0.1.1-6) unstable; urgency=low
 
   * Fix use_packaged_tinymce patch which was incorrect after switch to

diff --git a/debian/rules b/debian/rules
index 1a625e943558fbf6d339c26646764bb5aa759cfb..a8bf2125fce847016d808980f3a0874a87dfb1a3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ binary-install/roundcube-core::
        rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/msgimport
        # Remove files shipped in tinymce package
        rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/tiny_mce
-       dh_link -proundcube-core usr/share/tinymce/www usr/share/roundcube/program/js/tiny_mce
+       dh_link -proundcube-core usr/share/tinymce2/www usr/share/roundcube/program/js/tiny_mce
 
 clean::
        debconf-updatepo