New upstream release.

Seems to work, should check for licences of new files.

diff --git a/debian/changelog b/debian/changelog
index 65b237dc44e1537a1d02145b26dcda1a6eae72ed..3752ba2035f034bc5d2d83a58fca19242a615f15 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+roundcube (0.1~rc1~dfsg-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Vincent Bernat <bernat@luffy.cx>  Sun, 20 May 2007 13:59:44 +0200
+
 roundcube (0.1~beta2.2~dfsg-3) unstable; urgency=low
 
   * Fixed dh_link calls

diff --git a/debian/dirs b/debian/dirs
index c337f5d358760ac813d0528322960bbabe81ba15..2bcbe8c8985b7fb7a921130fcced91ead94c3a44 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,5 +1,8 @@
 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

diff --git a/debian/patches/correct_install_path.patch b/debian/patches/correct_install_path.patch
index 1b134027dd4bd89bd2ccfa1636c2b22a2eda7314..35d8eafcfdd15950cbd9247caec9f9d720053678 100644 (file)
--- a/debian/patches/correct_install_path.patch
+++ b/debian/patches/correct_install_path.patch
@@ -1,9 +1,9 @@
---- roundcube-0.1~beta2.2/index.php    2006-12-22 23:26:24.000000000 +0100
-+++ roundcube-0.1~beta2.2/index.php    2007-03-13 15:36:21.000000000 +0100
-@@ -46,7 +46,7 @@
- $CHARSET = 'UTF-8';
+--- 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 @@
+ 
+ // define global vars
  $OUTPUT_TYPE = 'html';
- $JS_OBJECT_NAME = 'rcmail';
 -$INSTALL_PATH = dirname(__FILE__);
 +$INSTALL_PATH = '/var/lib/roundcube';
  $MAIN_TASKS = array('mail','settings','addressbook','logout');

diff --git a/debian/patches/dbconfig-common_support.patch b/debian/patches/dbconfig-common_support.patch
index 0394533ce8322d18367cc918bc640597db83c9f7..8e1f71d3ba2e7a330ab80ffd3806a4bd90c2d00b 100644 (file)
--- 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, sqlite
+-// currentyl suported db_providers: mysql, pgsql, sqlite
 -
 -$rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
 -// postgres example: 'pgsql://roundcube:pass@localhost/roundcubemail';

diff --git a/debian/patches/rfc2822_date.patch b/debian/patches/rfc2822_date.patch
deleted file mode 100644 (file)
index a5b63a0..0000000
--- a/debian/patches/rfc2822_date.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- roundcubemail-0.1beta2/program/steps/mail/sendmail.inc~    2006-08-01 00:51:23.000000000 +0200
-+++ roundcubemail-0.1beta2/program/steps/mail/sendmail.inc     2007-04-08 14:58:54.000000000 +0200
-@@ -107,7 +107,7 @@
-   $identity_arr['string'] = $from;
- 
- // compose headers array
--$headers = array('Date' => date('D, j M Y G:i:s O'),
-+$headers = array('Date' => date('D, j M Y H:i:s O'),
-                  'From' => $identity_arr['string'],
-                  'To'   => rcube_charset_convert($mailto, $input_charset, $message_charset));
- 

diff --git a/debian/patches/series b/debian/patches/series
index a03f782d5a872b066711cf8cc967a15d14083996..d9c2b5e56c3fba7d3deddf888f0649d7c59210c2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 dbconfig-common_support.patch
 correct_install_path.patch
 use_mcrypt.patch
-rfc2822_date.patch

diff --git a/debian/rules b/debian/rules
index 45303c3a218ca87b00ed73f0acb618f50b15fd8d..763ae525322f91afd35248bfd8b0fb405768e5a0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,10 +25,13 @@ binary-install/roundcube::
        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 empty tables for each db type
+       # 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/sqlite.initial.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/sqlite     
+       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
        # 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