[28297] in Source-Commits
cluster-login-config commit: Drop support for gdm and gconf2; wrap Depends
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sat Jul 5 13:01:27 2014
Date: Sat, 5 Jul 2014 13:01:19 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201407051701.s65H1JF0014553@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/cluster-login-config/commit/c3b39cf9333075e60f503612332eb87f0edca0d6
commit c3b39cf9333075e60f503612332eb87f0edca0d6
Author: Jonathan Reed <jdreed@mit.edu>
Date: Thu Jul 3 13:10:51 2014 -0400
Drop support for gdm and gconf2; wrap Depends
debathena-cluster is now only supported on releases that support
lightdm, so drop all our gdm code, along with all gconf2 support
(you must support gsettings)
Wrap the Depends field, and depend on lightdm-config now
debian/changelog | 3 +-
debian/control | 16 +++++++++++--
.../debathena-cluster-login-config.gconf-defaults | 1 -
.../debathena-cluster-login-config.gconf-mandatory | 8 -------
debian/debathena-cluster-login-config.prerm | 23 --------------------
debian/debathena-cluster-login-config.transform | 1 -
debian/rules | 3 --
debian/transform_gdm.debathena.debathena | 2 -
8 files changed, 15 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 00cd16a..ab712f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ debathena-cluster-login-config (1.42) UNRELEASED; urgency=low
single file, which is now correctly located in /var/lib/polkit-1
* Add groups to the pkla files to support disabling suspend and
hibernate via logind (upower is now deprecated)
+ * Drop support for gdm
- -- Jonathan Reed <jdreed@mit.edu> Tue, 01 Jul 2014 12:48:06 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 03 Jul 2014 13:18:55 -0400
debathena-cluster-login-config (1.41) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e501d5d..857a30c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,17 +5,27 @@ Maintainer: Debathena Project <debathena@mit.edu>
Build-Depends: debhelper (>= 7.0.50~),
config-package-dev (>= 5.0~),
system-services,
- debathena-gdm-config,
lsb-release,
Standards-Version: 3.9.3
Package: debathena-cluster-login-config
Architecture: all
Pre-Depends: dpkg (>= 1.15.7.2~)
-Depends: ${misc:Depends}, debathena-afs-config, debathena-gdm-config, debathena-kiosk, gconf2, gnome-screensaver, update-notifier-common, debathena-machtype (>= 10.0.2-0debathena1~), python-dbus, grub-common, sudo (>= 1.7.2p1-1~), dconf-cli | dconf-tools, debathena-dconf-config
+Depends: ${misc:Depends},
+ debathena-afs-config,
+ debathena-lightdm-config,
+ debathena-kiosk,
+ gnome-screensaver,
+ update-notifier-common,
+ debathena-machtype (>= 10.0.2-0debathena1~),
+ python-dbus,
+ grub-common,
+ sudo (>= 1.7.2p1-1~),
+ dconf-cli | dconf-tools,
+ debathena-dconf-config,
Provides: ${diverted-files}
Conflicts: ${diverted-files}
-Breaks: debathena-reactivate (<< 2~), gdm (<< 2.25.2~)
+Breaks: debathena-reactivate (<< 2~)
X-Debathena-Build-For: precise trusty
Description: Login configuration for Athena cluster machines
This package sets up a login policy for Athena cluster machines by
diff --git a/debian/debathena-cluster-login-config.gconf-defaults b/debian/debathena-cluster-login-config.gconf-defaults
deleted file mode 100644
index 4656e65..0000000
--- a/debian/debathena-cluster-login-config.gconf-defaults
+++ /dev/null
@@ -1 +0,0 @@
-/desktop/gnome/session/required_components/windowmanager "metacity"
diff --git a/debian/debathena-cluster-login-config.gconf-mandatory b/debian/debathena-cluster-login-config.gconf-mandatory
deleted file mode 100644
index 3ad4ff9..0000000
--- a/debian/debathena-cluster-login-config.gconf-mandatory
+++ /dev/null
@@ -1,8 +0,0 @@
-/apps/gnome-screensaver/logout_enabled true
-/apps/gnome-screensaver/logout_delay 20
-/apps/gnome-screensaver/logout_command "/usr/share/debathena-cluster-login-config/screensaver_logout.sh"
-/apps/gnome-screensaver/user_switch_enabled false
-/apps/gnome-screensaver/lock_enabled true
-/apps/gnome-screensaver/lock_delay 1
-/apps/gnome-power-manager/timeout/sleep_display_ac 600
-/desktop/gnome/lockdown/disable_user_switching true
diff --git a/debian/debathena-cluster-login-config.prerm b/debian/debathena-cluster-login-config.prerm
index 3d45c52..1fc5bfd 100755
--- a/debian/debathena-cluster-login-config.prerm
+++ b/debian/debathena-cluster-login-config.prerm
@@ -41,29 +41,6 @@ case "$1" in
initctl stop "tty$i" >/dev/null 2>&1 || true
initctl start "tty$i" >/dev/null 2>&1 || true
done
-
- # Undo our mandatory gconf settings.
- gcsrc=xml:readwrite:/etc/gconf/gconf.xml.mandatory
- gcunset="gconftool-2 --direct --config-source=$gcsrc --unset"
- $gcunset /apps/gnome-screensaver/logout_enabled
- $gcunset /apps/gnome-screensaver/logout_delay
- $gcunset /apps/gnome-screensaver/logout_command
- $gcunset /apps/gnome-screensaver/embedded_keyboard_command
- $gcunset /apps/gnome-screensaver/embedded_keyboard_enabled
- $gcunset /apps/gnome-screensaver/user_switch_enabled
- $gcunset /apps/gnome-screensaver/lock_enabled
- $gcunset /apps/gnome-screensaver/lock_delay
- $gcunset /apps/fast-user-switch-applet/show_active_users_only
- $gcunset /apps/fast-user-switch-applet/show_guest_login
- $gcunset /apps/gnome-power-manager/general/can_hibernate
- $gcunset /apps/gnome-power-manager/general/can_suspend
- $gcunset /desktop/gnome/lockdown/disable_user_switching
- $gcunset /apps/gnome-power-manager/timeout/sleep_display_ac
-
- # Undo our default gconf settings.
- gcsrc=xml:readwrite:/etc/gconf/gconf.xml.defaults
- gcunset="gconftool-2 --direct --config-source=$gcsrc --unset"
- $gcunset /desktop/gnome/session/required_components/windowmanager
;;
failed-upgrade)
diff --git a/debian/debathena-cluster-login-config.transform b/debian/debathena-cluster-login-config.transform
deleted file mode 100644
index 8974b50..0000000
--- a/debian/debathena-cluster-login-config.transform
+++ /dev/null
@@ -1 +0,0 @@
-/etc/pam.d/gdm.debathena.debathena debian/transform_gdm.debathena.debathena
diff --git a/debian/rules b/debian/rules
index 0b79ca3..35a0db8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,5 @@ override_dh_clean:
dh_clean
rm -f debian/debathena-cluster-login-config.gsettings-override
-override_dh_gconf:
- dh_gconf --priority 90
-
override_dh_auto_build: debian/debathena-cluster-login-config.gsettings-override
dh_auto_build
diff --git a/debian/transform_gdm.debathena.debathena b/debian/transform_gdm.debathena.debathena
deleted file mode 100755
index fa6deff..0000000
--- a/debian/transform_gdm.debathena.debathena
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/perl -0p
-s/^(#%PAM-[\d\.]+$)/$1\nauth\trequired\tpam_succeed_if.so user != root quiet/m or die;
