Enable WITH_SUDO_KONSOLE_SUPER_USER_COMMAND on Ubuntu

This relates to Bug 853

6 files changed, 270 insertions, 24 deletions

diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules
index c3d424f10..96fa49923 100755
--- a/debian/lenny/tdebase/debian/rules
+++ b/debian/lenny/tdebase/debian/rules
@@ -19,10 +19,51 @@ DEB_KDE_APIDOX := yes
 
 CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
 
-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" -DWITH_GCC_VISIBILITY="ON" \
--DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_SENSORS="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_OPENGL="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="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_LIBRARY_PATH="/opt/trinity/lib" \
+ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
+ -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_GCC_VISIBILITY="ON" \
+ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
+ -DTDM_PAM_SERVICE="tdm-trinity" \
+ -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
+ -DWITH_USBIDS="/usr/share/misc/usb.ids" \
+ -DWITH_ARTS="ON" \
+ -DWITH_SHADOW="ON" \
+ -DWITH_PAM="ON" \
+ -DWITH_SASL="ON" \
+ -DWITH_SUDO_TDESU_BACKEND="OFF" \
+ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="OFF" \
+ -DWITH_LDAP="ON" \
+ -DWITH_SAMBA="ON" \
+ -DWITH_LIBRAW1394="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_XCOMPOSITE="ON" \
+ -DWITH_XCURSOR="ON" \
+ -DWITH_XFIXES="ON" \
+ -DWITH_XRANDR="ON" \
+ -DWITH_XINERAMA="ON" \
+ -DWITH_SENSORS="ON" \
+ -DWITH_HAL="OFF" \
+ -DWITH_TDEHWLIB="ON" \
+ -DWITH_XDMCP="ON" \
+ -DWITH_XRENDER="ON" \
+ -DWITH_XDAMAGE="ON" \
+ -DWITH_XEXT="ON" \
+ -DWITH_XTEST="ON" \
+ -DWITH_OPENGL="ON" \
+ -DWITH_XSCREENSAVER="ON" \
+ -DWITH_UPOWER="ON" \
+ -DWITH_LIBART="ON"
 
 # 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/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules
index c3d424f10..96fa49923 100755
--- a/debian/squeeze/tdebase/debian/rules
+++ b/debian/squeeze/tdebase/debian/rules
@@ -19,10 +19,51 @@ DEB_KDE_APIDOX := yes
 
 CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
 
-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" -DWITH_GCC_VISIBILITY="ON" \
--DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_SENSORS="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_OPENGL="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="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_LIBRARY_PATH="/opt/trinity/lib" \
+ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
+ -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_GCC_VISIBILITY="ON" \
+ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
+ -DTDM_PAM_SERVICE="tdm-trinity" \
+ -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
+ -DWITH_USBIDS="/usr/share/misc/usb.ids" \
+ -DWITH_ARTS="ON" \
+ -DWITH_SHADOW="ON" \
+ -DWITH_PAM="ON" \
+ -DWITH_SASL="ON" \
+ -DWITH_SUDO_TDESU_BACKEND="OFF" \
+ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="OFF" \
+ -DWITH_LDAP="ON" \
+ -DWITH_SAMBA="ON" \
+ -DWITH_LIBRAW1394="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_XCOMPOSITE="ON" \
+ -DWITH_XCURSOR="ON" \
+ -DWITH_XFIXES="ON" \
+ -DWITH_XRANDR="ON" \
+ -DWITH_XINERAMA="ON" \
+ -DWITH_SENSORS="ON" \
+ -DWITH_HAL="OFF" \
+ -DWITH_TDEHWLIB="ON" \
+ -DWITH_XDMCP="ON" \
+ -DWITH_XRENDER="ON" \
+ -DWITH_XDAMAGE="ON" \
+ -DWITH_XEXT="ON" \
+ -DWITH_XTEST="ON" \
+ -DWITH_OPENGL="ON" \
+ -DWITH_XSCREENSAVER="ON" \
+ -DWITH_UPOWER="ON" \
+ -DWITH_LIBART="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/debian/wheezy/tdebase/debian/rules b/debian/wheezy/tdebase/debian/rules
index c3d424f10..96fa49923 100755
--- a/debian/wheezy/tdebase/debian/rules
+++ b/debian/wheezy/tdebase/debian/rules
@@ -19,10 +19,51 @@ DEB_KDE_APIDOX := yes
 
 CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
 
