Imported Debian patch 0.1~rc2-4

diff --git a/debian/changelog b/debian/changelog
index 2dc4fc54555d8064b9433bd7741bdca7636de91b..18bbd909f5bea81e96cd62be96ecb82ac2680c8d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+roundcube (0.1~rc2-4) unstable; urgency=low
+
+  * Thightened dependencies for a safe upgrade
+  * Finally removed any circular dependency, -db packages no longer pull
+    a full roundcube install
+
+ -- Romain Beauxis <toots@rastageeks.org>  Sun, 09 Dec 2007 14:24:24 +0100
+
 roundcube (0.1~rc2-3) unstable; urgency=low
 
   * Upload to unstable

diff --git a/debian/control b/debian/control
index e4f8894b6f19e473148584d90676d29e5584caa9..804ca983500629333de80c99cf4446d2c2ed7396 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,8 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube
 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}
+Replaces: roundcube
+Conflicts: roundcube (<< 0.1~rc2-2)
 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
@@ -39,7 +41,7 @@ Description: skinnable AJAX based webmail solution for IMAP servers
 
 Package: roundcube-mysql
 Architecture: all
-Depends: roundcube, php5-mysql, mysql-client | virtual-mysql-client
+Depends: php5-mysql, mysql-client | virtual-mysql-client
 Suggests: mysql-server
 Provides: roundcube-db
 Description: virtual package providing MySQL dependencies for RoundCube
@@ -49,7 +51,7 @@ Description: virtual package providing MySQL dependencies for RoundCube
 
 Package: roundcube-pgsql
 Architecture: all
-Depends: roundcube, php5-pgsql, postgresql-client-8.1 | postgresql-client 
+Depends: php5-pgsql, postgresql-client-8.1 | postgresql-client 
 Suggests: postgresql-server
 Provides: roundcube-db
 Description: virtual package providing PostgreSQL dependencies for RoundCube
@@ -59,7 +61,7 @@ Description: virtual package providing PostgreSQL dependencies for RoundCube
 
 Package: roundcube-sqlite
 Architecture: all
-Depends: roundcube, php5-sqlite, sqlite
+Depends: php5-sqlite, sqlite
 Provides: roundcube-db
 Description: virtual package providing sqlite dependencies for RoundCube
  This package provides sqlite dependencies for RoundCube Webmail, a

diff --git a/debian/control.in b/debian/control.in
index 5a1b72088141fc4f1d5b1bd04ff5ec0cd9d3c742..9849b2b60e3021780bdb157b85107ed3aaef81f0 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,6 +13,8 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube
 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}
+Replaces: roundcube
+Conflicts: roundcube (<< 0.1~rc2-2)
 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
@@ -39,7 +41,7 @@ Description: skinnable AJAX based webmail solution for IMAP servers
 
 Package: roundcube-mysql
 Architecture: all
-Depends: roundcube, php5-mysql, mysql-client | virtual-mysql-client
+Depends: php5-mysql, mysql-client | virtual-mysql-client
 Suggests: mysql-server
 Provides: roundcube-db
 Description: virtual package providing MySQL dependencies for RoundCube
@@ -49,7 +51,7 @@ Description: virtual package providing MySQL dependencies for RoundCube
 
 Package: roundcube-pgsql
 Architecture: all
-Depends: roundcube, php5-pgsql, postgresql-client-8.1 | postgresql-client 
+Depends: php5-pgsql, postgresql-client-8.1 | postgresql-client 
 Suggests: postgresql-server
 Provides: roundcube-db
 Description: virtual package providing PostgreSQL dependencies for RoundCube
@@ -59,7 +61,7 @@ Description: virtual package providing PostgreSQL dependencies for RoundCube
 
 Package: roundcube-sqlite
 Architecture: all
-Depends: roundcube, php5-sqlite, sqlite
+Depends: php5-sqlite, sqlite
 Provides: roundcube-db
 Description: virtual package providing sqlite dependencies for RoundCube
  This package provides sqlite dependencies for RoundCube Webmail, a