diff --git a/debian/lenny/tdepim/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdepim/debian/cdbs/debian-qt-kde.mk
index ec89756bb..4fd113539 100644
--- a/debian/lenny/tdepim/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/tdepim/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,7 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control
index 29682c28c..91c283957 100644
--- a/debian/lenny/tdepim/debian/control
+++ b/debian/lenny/tdepim/debian/control
@@ -52,7 +52,22 @@ Section: devel
 Architecture: any
 Replaces: kdepim-trinity-dev (<< 4:14.0.0~)
 Breaks: kdepim-trinity-dev (<< 4:14.0.0~)
-Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-tderesources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version})
+Depends: kaddressbook-trinity (= ${Source-Version}),
+ kalarm-trinity (= ${Source-Version}),
+ tdepim-tderesources-trinity (= ${Source-Version}),
+ kmail-trinity (= ${Source-Version}),
+ knotes-trinity (= ${Source-Version}),
+ kontact-trinity (= ${Source-Version}),
+ korganizer-trinity (= ${Source-Version}),
+ libkpimidentities1-trinity (= ${Source-Version}),
+ libkcal2-trinity-dev (= ${Source-Version}), libical-dev,
+ libtdepim1-trinity-dev (= ${Source-Version}),
+ libkgantt0-trinity-dev (= ${Source-Version}),
+ libkleopatra1-trinity-dev (= ${Source-Version}),
+ libkpimexchange1-trinity-dev (= ${Source-Version}),
+ libksieve0-trinity-dev (= ${Source-Version}),
+ libktnef1-trinity-dev (= ${Source-Version}),
+ libmimelib1-trinity-dev (= ${Source-Version})
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile tdepim applications.
  .
diff --git a/debian/squeeze/tdepim/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdepim/debian/cdbs/debian-qt-kde.mk
index ec89756bb..4fd113539 100644
--- a/debian/squeeze/tdepim/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/tdepim/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,7 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/tdepim/debian/control b/debian/squeeze/tdepim/debian/control
index 29682c28c..91c283957 100644
--- a/debian/squeeze/tdepim/debian/control
+++ b/debian/squeeze/tdepim/debian/control
@@ -52,7 +52,22 @@ Section: devel
 Architecture: any
 Replaces: kdepim-trinity-dev (<< 4:14.0.0~)
 Breaks: kdepim-trinity-dev (<< 4:14.0.0~)
-Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-tderesources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version})
+Depends: kaddressbook-trinity (= ${Source-Version}),
+ kalarm-trinity (= ${Source-Version}),
+ tdepim-tderesources-trinity (= ${Source-Version}),
+ kmail-trinity (= ${Source-Version}),
+ knotes-trinity (= ${Source-Version}),
+ kontact-trinity (= ${Source-Version}),
+ korganizer-trinity (= ${Source-Version}),
+ libkpimidentities1-trinity (= ${Source-Version}),
+ libkcal2-trinity-dev (= ${Source-Version}), libical-dev,
+ libtdepim1-trinity-dev (= ${Source-Version}),
+ libkgantt0-trinity-dev (= ${Source-Version}),
+ libkleopatra1-trinity-dev (= ${Source-Version}),
+ libkpimexchange1-trinity-dev (= ${Source-Version}),
+ libksieve0-trinity-dev (= ${Source-Version}),
+ libktnef1-trinity-dev (= ${Source-Version}),
+ libmimelib1-trinity-dev (= ${Source-Version})
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile tdepim applications.
  .
diff --git a/debian/wheezy/tdepim/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/tdepim/debian/cdbs/debian-qt-kde.mk
index ec89756bb..4fd113539 100644
--- a/debian/wheezy/tdepim/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/tdepim/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,7 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/wheezy/tdepim/debian/control b/debian/wheezy/tdepim/debian/control
index 29682c28c..91c283957 100644
--- a/debian/wheezy/tdepim/debian/control
+++ b/debian/wheezy/tdepim/debian/control
@@ -52,7 +52,22 @@ Section: devel
 Architecture: any
 Replaces: kdepim-trinity-dev (<< 4:14.0.0~)
 Breaks: kdepim-trinity-dev (<< 4:14.0.0~)
-Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-tderesources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version})
+Depends: kaddressbook-trinity (= ${Source-Version}),
+ kalarm-trinity (= ${Source-Version}),
+ tdepim-tderesources-trinity (= ${Source-Version}),
+ kmail-trinity (= ${Source-Version}),
+ knotes-trinity (= ${Source-Version}),
+ kontact-trinity (= ${Source-Version}),
+ korganizer-trinity (= ${Source-Version}),
+ libkpimidentities1-trinity (= ${Source-Version}),
+ libkcal2-trinity-dev (= ${Source-Version}), libical-dev,
+ libtdepim1-trinity-dev (= ${Source-Version}),
+ libkgantt0-trinity-dev (= ${Source-Version}),
+ libkleopatra1-trinity-dev (= ${Source-Version}),
+ libkpimexchange1-trinity-dev (= ${Source-Version}),
+ libksieve0-trinity-dev (= ${Source-Version}),
+ libktnef1-trinity-dev (= ${Source-Version}),
+ libmimelib1-trinity-dev (= ${Source-Version})
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile tdepim applications.
  .