-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" -DWITH_GCC_VISIBILITY="ON" \
--DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_SENSORS="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_OPENGL="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="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_LIBRARY_PATH="/opt/trinity/lib" \
+ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
+ -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_GCC_VISIBILITY="ON" \
+ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
+ -DTDM_PAM_SERVICE="tdm-trinity" \
+ -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
+ -DWITH_USBIDS="/usr/share/misc/usb.ids" \
+ -DWITH_ARTS="ON" \
+ -DWITH_SHADOW="ON" \
+ -DWITH_PAM="ON" \
+ -DWITH_SASL="ON" \
+ -DWITH_SUDO_TDESU_BACKEND="OFF" \
+ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="OFF" \
+ -DWITH_LDAP="ON" \
+ -DWITH_SAMBA="ON" \
+ -DWITH_LIBRAW1394="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_XCOMPOSITE="ON" \
+ -DWITH_XCURSOR="ON" \
+ -DWITH_XFIXES="ON" \
+ -DWITH_XRANDR="ON" \
+ -DWITH_XINERAMA="ON" \
+ -DWITH_SENSORS="ON" \
+ -DWITH_HAL="OFF" \
+ -DWITH_TDEHWLIB="ON" \
+ -DWITH_XDMCP="ON" \
+ -DWITH_XRENDER="ON" \
+ -DWITH_XDAMAGE="ON" \
+ -DWITH_XEXT="ON" \
+ -DWITH_XTEST="ON" \
+ -DWITH_OPENGL="ON" \
+ -DWITH_XSCREENSAVER="ON" \
+ -DWITH_UPOWER="ON" \
+ -DWITH_LIBART="ON"
 
 # 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/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index af7515161..1251ced7a 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -19,10 +19,51 @@ DEB_KDE_APIDOX := yes
 
 CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
 
-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" -DWITH_GCC_VISIBILITY="ON" \
--DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_SENSORS="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_OPENGL="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="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_LIBRARY_PATH="/opt/trinity/lib" \
+ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
+ -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_GCC_VISIBILITY="ON" \
+ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
+ -DTDM_PAM_SERVICE="tdm-trinity" \
+ -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
+ -DWITH_USBIDS="/usr/share/misc/usb.ids" \
+ -DWITH_ARTS="ON" \
+ -DWITH_SHADOW="ON" \
+ -DWITH_PAM="ON" \
+ -DWITH_SASL="ON" \
+ -DWITH_SUDO_TDESU_BACKEND="OFF" \
+ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="ON" \
+ -DWITH_LDAP="ON" \
+ -DWITH_SAMBA="ON" \
+ -DWITH_LIBRAW1394="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_XCOMPOSITE="ON" \
+ -DWITH_XCURSOR="ON" \
+ -DWITH_XFIXES="ON" \
+ -DWITH_XRANDR="ON" \
+ -DWITH_XINERAMA="ON" \
+ -DWITH_SENSORS="ON" \
+ -DWITH_HAL="OFF" \
+ -DWITH_TDEHWLIB="ON" \
+ -DWITH_XDMCP="ON" \
+ -DWITH_XRENDER="ON" \
+ -DWITH_XDAMAGE="ON" \
+ -DWITH_XEXT="ON" \
+ -DWITH_XTEST="ON" \
+ -DWITH_OPENGL="ON" \
+ -DWITH_XSCREENSAVER="ON" \
+ -DWITH_UPOWER="ON" \
+ -DWITH_LIBART="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/ubuntu/precise/tdebase/debian/rules b/ubuntu/precise/tdebase/debian/rules
index af7515161..1251ced7a 100755
--- a/ubuntu/precise/tdebase/debian/rules
+++ b/ubuntu/precise/tdebase/debian/rules
@@ -19,10 +19,51 @@ DEB_KDE_APIDOX := yes
 
 CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
 
