]> git.donarmstrong.com Git - roundcube.git/commitdiff
Finished 0.1~rc2-2
authorRomain Beauxis <toots@rastageeks.org>
Mon, 26 Nov 2007 14:37:49 +0000 (14:37 +0000)
committerJérémy Bobbio <lunar@debian.org>
Sat, 18 Jun 2011 16:44:46 +0000 (18:44 +0200)
30 files changed:
debian/README.Debian [deleted file]
debian/changelog
debian/conf/apache.conf
debian/config [deleted file]
debian/control
debian/control.in
debian/cron.daily [deleted file]
debian/default [deleted file]
debian/dirs [deleted file]
debian/docs [deleted file]
debian/install [deleted file]
debian/links [deleted file]
debian/logrotate [deleted file]
debian/patches/use_packaged_tinymce.patch
debian/postinst [deleted file]
debian/postrm [deleted file]
debian/prerm [deleted file]
debian/roundcube-core.README.Debian [new file with mode: 0644]
debian/roundcube-core.config [new file with mode: 0644]
debian/roundcube-core.cron.daily [new file with mode: 0644]
debian/roundcube-core.default [new file with mode: 0644]
debian/roundcube-core.dirs [new file with mode: 0644]
debian/roundcube-core.docs [new file with mode: 0644]
debian/roundcube-core.install [new file with mode: 0644]
debian/roundcube-core.links [new file with mode: 0644]
debian/roundcube-core.logrotate [new file with mode: 0644]
debian/roundcube-core.postinst [new file with mode: 0644]
debian/roundcube-core.postrm [new file with mode: 0644]
debian/roundcube-core.prerm [new file with mode: 0644]
debian/rules

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644 (file)
index 32c5d82..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-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
-
- -- Vincent Bernat <bernat@luffy.cx>, Mon, 29 Oct 2007 21:39:09 +0100
index 52082d8610daa79f0144d9e8790e43b2031e1396..fe78ba61ece324173073af88e7dbac466d307d47 100644 (file)
@@ -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 <bernat@luffy.cx>  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 <toots@rastageeks.org>  Mon, 26 Nov 2007 11:54:21 +0100
 
 roundcube (0.1~rc2-1) unstable; urgency=low
 
index 9431b5699b8624da8e37c4d8e0ffd5e54ba40c7a..a5e05623d3c99bcc1c3f928efdf8a086c3d03236 100644 (file)
@@ -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/
-<Directory "/usr/share/tinymce/www/">
-#      Options Indexes MultiViews FollowSymLinks
-#      AllowOverride None
-#      Order allow,deny
-#      allow from all
-</Directory>
+Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+<Directory "/usr/share/tinymce/www/">
+      Options Indexes MultiViews FollowSymLinks
+      AllowOverride None
+      Order allow,deny
+      allow from all
+</Directory>
 
 # This alias does not work properly with several hosts on your apache server
 # Uncomment it to use it
