From: Vincent Bernat Date: Mon, 29 Oct 2007 21:08:43 +0000 (+0100) Subject: Imported Debian patch 0.1~rc2-1 X-Git-Url: https://git.donarmstrong.com/?p=roundcube.git;a=commitdiff_plain;h=eb4cd25835facbfbadd7bf8d8b981a6dce60802b Imported Debian patch 0.1~rc2-1 --- diff --git a/debian/README.Debian b/debian/README.Debian index 160a9c6..32c5d82 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,11 +1,10 @@ -Debian does not allow complex dependencies. Upon install, you need to -check that you have the correct packages installed. - -If you want to use MySQL, you need mysql-client and php5-mysql. -For PostgreSQL, you need postgresql-client and php5-pgsql. -For SQLite, you need sqlite and php5-sqlite. - For better compatibility, the schema used for MySQL is the one targeted at MySQL 4.0, not the one for MySQL 4.1 or MySQL 5.x. - -- Vincent Bernat , Tue, 22 May 2007 21:17:27 +0200 +To use tinymce editor: + - install tinymce package + - uncomment the first block in /etc/apache*/conf.d/roundcube + - set $rcmail_config['enable_htmleditor'] to TRUE in + /etc/roundcube/main.inc.php + + -- Vincent Bernat , Mon, 29 Oct 2007 21:39:09 +0100 diff --git a/debian/changelog b/debian/changelog index 44a19b7..2b5fb6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +roundcube (0.1~rc2-1) unstable; urgency=low + + * New upstream, thanks to Nicolas Stransky (Closes: #447503). This + release support tinymce as HTML editor. Look at README.Debian for more + information. + * Update Galician debconf template, thanks to Jacobo Tarrio (Closes: #447943). + + -- Vincent Bernat Mon, 29 Oct 2007 22:08:43 +0100 + roundcube (0.1~rc1-3) unstable; urgency=low * In respect to policy 12.3, do not put main.inc.php.dist in diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf index b4447d4..9431b56 100644 --- a/debian/conf/apache.conf +++ b/debian/conf/apache.conf @@ -1,3 +1,14 @@ +# Uncomment this to use tinymce (you need tinymce package) +# See README.Debian for more details + +# Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ +# +# Options Indexes MultiViews FollowSymLinks +# AllowOverride None +# Order allow,deny +# allow from all +# + # This alias does not work properly with several hosts on your apache server # Uncomment it to use it # Alias /roundcube /var/lib/roundcube @@ -28,3 +39,4 @@ Order allow,deny Deny from all + diff --git a/debian/control b/debian/control index b998456..492c766 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,8 @@ Standards-Version: 3.7.2 Package: roundcube Architecture: all Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, ${misc:Depends} +Suggests: tinymce +Homepage: http://www.roundcube.net/ Description: skinnable AJAX based webmail solution for IMAP servers RoundCube Webmail is a browser-based multilingual IMAP client with an application-like user interface. It provides full functionality @@ -17,14 +19,13 @@ Description: skinnable AJAX based webmail solution for IMAP servers folder manipulation and message filters. . The user interface is fully skinnable using XHTML and CSS 2. - . - Homepage: http://www.roundcube.net/ Package: roundcube-mysql Architecture: all Depends: roundcube, php5-mysql, mysql-client | virtual-mysql-client Suggests: mysql-server Provides: roundcube-db +Homepage: http://www.roundcube.net/ Description: virtual package providing MySQL dependencies for RoundCube This package provides MySQL dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install this @@ -35,6 +36,7 @@ Architecture: all Depends: roundcube, php5-pgsql, postgresql-client-8.1 | postgresql-client Suggests: postgresql-server Provides: roundcube-db +Homepage: http://www.roundcube.net/ Description: virtual package providing PostgreSQL dependencies for RoundCube This package provides PostgreSQL dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install @@ -44,6 +46,7 @@ Package: roundcube-sqlite Architecture: all Depends: roundcube, php5-sqlite, sqlite Provides: roundcube-db +Homepage: http://www.roundcube.net/ Description: virtual package providing sqlite dependencies for RoundCube This package provides sqlite dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install this diff --git a/debian/control.in b/debian/control.in index 0ff756a..ecad667 100644 --- a/debian/control.in +++ b/debian/control.in @@ -10,6 +10,8 @@ Standards-Version: 3.7.2 Package: roundcube Architecture: all Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, ${misc:Depends} +Suggests: tinymce +Homepage: http://www.roundcube.net/ Description: skinnable AJAX based webmail solution for IMAP servers RoundCube Webmail is a browser-based multilingual IMAP client with an application-like user interface. It provides full functionality @@ -17,14 +19,13 @@ Description: skinnable AJAX based webmail solution for IMAP servers folder manipulation and message filters. . The user interface is fully skinnable using XHTML and CSS 2. - . - Homepage: http://www.roundcube.net/ Package: roundcube-mysql Architecture: all Depends: roundcube, php5-mysql, mysql-client | virtual-mysql-client Suggests: mysql-server Provides: roundcube-db +Homepage: http://www.roundcube.net/ Description: virtual package providing MySQL dependencies for RoundCube This package provides MySQL dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install this @@ -35,6 +36,7 @@ Architecture: all Depends: roundcube, php5-pgsql, postgresql-client-8.1 | postgresql-client Suggests: postgresql-server Provides: roundcube-db +Homepage: http://www.roundcube.net/ Description: virtual package providing PostgreSQL dependencies for RoundCube This package provides PostgreSQL dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install @@ -44,6 +46,7 @@ Package: roundcube-sqlite Architecture: all Depends: roundcube, php5-sqlite, sqlite Provides: roundcube-db +Homepage: http://www.roundcube.net/ Description: virtual package providing sqlite dependencies for RoundCube This package provides sqlite dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install this diff --git a/debian/patches/dbconfig-common_support.patch b/debian/patches/dbconfig-common_support.patch index 8e1f71d..ec4a2a8 100644 --- a/debian/patches/dbconfig-common_support.patch +++ b/debian/patches/dbconfig-common_support.patch @@ -6,7 +6,7 @@ -// PEAR database DSN for read/write operations -// format is db_provider://user:password@host/databse --// currentyl suported db_providers: mysql, pgsql, sqlite +-// currently supported db_providers: mysql, sqlite - -$rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail'; -// postgres example: 'pgsql://roundcube:pass@localhost/roundcubemail'; diff --git a/debian/patches/series b/debian/patches/series index 70787a4..bde2b5d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ dbconfig-common_support.patch correct_install_path.patch +use_packaged_tinymce.patch diff --git a/debian/patches/use_packaged_tinymce.patch b/debian/patches/use_packaged_tinymce.patch new file mode 100644 index 0000000..db835fa --- /dev/null +++ b/debian/patches/use_packaged_tinymce.patch @@ -0,0 +1,37 @@ +--- roundcube_0.1-rc2/program/js/editor.js 2007-06-09 01:47:57.000000000 +0200 ++++ roundcube_0.1-rc2/program/js/editor.js 2007-10-29 21:47:07.000000000 +0100 +@@ -27,10 +27,7 @@ + theme_advanced_buttons3 : '', + theme_advanced_toolbar_location : 'top', + theme_advanced_toolbar_align : 'left', +- extended_valid_elements : 'font[face|size|color|style],span[id|class|align|style]', +- content_css : skin_path + '/editor_content.css', +- popups_css : skin_path + '/editor_popup.css', +- editor_css : skin_path + '/editor_ui.css' ++ extended_valid_elements : 'font[face|size|color|style],span[id|class|align|style]' + }); + } + +--- roundcube_0.1-rc2/program/steps/settings/edit_identity.inc 2007-04-28 20:07:12.000000000 +0200 ++++ roundcube_0.1-rc2/program/steps/settings/edit_identity.inc 2007-10-29 21:46:33.000000000 +0100 +@@ -49,9 +49,6 @@ + $OUTPUT->include_script('tiny_mce/tiny_mce_src.js'); + $OUTPUT->add_script("tinyMCE.init({ mode : 'specific_textareas'," . + "apply_source_formatting : true," . +- "content_css : '\$__skin_path' + '/editor_content.css'," . +- "popups_css : '\$__skin_path' + '/editor_popups.css'," . +- "editor_css : '\$__skin_path' + '/editor_ui.css'," . + "theme : 'advanced'," . + "theme_advanced_toolbar_location : 'top'," . + "theme_advanced_toolbar_align : 'left'," . +--- roundcube_0.1-rc2/program/steps/mail/sendmail.inc 2007-09-26 10:13:21.000000000 +0200 ++++ roundcube_0.1-rc2/program/steps/mail/sendmail.inc 2007-10-29 22:04:20.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/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/po/gl.po b/debian/po/gl.po index a5b5376..627dec2 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: roundcube\n" "Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" "POT-Creation-Date: 2007-05-26 09:36+0200\n" -"PO-Revision-Date: 2007-05-26 18:19+0200\n" +"PO-Revision-Date: 2007-10-24 22:32+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" @@ -73,16 +73,12 @@ msgstr "¿Debería(n) reiniciarse o(s) servidor(es) web?" #. Type: boolean #. Description #: ../templates:3001 -#, fuzzy -#| msgid "" -#| "In order to activate the new configuration, the reconfigured web servers " -#| "have to be restarted." msgid "" "In order to activate the new configuration, the reconfigured web server(s) " "have to be restarted." msgstr "" -"Para activar a nova configuración hai que reiniciar os servidores web " -"reconfigurados." +"Para activar a nova configuración hai que reiniciar o(s) servidor(es) web " +"reconfigurado(s)." #. Type: string #. Description diff --git a/debian/rules b/debian/rules index ad615aa..4d4aaea 100755 --- a/debian/rules +++ b/debian/rules @@ -8,13 +8,6 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk # Then check manually if everything's ok binary-install/roundcube:: - # Removing PEAR classes that are provided via strd packages - rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/Auth - rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/DB - rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/DB.php - rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/Mail - rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/Net - rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/PEAR.php # Symlink all that is in /usr/share/roundcube to /var/lib/roundcube find debian/roundcube/usr/share/roundcube -maxdepth 1 -mindepth 1 | \ while read i; do \ @@ -34,16 +27,12 @@ binary-install/roundcube:: install -m 0644 $(CURDIR)/SQL/sqlite.initial.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/sqlite install -m 0644 $(CURDIR)/SQL/sqlite.update.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/upgrade/sqlite/0.1~rc1~dfsg-1 # Some files are executable while not being scripts or binary... - chmod -x $(CURDIR)/debian/roundcube/usr/share/roundcube/program/include/rcube_mdb2.inc - chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/icons/plus.gif - chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/common.css - chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/display/loading.gif - chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/buttons/up_arrow.png - chmod -x $(CURDIR)/debian/roundcube/usr/share/roundcube/program/include/rcube_db.inc - chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/buttons/down_arrow.png - chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/googiespell.css - chmod -x $(CURDIR)/debian/roundcube/usr/share/roundcube/program/js/googiespell.js find $(CURDIR)/debian/roundcube/usr/share/roundcube/program/localization -type f -print0 | xargs -0 chmod -x + # Remove files shipped in tinymce package + rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/js/tiny_mce + for f in colorpicker.css editor_content.css editor_popup.css editor_ui.css; do \ + rm $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/$$f; \ + done clean:: debconf-updatepo