From 064f6f9b4ecbb66f83cea4707969332f5542e8f4 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 22 Jun 2008 11:23:38 +0000 Subject: [PATCH] New upstream for roundcube. Not working: login with no default host or with drop-down choice, including emoticon in mails. --- debian/changelog | 15 +++++++++++++++ debian/conf/apache.conf | 6 +++--- debian/conf/lighttpd.conf | 2 +- debian/control | 2 +- debian/patches/correct_install_path.patch | 18 +++++++++--------- .../patches/disable-tinymce-spellchecker.patch | 11 ----------- debian/patches/fix-too-old-php-mail-mime.patch | 18 ------------------ .../patches/messageid-headers-ordering.patch | 18 ------------------ debian/patches/mysql-update-fix.patch | 11 ----------- debian/patches/series | 3 --- debian/patches/use_packaged_tinymce.patch | 4 ++-- debian/roundcube-core.README.Debian | 10 +--------- debian/rules | 6 +++--- debian/watch | 2 +- 14 files changed, 36 insertions(+), 90 deletions(-) delete mode 100644 debian/patches/disable-tinymce-spellchecker.patch delete mode 100644 debian/patches/fix-too-old-php-mail-mime.patch delete mode 100644 debian/patches/messageid-headers-ordering.patch delete mode 100644 debian/patches/mysql-update-fix.patch diff --git a/debian/changelog b/debian/changelog index 72b0255..802fbcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +roundcube (0.2~alpha-1) UNRELEASED; 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 + * Depends on tinymce >= 3 + + -- Vincent Bernat 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! diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf index 0ab1eb3..79e3d41 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/tinymce2/www/ +# Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ # Alias /roundcube /var/lib/roundcube -# Access to tinymce2 files - +# Access to tinymce files + Options Indexes MultiViews FollowSymLinks AllowOverride None Order allow,deny diff --git a/debian/conf/lighttpd.conf b/debian/conf/lighttpd.conf index 11e8d50..d64b232 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/tinymce2/www" + "/roundcube/program/js/tiny_mce" => "/usr/share/tinymce/www" ) $HTTP["url"] =~ "^/roundcube" { diff --git a/debian/control b/debian/control index 845f7c3..55b21d5 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, 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 diff --git a/debian/patches/correct_install_path.patch b/debian/patches/correct_install_path.patch index 35d8eaf..1acfc5a 100644 --- a/debian/patches/correct_install_path.patch +++ b/debian/patches/correct_install_path.patch @@ -1,11 +1,11 @@ ---- 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 diff --git a/debian/patches/disable-tinymce-spellchecker.patch b/debian/patches/disable-tinymce-spellchecker.patch deleted file mode 100644 index ac5a158..0000000 --- a/debian/patches/disable-tinymce-spellchecker.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 : '', diff --git a/debian/patches/fix-too-old-php-mail-mime.patch b/debian/patches/fix-too-old-php-mail-mime.patch deleted file mode 100644 index 61ed729..0000000 --- a/debian/patches/fix-too-old-php-mail-mime.patch +++ /dev/null @@ -1,18 +0,0 @@ -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) diff --git a/debian/patches/messageid-headers-ordering.patch b/debian/patches/messageid-headers-ordering.patch deleted file mode 100644 index 109d2af..0000000 --- a/debian/patches/messageid-headers-ordering.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- roundcubemail/program/steps/mail/sendmail.inc (revision 1232) -+++ roundcubemail/program/steps/mail/sendmail.inc (revision 1261) -@@ -211,7 +211,4 @@ - - // additional headers --$headers['Message-ID'] = $message_id; --$headers['X-Sender'] = $from; -- - if ($CONFIG['http_received_header']) - { -@@ -224,4 +221,7 @@ - } - -+$headers['Message-ID'] = $message_id; -+$headers['X-Sender'] = $from; -+ - if (!empty($CONFIG['useragent'])) - $headers['User-Agent'] = $CONFIG['useragent']; diff --git a/debian/patches/mysql-update-fix.patch b/debian/patches/mysql-update-fix.patch deleted file mode 100644 index 1610b59..0000000 --- a/debian/patches/mysql-update-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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`, diff --git a/debian/patches/series b/debian/patches/series index 44004ec..b5789c7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,3 @@ correct_install_path.patch use_packaged_tinymce.patch use-db-backend.patch correct-magic-path.patch -disable-tinymce-spellchecker.patch -mysql-update-fix.patch -messageid-headers-ordering.patch diff --git a/debian/patches/use_packaged_tinymce.patch b/debian/patches/use_packaged_tinymce.patch index 9732de9..6e7c62a 100644 --- a/debian/patches/use_packaged_tinymce.patch +++ b/debian/patches/use_packaged_tinymce.patch @@ -6,8 +6,8 @@ Index: roundcube-0.1~rc2/program/steps/mail/sendmail.inc 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; +- $img_file = INSTALL_PATH . '/' . $searchstr . $image_name; ++ $img_file = '/usr/share/tinymce/www/plugins/emotions/images/' . $image_name; if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name)) $OUTPUT->show_message("emoticonerror", 'error'); diff --git a/debian/roundcube-core.README.Debian b/debian/roundcube-core.README.Debian index f7735fd..86a78c5 100644 --- a/debian/roundcube-core.README.Debian +++ b/debian/roundcube-core.README.Debian @@ -5,12 +5,4 @@ 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 , Tue, 20 May 2008 20:51:28 +0200 + -- Vincent Bernat , Sun, 22 Jun 2008 12:13:32 +0200 diff --git a/debian/rules b/debian/rules index a8bf212..fea516c 100755 --- a/debian/rules +++ b/debian/rules @@ -38,11 +38,11 @@ binary-install/roundcube-core:: # 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 diff --git a/debian/watch b/debian/watch index b8625fd..ce76e07 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ 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 -- 2.39.2