[28272] in Source-Commits
cluster-login-config commit: Move to per-distro override files
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jun 18 18:16:01 2014
Date: Wed, 18 Jun 2014 18:15:54 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201406182215.s5IMFsfr032140@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/cluster-login-config/commit/ad575f42a18f68c388691972abf8b02b3d5660d4
commit ad575f42a18f68c388691972abf8b02b3d5660d4
Author: Jonathan Reed <jdreed@mit.edu>
Date: Wed Jun 18 17:50:38 2014 -0400
Move to per-distro override files
- Because of incompatible settings (I'm looking at you, Unity) and
deprecated ones, we need per-distro override files.
- Add code to rules file to create the actual override file at build
time based on the distro, and Depend on lsb-release
debian/changelog | 4 +++-
debian/control | 1 +
...bathena-cluster-login-config.gsettings-override | 19 -------------------
...cluster-login-config.gsettings-override.precise | 16 ++++++++++++++++
...-cluster-login-config.gsettings-override.trusty | 16 ++++++++++++++++
debian/rules | 11 +++++++++++
6 files changed, 47 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4c3aa18..d6c7025 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ debathena-cluster-login-config (1.41) UNRELEASED; urgency=low
* Depend on debathena-dconf-config
* Convert to dh7 and clean up maintainer scripts
* Remove stray c-p-d shell code from maintainer scripts
+ * Move to per-distro gsettings override files, selected at build time,
+ because Unity.
- -- Jonathan Reed <jdreed@mit.edu> Wed, 18 Jun 2014 18:05:34 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 18 Jun 2014 18:06:15 -0400
debathena-cluster-login-config (1.40) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2bb7818..e501d5d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ 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
diff --git a/debian/debathena-cluster-login-config.gsettings-override.precise b/debian/debathena-cluster-login-config.gsettings-override.precise
new file mode 100644
index 0000000..2dab4ce
--- /dev/null
+++ b/debian/debathena-cluster-login-config.gsettings-override.precise
@@ -0,0 +1,16 @@
+[org.gnome.desktop.screensaver]
+logout-enabled=true
+logout-delay=1200
+logout-command='/usr/share/debathena-cluster-login-config/screensaver_logout.sh'
+user-switch-enabled=false
+lock-delay=1
+lock-enabled=true
+
+[org.gnome.desktop.lockdown]
+disable-user-switching=true
+
+[org.gnome.settings-daemon.plugins.power]
+sleep-display-ac=600
+
+[com.canonical.Unity.Launcher]
+favorites=['nautilus-home.desktop', 'firefox.desktop', 'libreoffice-writer.desktop', 'libreoffice-calc.desktop', 'libreoffice-impress.desktop', 'gnome-terminal.desktop', 'ubuntu-software-center.desktop', 'gnome-control-center.desktop']
diff --git a/debian/debathena-cluster-login-config.gsettings-override b/debian/debathena-cluster-login-config.gsettings-override.trusty
similarity index 73%
rename from debian/debathena-cluster-login-config.gsettings-override
rename to debian/debathena-cluster-login-config.gsettings-override.trusty
index 9f4a923..ae8ada3 100644
--- a/debian/debathena-cluster-login-config.gsettings-override
+++ b/debian/debathena-cluster-login-config.gsettings-override.trusty
@@ -9,11 +9,8 @@ lock-enabled=true
[org.gnome.desktop.lockdown]
disable-user-switching=true
-[org.gnome.settings-daemon.plugins.power]
-sleep-display-ac=600
-
[com.canonical.Unity.Lenses]
disabled-scopes=['more_suggestions-amazon.scope', 'more_suggestions-u1ms.scope', 'more_suggestions-populartracks.scope', 'music-musicstore.scope', 'more_suggestions-ebay.scope', 'more_suggestions-ubuntushop.scope', 'more_suggestions-skimlinks.scope']
[com.canonical.Unity.Launcher]
-favorites=['application://nautilus.desktop', 'application://firefox.desktop', 'application://libreoffice-writer.desktop', 'application://libreoffice-calc.desktop', 'application://libreoffice-impress.desktop', 'application://xmoira.desktop', 'application://ubuntu-software-center.desktop', 'application://unity-control-center.desktop', 'unity://running-apps', 'unity://expo-icon', 'unity://devices']
+favorites=['application://nautilus.desktop', 'application://firefox.desktop', 'application://libreoffice-writer.desktop', 'application://libreoffice-calc.desktop', 'application://libreoffice-impress.desktop', 'application://gnome-terminal.desktop', 'application://ubuntu-software-center.desktop', 'application://unity-control-center.desktop', 'unity://running-apps', 'unity://expo-icon', 'unity://devices']
diff --git a/debian/rules b/debian/rules
index 9395393..0b79ca3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,18 @@
#!/usr/bin/make -f
+CODENAME = $(shell lsb_release -sc)
%:
dh $@ --with config-package
+debian/debathena-cluster-login-config.gsettings-override:
+ cp $@.$(CODENAME) $@
+
+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
