2 files changed, 3 insertions, 8 deletions
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index 6967dbe4c..ce2e72016 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -116,7 +116,6 @@ Architecture: any
 Replaces: kaddressbook-trinity (<< 4:14.0.0)
 Breaks: kaddressbook-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity
 Description: KDE NG addressbook application
  KAddressBook is the main address book application for KDE; it enables you
@@ -174,7 +173,6 @@ Section: utils
 Architecture: any
 Replaces: karm-trinity (<< 4:14.0.0)
 Breaks: karm-trinity (<< 4:14.0.0)
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Depends: ${shlibs:Depends}
 Description: Trinity time tracker tool
  KArm is a time tracker for busy people who need to keep track of the amount of
@@ -274,7 +272,6 @@ Breaks: kmail-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
 Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Provides: imap-client, mail-reader
 Description: Trinity Email client
  KMail is a fully-featured email client that fits nicely into the KDE
@@ -325,7 +322,6 @@ Replaces: knotes-trinity (<< 4:14.0.0)
 Breaks: knotes-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: tdepim-kresources-trinity
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Description: Trinity sticky notes
  KNotes is a program that lets you write sticky notes. The notes are saved
  automatically when you exit the program, and they display when you open the
@@ -389,7 +385,6 @@ Replaces: korganizer-trinity (<< 4:14.0.0)
 Breaks: korganizer-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: kghostview-trinity
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Description: Trinity personal organizer
  This package contains KOrganizer, a calendar and scheduling program.
  .
@@ -518,7 +513,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkdepim1-trinity-dev (<< 4:14.0.0)
 Breaks: libkdepim1-trinity-dev (<< 4:14.0.0)
-Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.7)
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libtdepim-trinity
  library.
diff --git a/ubuntu/maverick/tdepim/debian/control.in b/ubuntu/maverick/tdepim/debian/control.in
index 88bd2e756..3b45c48d0 100644
--- a/ubuntu/maverick/tdepim/debian/control.in
+++ b/ubuntu/maverick/tdepim/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Ubuntu Core developers <[email protected]>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake1.9,
- cdparanoia, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), bison, byacc, bzip2,
+ cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, liblockdev1-dev,
@@ -481,7 +481,7 @@ Description: KDE PIM library
 Package: libtdepim1-dev
 Section: libdevel
 Architecture: any
-Depends: libtdepim1a (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libtdepim1a (= ${Source-Version}), tdelibs4-dev
 Replaces: tdepim-dev (<< 4:3.4.1)
 Description: KDE PIM library [development]
  This is the development package which contains the headers for the libtdepim