diff --git a/debian/lenny/tdepim/debian/rules b/debian/lenny/tdepim/debian/rules
index 18064fe1a..697e9b0b2 100755
--- a/debian/lenny/tdepim/debian/rules
+++ b/debian/lenny/tdepim/debian/rules
@@ -17,10 +17,35 @@ include debian/cdbs/debian-qt-kde.mk
 
 DEB_KDE_APIDOX := yes
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DBUILD_ALL="ON" -DBUILD_KITCHENSYNC="ON" \
--DWITH_ARTS="ON" -DWITH_SASL="ON" -DWITH_NEWDISTRLISTS="ON" -DWITH_GNOKII="OFF" -DWITH_EXCHANGE="ON" -DWITH_EGROUPWARE="ON" -DWITH_KOLAB="ON" -DWITH_SLOX="ON" -DWITH_GROUPWISE="ON" -DWITH_FEATUREPLAN="ON" -DWITH_GROUPDAV="ON" -DWITH_BIRTHDAYS="ON" -DWITH_NEWEXCHANGE="ON" -DWITH_SCALIX="ON" -DWITH_CALDAV="ON" -DWITH_CARDDAV="ON" -DWITH_INDEXLIB="ON" -DWITH_XSCREENSAVER="ON" \
--DCMAKE_BUILD_TYPE=RelWithDebInfo
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DLIB_SUFFIX="" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DBUILD_KITCHENSYNC="ON" \
+ -DWITH_ARTS="ON" \
+ -DWITH_SASL="ON" \
+ -DWITH_NEWDISTRLISTS="ON" \
+ -DWITH_GNOKII="OFF" \
+ -DWITH_EXCHANGE="ON" \
+ -DWITH_EGROUPWARE="ON" \
+ -DWITH_KOLAB="ON" \
+ -DWITH_SLOX="ON" \
+ -DWITH_GROUPWISE="ON" \
+ -DWITH_FEATUREPLAN="ON" \
+ -DWITH_GROUPDAV="ON" \
+ -DWITH_BIRTHDAYS="ON" \
+ -DWITH_NEWEXCHANGE="ON" \
+ -DWITH_SCALIX="ON" \
+ -DWITH_CALDAV="ON" \
+ -DWITH_CARDDAV="ON" \
+ -DWITH_INDEXLIB="ON" \
+ -DWITH_XSCREENSAVER="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/debian/squeeze/tdepim/debian/rules b/debian/squeeze/tdepim/debian/rules
index 25005d459..db5c42cdb 100755
--- a/debian/squeeze/tdepim/debian/rules
+++ b/debian/squeeze/tdepim/debian/rules
@@ -17,10 +17,35 @@ include debian/cdbs/debian-qt-kde.mk
 
 DEB_KDE_APIDOX := yes
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DBUILD_ALL="ON" -DBUILD_KITCHENSYNC="ON" \
--DWITH_ARTS="ON" -DWITH_SASL="ON" -DWITH_NEWDISTRLISTS="ON" -DWITH_GNOKII="OFF" -DWITH_EXCHANGE="ON" -DWITH_EGROUPWARE="ON" -DWITH_KOLAB="ON" -DWITH_SLOX="ON" -DWITH_GROUPWISE="ON" -DWITH_FEATUREPLAN="ON" -DWITH_GROUPDAV="ON" -DWITH_BIRTHDAYS="ON" -DWITH_NEWEXCHANGE="ON" -DWITH_SCALIX="ON" -DWITH_CALDAV="ON" -DWITH_CARDDAV="ON" -DWITH_INDEXLIB="ON" -DWITH_XSCREENSAVER="ON" \
--DCMAKE_BUILD_TYPE=RelWithDebInfo
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DLIB_SUFFIX="" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DBUILD_KITCHENSYNC="ON" \
+ -DWITH_ARTS="ON" \
+ -DWITH_SASL="ON" \
+ -DWITH_NEWDISTRLISTS="ON" \
+ -DWITH_GNOKII="OFF" \
+ -DWITH_EXCHANGE="ON" \
+ -DWITH_EGROUPWARE="ON" \
+ -DWITH_KOLAB="ON" \
+ -DWITH_SLOX="ON" \
+ -DWITH_GROUPWISE="ON" \
+ -DWITH_FEATUREPLAN="ON" \
+ -DWITH_GROUPDAV="ON" \
+ -DWITH_BIRTHDAYS="ON" \
+ -DWITH_NEWEXCHANGE="ON" \
+ -DWITH_SCALIX="ON" \
+ -DWITH_CALDAV="ON" \
+ -DWITH_CARDDAV="ON" \
+ -DWITH_INDEXLIB="ON" \
+ -DWITH_XSCREENSAVER="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules
index 25005d459..db5c42cdb 100755
--- a/ubuntu/maverick/tdepim/debian/rules
+++ b/ubuntu/maverick/tdepim/debian/rules
@@ -17,10 +17,35 @@ include debian/cdbs/debian-qt-kde.mk
 
 DEB_KDE_APIDOX := yes
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DBUILD_ALL="ON" -DBUILD_KITCHENSYNC="ON" \
--DWITH_ARTS="ON" -DWITH_SASL="ON" -DWITH_NEWDISTRLISTS="ON" -DWITH_GNOKII="OFF" -DWITH_EXCHANGE="ON" -DWITH_EGROUPWARE="ON" -DWITH_KOLAB="ON" -DWITH_SLOX="ON" -DWITH_GROUPWISE="ON" -DWITH_FEATUREPLAN="ON" -DWITH_GROUPDAV="ON" -DWITH_BIRTHDAYS="ON" -DWITH_NEWEXCHANGE="ON" -DWITH_SCALIX="ON" -DWITH_CALDAV="ON" -DWITH_CARDDAV="ON" -DWITH_INDEXLIB="ON" -DWITH_XSCREENSAVER="ON" \
--DCMAKE_BUILD_TYPE=RelWithDebInfo
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DLIB_SUFFIX="" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DBUILD_KITCHENSYNC="ON" \
+ -DWITH_ARTS="ON" \
+ -DWITH_SASL="ON" \
+ -DWITH_NEWDISTRLISTS="ON" \
+ -DWITH_GNOKII="OFF" \
+ -DWITH_EXCHANGE="ON" \
+ -DWITH_EGROUPWARE="ON" \
+ -DWITH_KOLAB="ON" \
+ -DWITH_SLOX="ON" \
+ -DWITH_GROUPWISE="ON" \
+ -DWITH_FEATUREPLAN="ON" \
+ -DWITH_GROUPDAV="ON" \
+ -DWITH_BIRTHDAYS="ON" \
+ -DWITH_NEWEXCHANGE="ON" \
+ -DWITH_SCALIX="ON" \
+ -DWITH_CALDAV="ON" \
+ -DWITH_CARDDAV="ON" \
+ -DWITH_INDEXLIB="ON" \
+ -DWITH_XSCREENSAVER="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.