[pkg-horde] [COMMIT lionel horde--sid--3--patch-12] add conflict to turba2 (<< 3.1)

[Lionel Elie Mamane]

A  {arch}/horde/horde--sid/horde--sid--3/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-12
M  debian/changelog
M  debian/control

--- /dev/null
+++ {arch}/horde/horde--sid/horde--sid--3/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-12
@@ -0,0 +1,12 @@
+Revision: horde--sid--3--patch-12
+Archive: pkg-horde-hackers at lists.alioth.debian.org--2006
+Creator: Lionel Elie Mamane <lionel at mamane.lu>
+Date: Fri Mar 31 23:09:20 CEST 2006
+Standard-date: 2006-03-31 21:09:20 GMT
+Modified-files: debian/changelog debian/control
+New-patches: pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3--patch-12
+Summary: add conflict to turba2 (<< 3.1)
+Keywords: 
+
+ Conflict with versions of turba2 we break compatibility with.
+ (closes: #360231)


--- orig/debian/changelog
+++ mod/debian/changelog
@@ -1,3 +1,11 @@
+horde3 (3.1-2) UNRELEASED; urgency=low
+
+  [ Lionel Elie Mamane <lmamane at debian.org> ]
+  * Conflict with versions of turba2 we break compatibility with.
+    (closes: #360231)
+
+ -- Lionel Elie Mamane <lmamane at debian.org>  Fri, 31 Mar 2006 23:08:02 +0200
+
 horde3 (3.1-1) unstable; urgency=low
 
   [ Lionel Elie Mamane <lmamane at debian.org> ]


--- orig/debian/control
+++ mod/debian/control
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, libapache2-mod-php4 (>= 4:4.3.10) | libapache-mod-php4 (>= 4:4.3.10) | libapache2-mod-php5 | libapache-mod-php5 | phpapi-20041030 | phpapi-20020918 | phpapi-20050606, php-log | php4-pear (<< 4:4.3.2+rc3-1) | php4-pear-log, php4-pear | php5-pear, apache | apache2 | apache-ssl | httpd, php4-domxml | php5-domxml
 Recommends: php4-mysql | php5-mysql | php5-pgsql | php4-pgsql | php4-ldap | php5-ldap, logrotate, php-file, php-date, php-mail-mime, php-mail, php-services-weather, php4-gd | php5-gd | php4-gd2, php4-mcrypt
 Suggests: imp4, turba2, php4-cli, gollem, webcpp, chora2, xlhtml, ppthtml, wv, source-highlight, enscript, rpm, php4-mhash
-Conflicts: horde
+Conflicts: horde, turba2 (<< 2.1)
 Description: horde web application framework
  The Horde Framework is written in PHP, and provides the common
  tools a Web application requires: classes for dealing with preferences,