r1302 - in /experimental/evolution/debian: changelog control

[corsac at users.alioth.debian.org]

Author: corsac
Date: Fri Aug 14 06:35:06 2009
New Revision: 1302

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1302
Log:
upload

Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=1302&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Fri Aug 14 06:35:06 2009
@@ -1,13 +1,10 @@
-evolution (2.27.90-2) UNRELEASED; urgency=low
+evolution (2.27.90-2) experimental; urgency=low
 
   * debian/patches:
     - 01_fix-evolution-cal-shared-module added, don't build
-      libevolution-cal-shared.so as a module (and make it ship in the
-      correct package).                                         closes: #541195
-  * debian/control:
-    - make evolution conflict with evolution-dev (=2.27.90-1) for above fix.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 12 Aug 2009 18:50:29 +0200
+      libevolution-cal-shared.so as a module.                   closes: #541195
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 13 Aug 2009 23:18:47 +0200
 
 evolution (2.27.90-1) experimental; urgency=low
 

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=1302&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Fri Aug 14 06:35:06 2009
@@ -101,7 +101,6 @@
           evolution-plugins-experimental
 Provides: mail-reader,
           imap-client
-Conflicts: evolution-dev (= 2.27.90-1)
 Description: groupware suite with mail client and organizer
  Evolution is a groupware suite which integrates mail, calendar,
  address book, to-do list and memo tools.