diff --git a/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk
index ec89756bb..4fd113539 100644
--- a/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,7 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index a91c9afc6..3c343d047 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -52,7 +52,22 @@ Section: devel
 Architecture: any
 Replaces: kdepim-kde3-dev (<< 4:14.0.0~), kdepim-trinity-dev (<< 4:14.0.0~)
 Breaks: kdepim-kde3-dev (<< 4:14.0.0~), kdepim-trinity-dev (<< 4:14.0.0~)
-Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-tderesources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version})
+Depends: kaddressbook-trinity (= ${Source-Version}),
+ kalarm-trinity (= ${Source-Version}),
+ tdepim-tderesources-trinity (= ${Source-Version}),
+ kmail-trinity (= ${Source-Version}),
+ knotes-trinity (= ${Source-Version}),
+ kontact-trinity (= ${Source-Version}),
+ korganizer-trinity (= ${Source-Version}),
+ libkpimidentities1-trinity (= ${Source-Version}),
+ libkcal2-trinity-dev (= ${Source-Version}), libical-dev,
+ libtdepim1-trinity-dev (= ${Source-Version}),
+ libkgantt0-trinity-dev (= ${Source-Version}),
+ libkleopatra1-trinity-dev (= ${Source-Version}),
+ libkpimexchange1-trinity-dev (= ${Source-Version}),
+ libksieve0-trinity-dev (= ${Source-Version}),
+ libktnef1-trinity-dev (= ${Source-Version}),
+ libmimelib1-trinity-dev (= ${Source-Version})
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile tdepim applications.
  .
diff --git a/ubuntu/precise/tdepim/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdepim/debian/cdbs/debian-qt-kde.mk
index ec89756bb..4fd113539 100644
--- a/ubuntu/precise/tdepim/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/tdepim/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,7 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/ubuntu/precise/tdepim/debian/control b/ubuntu/precise/tdepim/debian/control
index a91c9afc6..3c343d047 100644
--- a/ubuntu/precise/tdepim/debian/control
+++ b/ubuntu/precise/tdepim/debian/control
@@ -52,7 +52,22 @@ Section: devel
 Architecture: any
 Replaces: kdepim-kde3-dev (<< 4:14.0.0~), kdepim-trinity-dev (<< 4:14.0.0~)
 Breaks: kdepim-kde3-dev (<< 4:14.0.0~), kdepim-trinity-dev (<< 4:14.0.0~)
-Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-tderesources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version})
+Depends: kaddressbook-trinity (= ${Source-Version}),
+ kalarm-trinity (= ${Source-Version}),
+ tdepim-tderesources-trinity (= ${Source-Version}),
+ kmail-trinity (= ${Source-Version}),
+ knotes-trinity (= ${Source-Version}),
+ kontact-trinity (= ${Source-Version}),
+ korganizer-trinity (= ${Source-Version}),
+ libkpimidentities1-trinity (= ${Source-Version}),
+ libkcal2-trinity-dev (= ${Source-Version}), libical-dev,
+ libtdepim1-trinity-dev (= ${Source-Version}),
+ libkgantt0-trinity-dev (= ${Source-Version}),
+ libkleopatra1-trinity-dev (= ${Source-Version}),
+ libkpimexchange1-trinity-dev (= ${Source-Version}),
+ libksieve0-trinity-dev (= ${Source-Version}),
+ libktnef1-trinity-dev (= ${Source-Version}),
+ libmimelib1-trinity-dev (= ${Source-Version})
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile tdepim applications.
  .
diff --git a/ubuntu/raring/tdepim/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdepim/debian/cdbs/debian-qt-kde.mk
index ec89756bb..4fd113539 100644
--- a/ubuntu/raring/tdepim/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/tdepim/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,7 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/ubuntu/raring/tdepim/debian/control b/ubuntu/raring/tdepim/debian/control
index a91c9afc6..3c343d047 100644
--- a/ubuntu/raring/tdepim/debian/control
+++ b/ubuntu/raring/tdepim/debian/control
@@ -52,7 +52,22 @@ Section: devel
 Architecture: any
 Replaces: kdepim-kde3-dev (<< 4:14.0.0~), kdepim-trinity-dev (<< 4:14.0.0~)
 Breaks: kdepim-kde3-dev (<< 4:14.0.0~), kdepim-trinity-dev (<< 4:14.0.0~)
-Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-tderesources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version})
+Depends: kaddressbook-trinity (= ${Source-Version}),
+ kalarm-trinity (= ${Source-Version}),
+ tdepim-tderesources-trinity (= ${Source-Version}),
+ kmail-trinity (= ${Source-Version}),
+ knotes-trinity (= ${Source-Version}),
+ kontact-trinity (= ${Source-Version}),
+ korganizer-trinity (= ${Source-Version}),
+ libkpimidentities1-trinity (= ${Source-Version}),
+ libkcal2-trinity-dev (= ${Source-Version}), libical-dev,
+ libtdepim1-trinity-dev (= ${Source-Version}),
+ libkgantt0-trinity-dev (= ${Source-Version}),
+ libkleopatra1-trinity-dev (= ${Source-Version}),
+ libkpimexchange1-trinity-dev (= ${Source-Version}),
+ libksieve0-trinity-dev (= ${Source-Version}),
+ libktnef1-trinity-dev (= ${Source-Version}),
+ libmimelib1-trinity-dev (= ${Source-Version})
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile tdepim applications.
  .