[28270] in Source-Commits
cluster-login-config commit: Remove unused dconf profile; rename site snippets
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jun 18 18:15:59 2014
Date: Wed, 18 Jun 2014 18:15:53 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201406182215.s5IMFrM9032092@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/cluster-login-config/commit/d5fb68971809185d69c2decaedb3cfec14e70565
commit d5fb68971809185d69c2decaedb3cfec14e70565
Author: Jonathan Reed <jdreed@mit.edu>
Date: Fri Jun 13 16:12:28 2014 -0400
Remove unused dconf profile; rename site snippets
- Remove the dconf user profile, another package will
provide it. (Due to 4ca10f2d being added after the changelog
for 1.40 was finalized, 1.40 did not actually install these,
so we do not need to rm_conffile them.)
- Rename the site db snippets to the package name, and
change the prefix from 00 to 10, in case we ship a base config
later
- After installation, we must call "dconf update" to rebuild
the binary databases. We need to depend on dconf-cli for this
(which is still called dconf-tools in Precise)
debian/00-athena | 2 --
debian/00-athena-locks | 1 -
debian/10-cluster-login-config | 2 ++
debian/10-cluster-login-config-locks | 1 +
debian/changelog | 3 ++-
debian/control | 2 +-
debian/debathena-cluster-login-config.install | 5 ++---
debian/debathena-cluster-login-config.postinst | 4 ++++
debian/user | 2 --
9 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/debian/00-athena b/debian/10-cluster-login-config
similarity index 100%
rename from debian/00-athena
rename to debian/10-cluster-login-config
diff --git a/debian/00-athena-locks b/debian/10-cluster-login-config-locks
similarity index 100%
rename from debian/00-athena-locks
rename to debian/10-cluster-login-config-locks
diff --git a/debian/changelog b/debian/changelog
index 5f61853..818a1ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ debathena-cluster-login-config (1.41) UNRELEASED; urgency=low
* Update getty.debathena to work with logind (which has replaced
ConsoleKit in Trusty) (Trac: #1482)
+ * This version actually includes the dconf locks described in 1.40
- -- Jonathan Reed <jdreed@mit.edu> Fri, 13 Jun 2014 16:16:36 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 13 Jun 2014 16:21:23 -0400
debathena-cluster-login-config (1.40) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d124794..158baf0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.3
Package: debathena-cluster-login-config
Architecture: all
-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~)
+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
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Breaks: debathena-reactivate (<< 2~), gdm (<< 2.25.2~)
diff --git a/debian/debathena-cluster-login-config.install b/debian/debathena-cluster-login-config.install
index 70a9979..9cea4ad 100644
--- a/debian/debathena-cluster-login-config.install
+++ b/debian/debathena-cluster-login-config.install
@@ -6,7 +6,6 @@ debian/disable-suspend.pkla etc/polkit-1/localauthority/30-site.d
debian/disable-hibernate.pkla etc/polkit-1/localauthority/30-site.d
debian/50_debathena-cluster etc/grub.d
debian/debathena-cluster-login-config-sudoers etc/sudoers.d
-debian/user etc/dconf/profile
-debian/00-athena etc/dconf/db/athena.d
-debian/00-athena-locks etc/dconf/db/athena.d/locks
+debian/10-cluster-login-config etc/dconf/db/athena.d
+debian/10-cluster-login-config-locks etc/dconf/db/athena.d/locks
debian/99-athena.conf usr/share/lightdm/lightdm.conf.d
diff --git a/debian/debathena-cluster-login-config.postinst b/debian/debathena-cluster-login-config.postinst
index 0fe87a7..2d7626c 100644
--- a/debian/debathena-cluster-login-config.postinst
+++ b/debian/debathena-cluster-login-config.postinst
@@ -133,6 +133,10 @@ case "$1" in
# Sadly, dh_installsudoers is not a thing.
chmod 0440 /etc/sudoers.d/debathena-cluster-login-config-sudoers
+ # Call dconf update to rebuild the binary dconf databases
+ # from the snippet files we installed
+ dconf update
+
exit 0
;;
diff --git a/debian/user b/debian/user
deleted file mode 100644
index ffb94ac..0000000
--- a/debian/user
+++ /dev/null
@@ -1,2 +0,0 @@
-user-db:user
-system-db:athena
