+roundcube (0.2~alpha-1) experimental; urgency=low
+
+ * New upstream release
+ * Update debian/watch file to correctly consider those new releases
+ * Remove the following patches:
+ + messageid-headers-ordering
+ + mysql-update-fix
+ + disable-tinymce-spellchecker
+ * Update the following patches:
+ + correct_install_path
+ + use_packaged_tinymce
+ * Add a new patch to fix a login problem
+ * Depends on tinymce >= 3
+
+ -- Vincent Bernat <bernat@debian.org> Sun, 22 Jun 2008 12:05:44 +0200
+
roundcube (0.1.1-7) unstable; urgency=low
* Another fix for incorrect tinymce path. This should be the last one!
# 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/tinymce2/www/
+# Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
# Alias /roundcube /var/lib/roundcube
-# Access to tinymce2 files
-<Directory "/usr/share/tinymce2/www/">
+# Access to tinymce files
+<Directory "/usr/share/tinymce/www/">
Options Indexes MultiViews FollowSymLinks
AllowOverride None
Order allow,deny
alias.url += (
"/roundcube" => "/var/lib/roundcube",
# The following line allow to use tinymce. Look at README.Debian
- "/roundcube/program/js/tiny_mce" => "/usr/share/tinymce2/www"
+ "/roundcube/program/js/tiny_mce" => "/usr/share/tinymce/www"
)
$HTTP["url"] =~ "^/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, tinymce2 | 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, tinymce (>= 3), ${misc:Depends}, libmagic1
Replaces: roundcube
Conflicts: roundcube (<< 0.1~rc2-2)
Description: skinnable AJAX based webmail solution for IMAP servers
---- roundcubemail-0.1~rc1~dfsg.orig/index.php~ 2007-05-18 15:11:22.000000000 +0200
-+++ roundcubemail-0.1~rc1~dfsg.orig/index.php 2007-05-20 14:12:35.000000000 +0200
-@@ -47,7 +47,7 @@
+--- a/program/include/iniset.php~ 2008-06-09 22:57:53.000000000 +0200
++++ a/program/include/iniset.php 2008-06-22 12:10:55.000000000 +0200
+@@ -27,7 +27,7 @@
+ define('JS_OBJECT_NAME', 'rcmail');
- // define global vars
- $OUTPUT_TYPE = 'html';
--$INSTALL_PATH = dirname(__FILE__);
-+$INSTALL_PATH = '/var/lib/roundcube';
- $MAIN_TASKS = array('mail','settings','addressbook','logout');
+ if (!defined('INSTALL_PATH')) {
+- define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
++ define('INSTALL_PATH', '/var/lib/roundcube/');
+ }
- if (empty($INSTALL_PATH))
+ // make sure path_separator is defined
+++ /dev/null
---- roundcube-0.1/program/js/editor.js~ 2008-02-13 04:31:05.000000000 +0100
-+++ roundcube-0.1/program/js/editor.js 2008-03-07 09:53:39.000000000 +0100
-@@ -21,7 +21,7 @@
- accessibility_focus : false,
- apply_source_formatting : true,
- theme : 'advanced',
-- plugins : 'emotions,media,nonbreaking,table,searchreplace,spellchecker,visualchars',
-+ plugins : 'emotions,media,nonbreaking,table,searchreplace,visualchars',
- theme_advanced_buttons1 : 'bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,emotions,charmap,code,forecolor,backcolor,fontselect,fontsizeselect, separator,undo,redo,image,media',
- theme_advanced_buttons2 : '',
- theme_advanced_buttons3 : '',
+++ /dev/null
-This patch is not used any more with php-mail-mime (>= 1.5.0).
-It is left here to help with backports. Add it back to series if needed.
-
---- roundcube/program/steps/mail/sendmail.inc 2008-03-07 09:52:40.000000000 +0100
-+++ roundcube/program/steps/mail/sendmail.inc.new 2008-03-07 11:04:33.000000000 +0100
-@@ -351,7 +351,11 @@
-
- // append message to sent box
- if ($store_folder)
-- $saved = $IMAP->save_message($CONFIG[$store_target], $MAIL_MIME->getMessage());
-+ {
-+ $header_str = $MAIL_MIME->txtHeaders($headers);
-+ $msg_body = $header_str."\r\n".$MAIL_MIME->get($message_param);
-+ $saved = $IMAP->save_message($CONFIG[$store_target], $msg_body);
-+ }
-
- // raise error if saving failed
- if (!$saved)
--- /dev/null
+--- a/program/include/rcmail.php~ 2008-06-07 21:33:07.000000000 +0200
++++ a/program/include/rcmail.php 2008-06-22 13:36:57.000000000 +0200
+@@ -474,7 +474,7 @@
+ public function autoselect_host()
+ {
+ $default_host = $this->config->get('default_host');
+- $host = !empty($default_host) ? get_input_value('_host', RCUBE_INPUT_POST) : $default_host;
++ $host = isset($_POST['_host']) ? get_input_value('_host', RCUBE_INPUT_POST) : $default_host;
+
+ if (is_array($host)) {
+ list($user, $domain) = explode('@', get_input_value('_user', RCUBE_INPUT_POST));
+++ /dev/null
---- roundcubemail/program/steps/mail/sendmail.inc (revision 1232)\r
-+++ roundcubemail/program/steps/mail/sendmail.inc (revision 1261)\r
-@@ -211,7 +211,4 @@\r
- \r
- // additional headers\r
--$headers['Message-ID'] = $message_id;\r
--$headers['X-Sender'] = $from;\r
--\r
- if ($CONFIG['http_received_header'])\r
- {\r
-@@ -224,4 +221,7 @@\r
- }\r
- \r
-+$headers['Message-ID'] = $message_id;\r
-+$headers['X-Sender'] = $from;\r
-+\r
- if (!empty($CONFIG['useragent']))\r
- $headers['User-Agent'] = $CONFIG['useragent'];\r
+++ /dev/null
---- roundcubemail-0.1.1-dep/SQL/mysql.update.sql~ 2008-04-05 14:49:21.000000000 +0200
-+++ roundcubemail-0.1.1-dep/SQL/mysql.update.sql 2008-04-05 18:09:10.000000000 +0200
-@@ -5,7 +5,7 @@
-
- ALTER TABLE `messages`
- DROP INDEX `idx`,
-- DROP INDEX `uid`
-+ DROP INDEX `uid`;
-
- ALTER TABLE `cache`
- DROP INDEX `cache_key`,
use_packaged_tinymce.patch
use-db-backend.patch
correct-magic-path.patch
-disable-tinymce-spellchecker.patch
-mysql-update-fix.patch
-messageid-headers-ordering.patch
+fix_login.patch
Index: roundcube-0.1~rc2/program/steps/mail/sendmail.inc
===================================================================
+--- a/program/steps/mail/sendmail.inc~ 2008-04-30 10:21:42.000000000 +0200
++++ a/program/steps/mail/sendmail.inc 2008-06-22 13:51:33.000000000 +0200
+@@ -74,7 +74,7 @@
+
+ $last_img_pos = 0;
+
+- $searchstr = 'program/js/tiny_mce/plugins/emotions/images/';
++ $searchstr = 'program/js/tiny_mce/plugins/emotions/img/';
+
+ // keep track of added images, so they're only added once
+ $included_images = array();
--- roundcube-0.1~rc2.orig/program/steps/mail/sendmail.inc 2007-11-26 11:42:36.000000000 +0100
+++ roundcube-0.1~rc2/program/steps/mail/sendmail.inc 2007-11-26 11:44:04.000000000 +0100
@@ -108,7 +108,7 @@
if (! in_array($image_name, $included_images))
{
// add the image to the MIME message
-- $img_file = $INSTALL_PATH . '/' . $searchstr . $image_name;
-+ $img_file = '/usr/share/tinymce2/www/plugins/emotions/images/' . $image_name;
- if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name))
+- $img_file = INSTALL_PATH . '/' . $searchstr . $image_name;
++ $img_file = '/usr/share/tinymce/www/plugins/emotions/img/' . $image_name;
+- if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name))
++ if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name))
$OUTPUT->show_message("emoticonerror", 'error');
+--- a/program/steps/mail/sendmail.inc~ 2008-04-30 10:21:42.000000000 +0200
++++ a/program/steps/mail/sendmail.inc 2008-06-22 14:10:24.000000000 +0200
+@@ -102,7 +102,7 @@
+ array_push($included_images, $image_name);
+ }
+
+- $body = $body_pre . 'cid:_' . $image_name . $body_post;
++ $body = $body_pre . $img_file . $body_post;
+
+ $last_img_pos = $pos2;
+ }
- 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@debian.org>, Tue, 20 May 2008 20:51:28 +0200
+ -- Vincent Bernat <bernat@debian.org>, Sun, 22 Jun 2008 12:13:32 +0200
# Some files are executable while not being scripts or binary...
find $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/localization -type f -print0 | xargs -0 chmod -x
# Remove useless file
- rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/lib/magic
- rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/msgimport
+ rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/*.sh
+ find $(CURDIR)/debian/roundcube-core -name '._*' -print0 | xargs -r0 rm
# 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/tinymce2/www usr/share/roundcube/program/js/tiny_mce
+ dh_link -proundcube-core usr/share/tinymce/www usr/share/roundcube/program/js/tiny_mce
clean::
debconf-updatepo
version=3
-opts="uversionmangle=s/-rc/~rc/" http://sf.net/roundcubemail/roundcubemail-([\d\.]+.*)-dep\.tar\.gz
+opts="uversionmangle=s/-(rc|alpha|beta)/~$1/" http://sf.net/roundcubemail/roundcubemail-([\d\.]+.*)-dep\.tar\.gz
projects / roundcube.git / commitdiff