From: Vincent Bernat <bernat@debian.org>
Date: Tue, 20 May 2008 18:52:20 +0000 (+0000)
Subject: Depends on tinymce2 package
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9e3a08b44dfa614132ec627e5856c351c58b3a0a;p=roundcube.git

Depends on tinymce2 package
---

diff --git a/debian/changelog b/debian/changelog
index ba400f4..8d2b4ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,10 @@ roundcube (0.1.1-4) UNRELEASED; urgency=low
      + RoundCube is GPL-2 licensed, not GPL-2+
      + Add an explanation on the BSD license present at the top of
        index.php (Closes: #477119)
-  * We do not support tinymce 3, yet. Depends on tinymce (<< 3). Closes: #481145
+  * We do not support tinymce 3, yet. Depends on tinymce2 | tinymce (<<
+    3). Closes: #481145
 
- -- Vincent Bernat <bernat@debian.org>  Fri, 16 May 2008 21:49:38 +0200
+ -- Vincent Bernat <bernat@debian.org>  Tue, 20 May 2008 20:51:52 +0200
 
 roundcube (0.1.1-3) unstable; urgency=low
 
diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf
index 79e3d41..0ab1eb3 100644
--- a/debian/conf/apache.conf
+++ b/debian/conf/apache.conf
@@ -1,10 +1,10 @@
 # Those aliases do not work properly with several hosts on your apache server
 # Uncomment them to use it or adapt them to your configuration
-#    Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+#    Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce2/www/
 #    Alias /roundcube /var/lib/roundcube
 
-# Access to tinymce files
-<Directory "/usr/share/tinymce/www/">
+# Access to tinymce2 files
+<Directory "/usr/share/tinymce2/www/">
       Options Indexes MultiViews FollowSymLinks
       AllowOverride None
       Order allow,deny
diff --git a/debian/conf/lighttpd.conf b/debian/conf/lighttpd.conf
index d64b232..11e8d50 100644
--- a/debian/conf/lighttpd.conf
+++ b/debian/conf/lighttpd.conf
@@ -5,7 +5,7 @@
 alias.url += (
      "/roundcube" => "/var/lib/roundcube",
      # The following line allow to use tinymce. Look at README.Debian
-     "/roundcube/program/js/tiny_mce" => "/usr/share/tinymce/www"
+     "/roundcube/program/js/tiny_mce" => "/usr/share/tinymce2/www"
 )
 
 $HTTP["url"] =~ "^/roundcube" {
diff --git a/debian/control b/debian/control
index e45d62d..954b66e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube
 
 Package: roundcube-core
 Architecture: all
-Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (<< 3), ${misc:Depends}, libmagic1
+Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce2 | tinymce (<< 3), ${misc:Depends}, libmagic1
 Replaces: roundcube
 Conflicts: roundcube (<< 0.1~rc2-2)
 Description: skinnable AJAX based webmail solution for IMAP servers
diff --git a/debian/roundcube-core.README.Debian b/debian/roundcube-core.README.Debian
index 20edc78..f7735fd 100644
--- a/debian/roundcube-core.README.Debian
+++ b/debian/roundcube-core.README.Debian
@@ -5,7 +5,12 @@ To use tinymce editor:
  - set $rcmail_config['enable_htmleditor'] to TRUE in
    /etc/roundcube/main.inc.php
 
+RoundCube needs tinymce 2. On recent Debian systems, this package is
+provided by tinymce2 package. If you use tinymce package from etch,
+you will need to check Apache or lighttpd configuration to adapt
+paths.
+
 The spellchecker is disabled since it is not present in tinymce Debian
 package.
 
- -- Vincent Bernat <bernat@luffy.cx>, Fri,  7 Mar 2008 09:54:52 +0100
+ -- Vincent Bernat <bernat@debian.org>, Tue, 20 May 2008 20:51:28 +0200