From 253d7e91f59672a1600f722a6b47bbf30e33dc47 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Fri, 7 Mar 2008 11:06:49 +0100 Subject: [PATCH] Imported Debian patch 0.1-3 --- debian/changelog | 15 +++++++++++++++ debian/control | 1 + debian/patches/disable-tinymce-spellchecker.patch | 11 +++++++++++ debian/patches/fix-too-old-php-mail-mime.patch | 15 +++++++++++++++ debian/patches/series | 2 ++ debian/roundcube-core.README.Debian | 5 ++++- debian/roundcube-core.install | 2 +- debian/rules | 1 + 8 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 debian/patches/disable-tinymce-spellchecker.patch create mode 100644 debian/patches/fix-too-old-php-mail-mime.patch diff --git a/debian/changelog b/debian/changelog index aea4e9a..1946902 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +roundcube (0.1-3) unstable; urgency=low + + * Fix problem with too old php-mail-mime package (Closes: #469814) + + -- Vincent Bernat Fri, 07 Mar 2008 11:06:49 +0100 + +roundcube (0.1-2) unstable; urgency=low + + * Ship bin/ directory as well. This fix conversion from HTML to text in + composition. + * Disable spellchecker for tinymce since it is not shipped with Debian + package of tinymce. + + -- Vincent Bernat Fri, 07 Mar 2008 09:42:39 +0100 + roundcube (0.1-1) unstable; urgency=low * New upstream release (Closes: #469487). diff --git a/debian/control b/debian/control index 02a9d8b..fa128c6 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Vincent Bernat , Romain Beauxis = 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), po-debconf Homepage: http://www.roundcube.net/ Standards-Version: 3.7.3 +DM-Upload-Allowed: yes Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/roundcube Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube diff --git a/debian/patches/disable-tinymce-spellchecker.patch b/debian/patches/disable-tinymce-spellchecker.patch new file mode 100644 index 0000000..ac5a158 --- /dev/null +++ b/debian/patches/disable-tinymce-spellchecker.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 0000000..d1af6b6 --- /dev/null +++ b/debian/patches/fix-too-old-php-mail-mime.patch @@ -0,0 +1,15 @@ +--- 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/series b/debian/patches/series index b5789c7..e679d9a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,5 @@ correct_install_path.patch use_packaged_tinymce.patch use-db-backend.patch correct-magic-path.patch +disable-tinymce-spellchecker.patch +fix-too-old-php-mail-mime.patch diff --git a/debian/roundcube-core.README.Debian b/debian/roundcube-core.README.Debian index ec5294b..20edc78 100644 --- a/debian/roundcube-core.README.Debian +++ b/debian/roundcube-core.README.Debian @@ -5,4 +5,7 @@ To use tinymce editor: - set $rcmail_config['enable_htmleditor'] to TRUE in /etc/roundcube/main.inc.php - -- Vincent Bernat , Mon, 29 Oct 2007 21:39:09 +0100 +The spellchecker is disabled since it is not present in tinymce Debian +package. + + -- Vincent Bernat , Fri, 7 Mar 2008 09:54:52 +0100 diff --git a/debian/roundcube-core.install b/debian/roundcube-core.install index e025be8..4c1269b 100644 --- a/debian/roundcube-core.install +++ b/debian/roundcube-core.install @@ -1,3 +1,3 @@ -index.php program/ usr/share/roundcube +index.php program/ bin/ usr/share/roundcube skins temp var/lib/roundcube debian/conf/* etc/roundcube diff --git a/debian/rules b/debian/rules index e60c4ad..54ba07c 100755 --- a/debian/rules +++ b/debian/rules @@ -30,6 +30,7 @@ binary-install/roundcube-core:: 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 # 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 -- 2.39.2