From 58041fc77c3079bfab9002c5f59cd72cb584baed Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Mon, 26 Nov 2007 14:37:49 +0000 Subject: [PATCH] Finished 0.1~rc2-2 --- debian/changelog | 8 ++++- debian/conf/apache.conf | 14 ++++---- debian/control | 24 ++++++++++---- debian/control.in | 24 ++++++++++---- debian/patches/use_packaged_tinymce.patch | 32 +++---------------- ...ME.Debian => roundcube-core.README.Debian} | 2 -- debian/{config => roundcube-core.config} | 0 .../{cron.daily => roundcube-core.cron.daily} | 0 debian/{default => roundcube-core.default} | 0 debian/{dirs => roundcube-core.dirs} | 0 debian/{docs => roundcube-core.docs} | 0 debian/{install => roundcube-core.install} | 0 debian/{links => roundcube-core.links} | 0 .../{logrotate => roundcube-core.logrotate} | 0 debian/{postinst => roundcube-core.postinst} | 0 debian/{postrm => roundcube-core.postrm} | 0 debian/{prerm => roundcube-core.prerm} | 0 debian/rules | 32 +++++++++---------- 18 files changed, 69 insertions(+), 67 deletions(-) rename debian/{README.Debian => roundcube-core.README.Debian} (77%) rename debian/{config => roundcube-core.config} (100%) rename debian/{cron.daily => roundcube-core.cron.daily} (100%) rename debian/{default => roundcube-core.default} (100%) rename debian/{dirs => roundcube-core.dirs} (100%) rename debian/{docs => roundcube-core.docs} (100%) rename debian/{install => roundcube-core.install} (100%) rename debian/{links => roundcube-core.links} (100%) rename debian/{logrotate => roundcube-core.logrotate} (100%) rename debian/{postinst => roundcube-core.postinst} (100%) rename debian/{postrm => roundcube-core.postrm} (100%) rename debian/{prerm => roundcube-core.prerm} (100%) diff --git a/debian/changelog b/debian/changelog index 52082d8..fe78ba6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ roundcube (0.1~rc2-2) unstable; urgency=low + [ Vincent Bernat ] * Fix a conflict between ob_gzhandler and zlib output compression, thanks to kaouete (Closes: #450482). - -- Vincent Bernat Sat, 17 Nov 2007 09:13:03 +0100 + [ Romain Beauxis ] + * Fix tinymce patch and inclusion + Closes: #452016 + * Splitted virtual packages to avoid circular dependencies. + + -- Romain Beauxis Mon, 26 Nov 2007 11:54:21 +0100 roundcube (0.1~rc2-1) unstable; urgency=low diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf index 9431b56..a5e0562 100644 --- a/debian/conf/apache.conf +++ b/debian/conf/apache.conf @@ -1,13 +1,13 @@ # 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 -# +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 diff --git a/debian/control b/debian/control index 492c766..3bc6874 100644 --- a/debian/control +++ b/debian/control @@ -5,13 +5,26 @@ Maintainer: Debian Roundcube Maintainers , Romain Beauxis Build-Depends: debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1) Build-Depends-Indep: po-debconf +Homepage: http://www.roundcube.net/ Standards-Version: 3.7.2 +Package: roundcube-core +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, tinymce, ${misc:Depends} +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 + expected from an e-mail client, including MIME support, address book, + folder manipulation and message filters. + . + The user interface is fully skinnable using XHTML and CSS 2. + . + This package provides the core code for roundcube. You should install + it along with one of the roundcube database virtual packages. + 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/ +Depends: roundcube-sqlite | roundcube-db, roundcube-core 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 @@ -19,13 +32,14 @@ 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. + . + This package will install a full roundcube application. 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 @@ -36,7 +50,6 @@ 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 @@ -46,7 +59,6 @@ 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 ecad667..164dff9 100644 --- a/debian/control.in +++ b/debian/control.in @@ -5,13 +5,26 @@ Maintainer: Debian Roundcube Maintainers , Romain Beauxis Build-Depends: @cdbs@ Build-Depends-Indep: po-debconf +Homepage: http://www.roundcube.net/ Standards-Version: 3.7.2 +Package: roundcube-core +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, tinymce, ${misc:Depends} +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 + expected from an e-mail client, including MIME support, address book, + folder manipulation and message filters. + . + The user interface is fully skinnable using XHTML and CSS 2. + . + This package provides the core code for roundcube. You should install + it along with one of the roundcube database virtual packages. + 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/ +Depends: roundcube-sqlite | roundcube-db, roundcube-core 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 @@ -19,13 +32,14 @@ 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. + . + This package will install a full roundcube application. 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 @@ -36,7 +50,6 @@ 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 @@ -46,7 +59,6 @@ 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/use_packaged_tinymce.patch b/debian/patches/use_packaged_tinymce.patch index db835fa..2d48572 100644 --- a/debian/patches/use_packaged_tinymce.patch +++ b/debian/patches/use_packaged_tinymce.patch @@ -1,31 +1,7 @@ ---- 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 +Index: roundcube-0.1~rc2/program/steps/mail/sendmail.inc +=================================================================== +--- 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)) { diff --git a/debian/README.Debian b/debian/roundcube-core.README.Debian similarity index 77% rename from debian/README.Debian rename to debian/roundcube-core.README.Debian index 32c5d82..ec5294b 100644 --- a/debian/README.Debian +++ b/debian/roundcube-core.README.Debian @@ -2,8 +2,6 @@ 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. 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 diff --git a/debian/config b/debian/roundcube-core.config similarity index 100% rename from debian/config rename to debian/roundcube-core.config diff --git a/debian/cron.daily b/debian/roundcube-core.cron.daily similarity index 100% rename from debian/cron.daily rename to debian/roundcube-core.cron.daily diff --git a/debian/default b/debian/roundcube-core.default similarity index 100% rename from debian/default rename to debian/roundcube-core.default diff --git a/debian/dirs b/debian/roundcube-core.dirs similarity index 100% rename from debian/dirs rename to debian/roundcube-core.dirs diff --git a/debian/docs b/debian/roundcube-core.docs similarity index 100% rename from debian/docs rename to debian/roundcube-core.docs diff --git a/debian/install b/debian/roundcube-core.install similarity index 100% rename from debian/install rename to debian/roundcube-core.install diff --git a/debian/links b/debian/roundcube-core.links similarity index 100% rename from debian/links rename to debian/roundcube-core.links diff --git a/debian/logrotate b/debian/roundcube-core.logrotate similarity index 100% rename from debian/logrotate rename to debian/roundcube-core.logrotate diff --git a/debian/postinst b/debian/roundcube-core.postinst similarity index 100% rename from debian/postinst rename to debian/roundcube-core.postinst diff --git a/debian/postrm b/debian/roundcube-core.postrm similarity index 100% rename from debian/postrm rename to debian/roundcube-core.postrm diff --git a/debian/prerm b/debian/roundcube-core.prerm similarity index 100% rename from debian/prerm rename to debian/roundcube-core.prerm diff --git a/debian/rules b/debian/rules index 4d4aaea..4c71ac6 100755 --- a/debian/rules +++ b/debian/rules @@ -7,32 +7,30 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk # DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean # Then check manually if everything's ok -binary-install/roundcube:: +binary-install/roundcube-core:: # Symlink all that is in /usr/share/roundcube to /var/lib/roundcube - find debian/roundcube/usr/share/roundcube -maxdepth 1 -mindepth 1 | \ + find debian/roundcube-core/usr/share/roundcube -maxdepth 1 -mindepth 1 | \ while read i; do \ if [ ! -L "$$i" ]; then \ - dh_link "`echo "$$i" | sed -e s#debian/roundcube/##`" \ - "`echo "$$i" | sed -e s#debian/roundcube/usr/share/roundcube/#var/lib/roundcube/#`"; \ + dh_link -proundcube-core "`echo "$$i" | sed -e s#debian/roundcube-core/##`" \ + "`echo "$$i" | sed -e s#debian/roundcube-core/usr/share/roundcube/#var/lib/roundcube/#`"; \ fi \ done # Install config/db.inc.php.dist - install -m 0640 $(CURDIR)/config/db.inc.php.dist $(CURDIR)/debian/roundcube/etc/roundcube/db.inc.php - install -m 0640 $(CURDIR)/config/main.inc.php.dist $(CURDIR)/debian/roundcube/usr/share/roundcube + install -m 0640 $(CURDIR)/config/db.inc.php.dist $(CURDIR)/debian/roundcube-core/etc/roundcube/db.inc.php + install -m 0640 $(CURDIR)/config/main.inc.php.dist $(CURDIR)/debian/roundcube-core/usr/share/roundcube # Install empty tables and updates for each db type - install -m 0644 $(CURDIR)/SQL/mysql.initial.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/mysql - install -m 0644 $(CURDIR)/SQL/mysql.update.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/upgrade/mysql/0.1~rc1~dfsg-1 - install -m 0644 $(CURDIR)/SQL/postgres.initial.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/pgsql - install -m 0644 $(CURDIR)/SQL/postgres.update.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/upgrade/pgsql/0.1~rc1~dfsg-1 - 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 + install -m 0644 $(CURDIR)/SQL/mysql.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/install/mysql + install -m 0644 $(CURDIR)/SQL/mysql.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/mysql/0.1~rc1~dfsg-1 + install -m 0644 $(CURDIR)/SQL/postgres.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/install/pgsql + install -m 0644 $(CURDIR)/SQL/postgres.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/pgsql/0.1~rc1~dfsg-1 + install -m 0644 $(CURDIR)/SQL/sqlite.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/install/sqlite + install -m 0644 $(CURDIR)/SQL/sqlite.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/sqlite/0.1~rc1~dfsg-1 # Some files are executable while not being scripts or binary... - find $(CURDIR)/debian/roundcube/usr/share/roundcube/program/localization -type f -print0 | xargs -0 chmod -x + find $(CURDIR)/debian/roundcube-core/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 + 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 clean:: debconf-updatepo -- 2.39.2