-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" -DWITH_GCC_VISIBILITY="ON" \
--DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_SENSORS="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_OPENGL="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="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_LIBRARY_PATH="/opt/trinity/lib" \
+ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
+ -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_GCC_VISIBILITY="ON" \
+ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
+ -DTDM_PAM_SERVICE="tdm-trinity" \
+ -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
+ -DWITH_USBIDS="/usr/share/misc/usb.ids" \
+ -DWITH_ARTS="ON" \
+ -DWITH_SHADOW="ON" \
+ -DWITH_PAM="ON" \
+ -DWITH_SASL="ON" \
+ -DWITH_SUDO_TDESU_BACKEND="OFF" \
+ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="ON" \
+ -DWITH_LDAP="ON" \
+ -DWITH_SAMBA="ON" \
+ -DWITH_LIBRAW1394="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_XCOMPOSITE="ON" \
+ -DWITH_XCURSOR="ON" \
+ -DWITH_XFIXES="ON" \
+ -DWITH_XRANDR="ON" \
+ -DWITH_XINERAMA="ON" \
+ -DWITH_SENSORS="ON" \
+ -DWITH_HAL="OFF" \
+ -DWITH_TDEHWLIB="ON" \
+ -DWITH_XDMCP="ON" \
+ -DWITH_XRENDER="ON" \
+ -DWITH_XDAMAGE="ON" \
+ -DWITH_XEXT="ON" \
+ -DWITH_XTEST="ON" \
+ -DWITH_OPENGL="ON" \
+ -DWITH_XSCREENSAVER="ON" \
+ -DWITH_UPOWER="ON" \
+ -DWITH_LIBART="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/ubuntu/raring/tdebase/debian/rules b/ubuntu/raring/tdebase/debian/rules
index af7515161..1251ced7a 100755
--- a/ubuntu/raring/tdebase/debian/rules
+++ b/ubuntu/raring/tdebase/debian/rules
@@ -19,10 +19,51 @@ DEB_KDE_APIDOX := yes
 
 CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
 
-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" -DWITH_GCC_VISIBILITY="ON" \
--DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_SENSORS="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_OPENGL="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="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_LIBRARY_PATH="/opt/trinity/lib" \
+ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
+ -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_GCC_VISIBILITY="ON" \
+ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
+ -DTDM_PAM_SERVICE="tdm-trinity" \
+ -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
+ -DWITH_USBIDS="/usr/share/misc/usb.ids" \
+ -DWITH_ARTS="ON" \
+ -DWITH_SHADOW="ON" \
+ -DWITH_PAM="ON" \
+ -DWITH_SASL="ON" \
+ -DWITH_SUDO_TDESU_BACKEND="OFF" \
+ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="ON" \
+ -DWITH_LDAP="ON" \
+ -DWITH_SAMBA="ON" \
+ -DWITH_LIBRAW1394="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_XCOMPOSITE="ON" \
+ -DWITH_XCURSOR="ON" \
+ -DWITH_XFIXES="ON" \
+ -DWITH_XRANDR="ON" \
+ -DWITH_XINERAMA="ON" \
+ -DWITH_SENSORS="ON" \
+ -DWITH_HAL="OFF" \
+ -DWITH_TDEHWLIB="ON" \
+ -DWITH_XDMCP="ON" \
+ -DWITH_XRENDER="ON" \
+ -DWITH_XDAMAGE="ON" \
+ -DWITH_XEXT="ON" \
+ -DWITH_XTEST="ON" \
+ -DWITH_OPENGL="ON" \
+ -DWITH_XSCREENSAVER="ON" \
+ -DWITH_UPOWER="ON" \
+ -DWITH_LIBART="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.