diff --git a/debian/config b/debian/config
deleted file mode 100644 (file)
index c5ef209..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_input medium roundcube/hosts || true
-db_go || true
-
-# Retrieve all available languages
-instd_langs=$(echo /usr/share/roundcube/program/localization/*/messages.inc | \
-    sed 's+[^ ]*/\([^ ]*\)/messages.inc+\1,+g' | sed 's+,$++')
-# Retrieve the old list
-db_metaget roundcube/language languages && oldchoices="$RET"
-if [ ! "$oldchoices" ] || [ "$instd_langs" != "$oldchoices" ]; then
-       db_subst roundcube/language languages $instd_langs
-       db_fset roundcube/language seen false
-       # Try to guess the locale
-       locale=$(echo $LANG | sed 's/[@\.].*//')
-       if [ -d /usr/share/roundcube/program/localization/$locale ]; then
-          db_set roundcube/language $locale
-       else
-          locale=$(echo $locale | sed 's/_.*//')
-          if [ -d /usr/share/roundcube/program/localization/$locale ]; then
-              db_set roundcube/language $locale
-          else
-              db_set roundcube/language en_US
-          fi
-       fi
-fi
-# Ask the question
-db_input medium roundcube/language || true
-db_go || true
-
-if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
-        dbc_dbtypes="mysql, pgsql, sqlite"
-        dbc_authmethod_user="password"
-        . /usr/share/dbconfig-common/dpkg/config 
-        dbc_go roundcube $@
-fi
-
-db_input medium roundcube/reconfigure-webserver || true
-db_go || true
-db_input medium roundcube/restart-webserver || true
-db_go || true
index 492c766e9c6cad7e8bf476e48683d1667b6e5fd9..3bc6874e5e4b4a4e8247548aa046ba2a6e1319d6 100644 (file)
@@ -5,13 +5,26 @@ Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth
 Uploaders: Vincent Bernat <bernat@luffy.cx>, Romain Beauxis <toots@rastageeks.org>
 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
index ecad66786d82c5253cc19f68fa5b61c44a0a43a4..164dff9619f67dd9cdb9163a9c10a774afee7f02 100644 (file)
@@ -5,13 +5,26 @@ Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth
 Uploaders: Vincent Bernat <bernat@luffy.cx>, Romain Beauxis <toots@rastageeks.org>
 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/cron.daily b/debian/cron.daily
deleted file mode 100644 (file)
index 4b071ca..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-MAX_TMPFILE_LIFETIME=5
-# MAX_TMPFILE_LIFETIME can be overridden in this file
-if [ -r /etc/default/roundcube ]; then
-       . /etc/default/roundcube
-fi
-
-find /var/lib/roundcube/temp -type f -mtime +$MAX_TMPFILE_LIFETIME -print0 | xargs -0 -r rm
diff --git a/debian/default b/debian/default
deleted file mode 100644 (file)
index 67e646d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Uncomment the following line to alter the default delay to clean
-# temporary directory /var/lib/roundcube/temp
-# MAX_TMPFILE_LIFETIME=5
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index 2bcbe8c..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/share/roundcube
-usr/share/dbconfig-common/data/roundcube/install
-usr/share/dbconfig-common/data/roundcube/upgrade/mysql
-usr/share/dbconfig-common/data/roundcube/upgrade/pgsql
-usr/share/dbconfig-common/data/roundcube/upgrade/sqlite
-etc/roundcube
-var/log/roundcube
-var/lib/roundcube/config
-etc/default
diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index c42dfaf..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-UPGRADING
diff --git a/debian/install b/debian/install
deleted file mode 100644 (file)
index e025be8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-index.php program/ usr/share/roundcube
-skins temp var/lib/roundcube
-debian/conf/* etc/roundcube
diff --git a/debian/links b/debian/links
deleted file mode 100644 (file)
index 812c7a4..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-etc/roundcube/main.inc.php var/lib/roundcube/config/main.inc.php
-etc/roundcube/db.inc.php var/lib/roundcube/config/db.inc.php
-var/lib/roundcube/temp usr/share/roundcube/temp
-var/lib/roundcube/skins usr/share/roundcube/skins
-var/lib/roundcube/config usr/share/roundcube/config
-var/log/roundcube var/lib/roundcube/logs
-var/lib/roundcube/logs usr/share/roundcube/logs
-usr/share/roundcube/main.inc.php.dist usr/share/doc/roundcube/main.inc.php.dist
diff --git a/debian/logrotate b/debian/logrotate
deleted file mode 100644 (file)
index 9b6c0a9..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/roundcube/sendmail /var/log/roundcube/errors {
-   weekly
-   rotate 4
-   compress
-   missingok
-}
index db835faf863d4eac5878bf24fa1a402ba2a5901a..2d4857222f0d44180ed8309d5530e3fe61e47b89 100644 (file)
@@ -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/postinst b/debian/postinst
deleted file mode 100644 (file)
index 33d6912..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh
-# postinst script for roundcube
-#
-# see: dh_installdeb(1)
-
-set -e
-
-. /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/postinst 
-dbc_generate_include=php:/etc/roundcube/debian-db.php
-dbc_generate_include_owner="www-data:www-data"
-dbc_generate_include_perms="660"
-dbc_dbfile_owner="www-data:www-data"
-dbc_dbfile_perms="0660"
-dbc_dbuser=roundcube
-dbc_dbname=roundcube
-
-dbc_go roundcube $@
-
-case "$1" in
-    configure)
-
-       # From 0.1-beta2.2 to 0.1-rc1, a column was added to table
-       # `identities'. For MySQL and PostgreSQL, this is handled by
-       # dbconfig-common but for sqlite, there is no way to add a
-       # column to a table. Therefore, we dump here the table and add
-       # the column.
-       [ "$dbc_upgrade" = "true" ] && {
-           case "$dbc_dbtype" in
-               sqlite)
-                   db="${dbc_basepath}/${dbc_dbname}"
-               # OK, we need to check if the table contains html_signature
-                   if ! sqlite "$db" '.schema identities' | grep -q html_signature; then
-                       # We need to add it
-                       echo -n "Need to upgrade 'identities' table in $db... "
-                       upgrade_tmp=$(mktemp -t roundcube.sqlite.XXXXXXXXXX)
-                       (
-                           cat <<EOF
-BEGIN TRANSACTION;
-DROP TABLE identities;
-CREATE TABLE identities (
-  identity_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL default '0',
-  del tinyint NOT NULL default '0',
-  standard tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default '',
-  organization varchar(128) default '',
-  email varchar(128) NOT NULL default '',
-  "reply-to" varchar(128) NOT NULL default '',
-  bcc varchar(128) NOT NULL default '',
-  signature text NOT NULL default '',
-  html_signature tinyint NOT NULL default '0'
-);
-
-CREATE INDEX ix_identities_user_id ON identities(user_id);
-
-EOF
-                           # We dump and keep only inserts
-                           sqlite "$db" '.dump identities' | \
-                               awk '/^INSERT INTO/ {start = 1} {if (start == 1) print}' | \
-                               head -n -2 | \
-                               sed 's/^\(INSERT INTO identities \)/\1(identity_id, user_id, del, standard, name, organization, email, "reply-to", bcc, signature) /'
-                           echo 'COMMIT;' ) > $upgrade_tmp
-                       sqlite "$db" < $upgrade_tmp
-                       rm $upgrade_tmp
-                       echo "OK"
-                   fi
-                   ;;
-               *)
-                   # Do nothing
-                   ;;
-           esac
-       }
-
-       CONFFILE=/etc/roundcube/main.inc.php
-       touch $CONFFILE.ucftmp
-       chmod 640 $CONFFILE.ucftmp
-
-       db_get roundcube/hosts || true
-       hosts="$RET"
-       if [ "$hosts" != "" ]; then
-           hosts="array(\"$(echo $hosts | sed 's/ /\",\"/g')\")"
-       else
-           hosts="''"
-       fi
-
-       db_get roundcube/language || true
-       language="$RET"
-
-       # Get current 3DES key from /etc/roundcube/main.inc.php
-       [ -f /etc/roundcube/main.inc.php ] && {
-           deskey=$(sed -n "s+^\$rcmail_config\['des_key'\] = '\(.*\)';\$+\1+p" \
-               /etc/roundcube/main.inc.php)
-       }
-       # If this is the default key, forget it !
-       [ "$deskey" = "rcmail-!24ByteDESkey*Str" ] && unset deskey
-       # Generate a new one
-       while [ -z "$deskey" ]; do
-           deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | \
-               tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p')
-       done
-
-       # Put hosts, language and key in main.inc.php
-       cat /usr/share/roundcube/main.inc.php.dist | \
-           sed -e "s+^\(\$rcmail_config\['default_host'\] = \)''\(;\)\$+\1${hosts}\2+" \
-               -e "s+^\(\$rcmail_config\['des_key'\] = '\).*\(';\)\$+\1$deskey\2+" \
-               -e "s+^\(\$rcmail_config\['locale_string'\] = '\).*\(';\)\$+\1${language}\2+" >> $CONFFILE.ucftmp
-
-       ucf --debconf-ok $CONFFILE.ucftmp $CONFFILE
-       chown root:www-data $CONFFILE
-        rm -f $CONFFILE.ucftmp
-       
-       # Handle webserver reconfiguration/restart ; stolen from zabbix package
-       db_get roundcube/reconfigure-webserver || true
-       webservers="$RET"
-       restart=""
-
-       for webserver in $webservers; do
-            webserver=${webserver%,}
-            test -x /usr/sbin/$webserver || continue
-        
-            if [ ! -f /etc/$webserver/conf.d/roundcube ] && [ ! -h /etc/$webserver/conf.d/roundcube ]; then
-               ln -s /etc/roundcube/apache.conf /etc/$webserver/conf.d/roundcube
-            fi
-            restart="$restart $webserver"
-        done
-
-        db_get roundcube/restart-webserver || true
-       res="$RET"
-       db_stop || true
-       if [ "$res" = "true" ]; then
-            for webserver in $restart; do
-               webserver=${webserver%,}
-               if [ -x /usr/sbin/invoke-rc.d ]; then
-                    invoke-rc.d $webserver restart
-               else
-                    /etc/init.d/$webserver restart
-               fi
-            done
-       fi
-
-       chown -R www-data:adm /var/log/roundcube
-       chmod -R 750 /var/log/roundcube
-       chown -R www-data:www-data /var/lib/roundcube/temp
-       chmod -R 750 /var/lib/roundcube/temp
-       chown www-data:adm /var/lib/roundcube/skins
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644 (file)
index 9159d97..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# postrm script for roundcube
-#
-# see: dh_installdeb(1)
-
-set -e
-
-if [ -f /usr/share/debconf/confmodule ]; then
-        . /usr/share/debconf/confmodule
-fi
-if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
-        . /usr/share/dbconfig-common/dpkg/postrm 
-        dbc_go roundcube $@
-fi
-
-case "$1" in
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-    
-    remove)
-
-       # Handling web server reconfiguration
-       db_get roundcube/reconfigure-webserver
-        webservers="$RET"
-        restart=""
-        
-        for webserver in $webservers; do
-            webserver=${webserver%,}
-        
-            case "$webserver" in
-                apache|apache-perl|apache-ssl|apache2)
-                    rm -f /etc/$webserver/conf.d/roundcube
-                    test -x /usr/sbin/$webserver || continue
-                    restart="$restart $webserver"
-                    ;;
-                *)
-                    ;;
-            esac
-        done
-        
-        db_get roundcube/restart-webserver
-        res="$RET"
-        db_stop || true
-        if [ "$res" = "true" ]; then
-            for webserver in $restart; do
-                webserver=${webserver%,}
-                if [ -x /usr/sbin/invoke-rc.d ]; then
-                    invoke-rc.d $webserver restart
-                else
-                    /etc/init.d/$webserver restart
-                fi
-            done
-        fi
-    ;;
-
-    purge)
-        rm -f /etc/roundcube/debian-db.php
-        if which ucf >/dev/null 2>&1; then
-                ucf --purge /etc/roundcube/debian-db.php
-               ucf --purge /etc/roundcube/main.inc.php
-        fi
-       rm -f /etc/roundcube/main.inc.php
-       rm -rf /var/log/roundcube
-       rm -rf /var/lib/roundcube
-    ;;
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644 (file)
index 5004518..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# prerm script for roundcube
-#
-# see: dh_installdeb(1)
-
-set -e
-
-. /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/prerm 
-dbc_go roundcube $@
-
-case "$1" in
-    remove|upgrade|deconfigure)
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/roundcube-core.README.Debian b/debian/roundcube-core.README.Debian
new file mode 100644 (file)
index 0000000..ec5294b
--- /dev/null
@@ -0,0 +1,8 @@
+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:
+ - set $rcmail_config['enable_htmleditor'] to TRUE in
+   /etc/roundcube/main.inc.php
+
+ -- Vincent Bernat <bernat@luffy.cx>, Mon, 29 Oct 2007 21:39:09 +0100
diff --git a/debian/roundcube-core.config b/debian/roundcube-core.config
new file mode 100644 (file)
index 0000000..c5ef209
--- /dev/null
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_input medium roundcube/hosts || true
+db_go || true
+
+# Retrieve all available languages
+instd_langs=$(echo /usr/share/roundcube/program/localization/*/messages.inc | \
+    sed 's+[^ ]*/\([^ ]*\)/messages.inc+\1,+g' | sed 's+,$++')
+# Retrieve the old list
+db_metaget roundcube/language languages && oldchoices="$RET"
+if [ ! "$oldchoices" ] || [ "$instd_langs" != "$oldchoices" ]; then
+       db_subst roundcube/language languages $instd_langs
+       db_fset roundcube/language seen false
+       # Try to guess the locale
+       locale=$(echo $LANG | sed 's/[@\.].*//')
+       if [ -d /usr/share/roundcube/program/localization/$locale ]; then
+          db_set roundcube/language $locale
+       else
+          locale=$(echo $locale | sed 's/_.*//')
+          if [ -d /usr/share/roundcube/program/localization/$locale ]; then
+              db_set roundcube/language $locale
+          else
+              db_set roundcube/language en_US
+          fi
+       fi
+fi
+# Ask the question
+db_input medium roundcube/language || true
+db_go || true
+
+if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
+        dbc_dbtypes="mysql, pgsql, sqlite"
+        dbc_authmethod_user="password"
+        . /usr/share/dbconfig-common/dpkg/config 
+        dbc_go roundcube $@
+fi
+
+db_input medium roundcube/reconfigure-webserver || true
+db_go || true
+db_input medium roundcube/restart-webserver || true
+db_go || true
diff --git a/debian/roundcube-core.cron.daily b/debian/roundcube-core.cron.daily
new file mode 100644 (file)
index 0000000..4b071ca
--- /dev/null
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+MAX_TMPFILE_LIFETIME=5
+# MAX_TMPFILE_LIFETIME can be overridden in this file
+if [ -r /etc/default/roundcube ]; then
+       . /etc/default/roundcube
+fi
+
+find /var/lib/roundcube/temp -type f -mtime +$MAX_TMPFILE_LIFETIME -print0 | xargs -0 -r rm
diff --git a/debian/roundcube-core.default b/debian/roundcube-core.default
new file mode 100644 (file)
index 0000000..67e646d
--- /dev/null
@@ -0,0 +1,3 @@
+# Uncomment the following line to alter the default delay to clean
+# temporary directory /var/lib/roundcube/temp
+# MAX_TMPFILE_LIFETIME=5
diff --git a/debian/roundcube-core.dirs b/debian/roundcube-core.dirs
new file mode 100644 (file)
index 0000000..2bcbe8c
--- /dev/null
@@ -0,0 +1,9 @@
+usr/share/roundcube
+usr/share/dbconfig-common/data/roundcube/install
+usr/share/dbconfig-common/data/roundcube/upgrade/mysql
+usr/share/dbconfig-common/data/roundcube/upgrade/pgsql
+usr/share/dbconfig-common/data/roundcube/upgrade/sqlite
+etc/roundcube
+var/log/roundcube
+var/lib/roundcube/config
+etc/default
diff --git a/debian/roundcube-core.docs b/debian/roundcube-core.docs
new file mode 100644 (file)
index 0000000..c42dfaf
--- /dev/null
@@ -0,0 +1,2 @@
+README
+UPGRADING
diff --git a/debian/roundcube-core.install b/debian/roundcube-core.install
new file mode 100644 (file)
index 0000000..e025be8
--- /dev/null
@@ -0,0 +1,3 @@
+index.php program/ usr/share/roundcube
+skins temp var/lib/roundcube
+debian/conf/* etc/roundcube
diff --git a/debian/roundcube-core.links b/debian/roundcube-core.links
new file mode 100644 (file)
index 0000000..812c7a4
--- /dev/null
@@ -0,0 +1,8 @@
+etc/roundcube/main.inc.php var/lib/roundcube/config/main.inc.php
+etc/roundcube/db.inc.php var/lib/roundcube/config/db.inc.php
+var/lib/roundcube/temp usr/share/roundcube/temp
+var/lib/roundcube/skins usr/share/roundcube/skins
+var/lib/roundcube/config usr/share/roundcube/config
+var/log/roundcube var/lib/roundcube/logs
+var/lib/roundcube/logs usr/share/roundcube/logs
+usr/share/roundcube/main.inc.php.dist usr/share/doc/roundcube/main.inc.php.dist
diff --git a/debian/roundcube-core.logrotate b/debian/roundcube-core.logrotate
new file mode 100644 (file)
index 0000000..9b6c0a9
--- /dev/null
@@ -0,0 +1,6 @@
+/var/log/roundcube/sendmail /var/log/roundcube/errors {
+   weekly
+   rotate 4
+   compress
+   missingok
+}
diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
new file mode 100644 (file)
index 0000000..33d6912
--- /dev/null
@@ -0,0 +1,164 @@
+#!/bin/sh
+# postinst script for roundcube
+#
+# see: dh_installdeb(1)
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/dbconfig-common/dpkg/postinst 
+dbc_generate_include=php:/etc/roundcube/debian-db.php
+dbc_generate_include_owner="www-data:www-data"
+dbc_generate_include_perms="660"
+dbc_dbfile_owner="www-data:www-data"
+dbc_dbfile_perms="0660"
+dbc_dbuser=roundcube
+dbc_dbname=roundcube
+
+dbc_go roundcube $@
+
+case "$1" in
+    configure)
+
+       # From 0.1-beta2.2 to 0.1-rc1, a column was added to table
+       # `identities'. For MySQL and PostgreSQL, this is handled by
+       # dbconfig-common but for sqlite, there is no way to add a
+       # column to a table. Therefore, we dump here the table and add
+       # the column.
+       [ "$dbc_upgrade" = "true" ] && {
+           case "$dbc_dbtype" in
+               sqlite)
+                   db="${dbc_basepath}/${dbc_dbname}"
+               # OK, we need to check if the table contains html_signature
+                   if ! sqlite "$db" '.schema identities' | grep -q html_signature; then
+                       # We need to add it
+                       echo -n "Need to upgrade 'identities' table in $db... "
+                       upgrade_tmp=$(mktemp -t roundcube.sqlite.XXXXXXXXXX)
+                       (
+                           cat <<EOF
+BEGIN TRANSACTION;
+DROP TABLE identities;
+CREATE TABLE identities (
+  identity_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL default '0',
+  del tinyint NOT NULL default '0',
+  standard tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default '',
+  organization varchar(128) default '',
+  email varchar(128) NOT NULL default '',
+  "reply-to" varchar(128) NOT NULL default '',
+  bcc varchar(128) NOT NULL default '',
+  signature text NOT NULL default '',
+  html_signature tinyint NOT NULL default '0'
+);
+
+CREATE INDEX ix_identities_user_id ON identities(user_id);
+
+EOF
+                           # We dump and keep only inserts
+                           sqlite "$db" '.dump identities' | \
+                               awk '/^INSERT INTO/ {start = 1} {if (start == 1) print}' | \
+                               head -n -2 | \
+                               sed 's/^\(INSERT INTO identities \)/\1(identity_id, user_id, del, standard, name, organization, email, "reply-to", bcc, signature) /'
+                           echo 'COMMIT;' ) > $upgrade_tmp
+                       sqlite "$db" < $upgrade_tmp
+                       rm $upgrade_tmp
+                       echo "OK"
+                   fi
+                   ;;
+               *)
+                   # Do nothing
+                   ;;
+           esac
+       }
+
+       CONFFILE=/etc/roundcube/main.inc.php
+       touch $CONFFILE.ucftmp
+       chmod 640 $CONFFILE.ucftmp
+
+       db_get roundcube/hosts || true
+       hosts="$RET"
+       if [ "$hosts" != "" ]; then
+           hosts="array(\"$(echo $hosts | sed 's/ /\",\"/g')\")"
+       else
+           hosts="''"
+       fi
+
+       db_get roundcube/language || true
+       language="$RET"
+
+       # Get current 3DES key from /etc/roundcube/main.inc.php
+       [ -f /etc/roundcube/main.inc.php ] && {
+           deskey=$(sed -n "s+^\$rcmail_config\['des_key'\] = '\(.*\)';\$+\1+p" \
+               /etc/roundcube/main.inc.php)
+       }
+       # If this is the default key, forget it !
+       [ "$deskey" = "rcmail-!24ByteDESkey*Str" ] && unset deskey
+       # Generate a new one
+       while [ -z "$deskey" ]; do
+           deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | \
+               tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p')
+       done
+
+       # Put hosts, language and key in main.inc.php
+       cat /usr/share/roundcube/main.inc.php.dist | \
+           sed -e "s+^\(\$rcmail_config\['default_host'\] = \)''\(;\)\$+\1${hosts}\2+" \
+               -e "s+^\(\$rcmail_config\['des_key'\] = '\).*\(';\)\$+\1$deskey\2+" \
+               -e "s+^\(\$rcmail_config\['locale_string'\] = '\).*\(';\)\$+\1${language}\2+" >> $CONFFILE.ucftmp
+
+       ucf --debconf-ok $CONFFILE.ucftmp $CONFFILE
+       chown root:www-data $CONFFILE
+        rm -f $CONFFILE.ucftmp
+       
+       # Handle webserver reconfiguration/restart ; stolen from zabbix package
+       db_get roundcube/reconfigure-webserver || true
+       webservers="$RET"
+       restart=""
+
+       for webserver in $webservers; do
+            webserver=${webserver%,}
+            test -x /usr/sbin/$webserver || continue
+        
+            if [ ! -f /etc/$webserver/conf.d/roundcube ] && [ ! -h /etc/$webserver/conf.d/roundcube ]; then
+               ln -s /etc/roundcube/apache.conf /etc/$webserver/conf.d/roundcube
+            fi
+            restart="$restart $webserver"
+        done
+
+        db_get roundcube/restart-webserver || true
+       res="$RET"
+       db_stop || true
+       if [ "$res" = "true" ]; then
+            for webserver in $restart; do
+               webserver=${webserver%,}
+               if [ -x /usr/sbin/invoke-rc.d ]; then
+                    invoke-rc.d $webserver restart
+               else
+                    /etc/init.d/$webserver restart
+               fi
+            done
+       fi
+
+       chown -R www-data:adm /var/log/roundcube
+       chmod -R 750 /var/log/roundcube
+       chown -R www-data:www-data /var/lib/roundcube/temp
+       chmod -R 750 /var/lib/roundcube/temp
+       chown www-data:adm /var/lib/roundcube/skins
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/roundcube-core.postrm b/debian/roundcube-core.postrm
new file mode 100644 (file)
index 0000000..9159d97
--- /dev/null
@@ -0,0 +1,76 @@
+#!/bin/sh
+# postrm script for roundcube
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ -f /usr/share/debconf/confmodule ]; then
+        . /usr/share/debconf/confmodule
+fi
+if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
+        . /usr/share/dbconfig-common/dpkg/postrm 
+        dbc_go roundcube $@
+fi
+
+case "$1" in
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+    
+    remove)
+
+       # Handling web server reconfiguration
+       db_get roundcube/reconfigure-webserver
+        webservers="$RET"
+        restart=""
+        
+        for webserver in $webservers; do
+            webserver=${webserver%,}
+        
+            case "$webserver" in
+                apache|apache-perl|apache-ssl|apache2)
+                    rm -f /etc/$webserver/conf.d/roundcube
+                    test -x /usr/sbin/$webserver || continue
+                    restart="$restart $webserver"
+                    ;;
+                *)
+                    ;;
+            esac
+        done
+        
+        db_get roundcube/restart-webserver
+        res="$RET"
+        db_stop || true
+        if [ "$res" = "true" ]; then
+            for webserver in $restart; do
+                webserver=${webserver%,}
+                if [ -x /usr/sbin/invoke-rc.d ]; then
+                    invoke-rc.d $webserver restart
+                else
+                    /etc/init.d/$webserver restart
+                fi
+            done
+        fi
+    ;;
+
+    purge)
+        rm -f /etc/roundcube/debian-db.php
+        if which ucf >/dev/null 2>&1; then
+                ucf --purge /etc/roundcube/debian-db.php
+               ucf --purge /etc/roundcube/main.inc.php
+        fi
+       rm -f /etc/roundcube/main.inc.php
+       rm -rf /var/log/roundcube
+       rm -rf /var/lib/roundcube
+    ;;
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/roundcube-core.prerm b/debian/roundcube-core.prerm
new file mode 100644 (file)
index 0000000..5004518
--- /dev/null
@@ -0,0 +1,29 @@
+#!/bin/sh
+# prerm script for roundcube
+#
+# see: dh_installdeb(1)
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/dbconfig-common/dpkg/prerm 
+dbc_go roundcube $@
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+
index 4d4aaeac6fed7b7f123efc75306474dd5931be52..4c71ac6f99d456b1bd0d6c87e102c1ad2a61feef 100755 (executable)
@@ -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