From 4d4db782441971ae0cd2873e3bec98791b61c0dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 20 Jan 2014 22:28:59 +0100 Subject: [PATCH] Fix concurrent use WITH_PAM and WITH_SHADOW in tdebase on Debian and Ubuntu --- debian/lenny/tdebase/debian/rules | 1 - debian/squeeze/tdebase/debian/rules | 1 - debian/wheezy/tdebase/debian/rules | 1 - ubuntu/maverick/tdebase/debian/rules | 1 - ubuntu/precise/tdebase/debian/rules | 1 - ubuntu/raring/tdebase/debian/rules | 1 - 6 files changed, 6 deletions(-) diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules index 015b236b2..ee6ffe6ce 100755 --- a/debian/lenny/tdebase/debian/rules +++ b/debian/lenny/tdebase/debian/rules @@ -38,7 +38,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -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" \ diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules index 64d9c11e1..4cd8ee87e 100755 --- a/debian/squeeze/tdebase/debian/rules +++ b/debian/squeeze/tdebase/debian/rules @@ -38,7 +38,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -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" \ diff --git a/debian/wheezy/tdebase/debian/rules b/debian/wheezy/tdebase/debian/rules index 64d9c11e1..4cd8ee87e 100755 --- a/debian/wheezy/tdebase/debian/rules +++ b/debian/wheezy/tdebase/debian/rules @@ -38,7 +38,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -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" \ diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index e0e3dd698..d33ef8289 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -38,7 +38,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -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" \ diff --git a/ubuntu/precise/tdebase/debian/rules b/ubuntu/precise/tdebase/debian/rules index e0e3dd698..d33ef8289 100755 --- a/ubuntu/precise/tdebase/debian/rules +++ b/ubuntu/precise/tdebase/debian/rules @@ -38,7 +38,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -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" \ diff --git a/ubuntu/raring/tdebase/debian/rules b/ubuntu/raring/tdebase/debian/rules index e0e3dd698..d33ef8289 100755 --- a/ubuntu/raring/tdebase/debian/rules +++ b/ubuntu/raring/tdebase/debian/rules @@ -38,7 +38,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -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" \