Use Breaks instead of Conflicts to move files from older roundcube

installations.

diff --git a/debian/changelog b/debian/changelog
index 642ede115c9c92a9b6b9efbe1b610ef8a6811608..c286dbd1982a7ea8d5068dc6faafcebfaf61068e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ roundcube (0.3.1-4) unstable; urgency=low
     in README.Debian. Closes: #584458, #582894.
   * Bump Standards-Version. No changes required.
   * Switch to 3.0 (quilt) format.
+  * Use Breaks instead of Conflicts to move files from older roundcube
+    installations.
 
  -- Vincent Bernat <bernat@debian.org>  Sat, 17 Jul 2010 17:23:30 +0200
 

diff --git a/debian/control b/debian/control
index 5284247d37b5c032d3672719a431290775be9dcd..bc79c1a78ec4380b463244136262bbc0827cdaca 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Architecture: all
 Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1, php5-pspell, libjs-jquery (>= 1.3.3)
 Suggests: php-auth-sasl
 Replaces: roundcube
-Conflicts: roundcube (<< 0.1~rc2-2)
+Breaks: 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

diff --git a/debian/control.in b/debian/control.in
index 70be04e987a99c9deaa2e00d35863bcd27131770..a0772fec74c7f683ef7aac05cb699e9b49dace98 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,7 +14,7 @@ Architecture: all
 Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1, php5-pspell, libjs-jquery (>= 1.3.3)
 Suggests: php-auth-sasl
 Replaces: roundcube
-Conflicts: roundcube (<< 0.1~rc2-2)
+Breaks: 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