Merge lp:~robert-ancell/unity-system-compositor/lightdm-conf.d into lp:unity-system-compositor

[Robert Ancell]

Use lighdm.conf.d instead of debconf

Use /etc/lightdm/lightdm.conf.d which is supported in lightdm >= 1.7.3. Makes it simpler to have package dependent configuration.

[lp:~robert-ancell/unity-system-compositor/lightdm-conf.d]

30. By Robert Ancell on 2013-06-21

Add missing files

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:30
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-system-compositor-ci/9/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

It doesn't do quite the same thing as the debconf question, but I don't think that's a problem. People can always disable unity-system-compositor by deleting/commenting the conf.d snippet.

review: Approve

=== added file 'debian/10-unity-system-compositor.conf'
--- debian/10-unity-system-compositor.conf	1970-01-01 00:00:00 +0000
+++ debian/10-unity-system-compositor.conf	2013-06-21 03:12:24 +0000
@@ -0,0 +1,2 @@
+[SeatDefaults]
+type=unity
 
=== removed file 'debian/config'
--- debian/config	2013-06-13 04:02:29 +0000
+++ debian/config	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-db_input low unity-system-compositor/enable || true
-db_go
 
=== added file 'debian/install'
--- debian/install	1970-01-01 00:00:00 +0000
+++ debian/install	2013-06-21 03:12:24 +0000
@@ -0,0 +1,1 @@
+debian/10-unity-system-compositor.conf /etc/lightdm/lightdm.conf.d
 
=== removed directory 'debian/po'
=== removed file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	2013-06-13 04:02:29 +0000
+++ debian/po/POTFILES.in	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-[type: gettext/rfc822deb] templates
 
=== removed file 'debian/po/templates.pot'
--- debian/po/templates.pot	2013-06-13 04:02:29 +0000
+++ debian/po/templates.pot	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: unity-system-compositor\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2013-06-12 14:47+1000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "Use Unity system compositor?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"The Unity system compositor provides improved graphical smoothness to "
-"startup, user-switching, and shutdown."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"If the system compositor is enabled, but fails to work, LightDM will fall "
-"back to a regular session. It should be safe to enable the system compositor."
-msgstr ""
 
=== removed file 'debian/postinst'
--- debian/postinst	2013-06-13 04:02:29 +0000
+++ debian/postinst	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-
-db_get unity-system-compositor/enable
-
-# Update LightDM defaults to match debconf, respecting any manual changes
-if [ "$RET" = "true" ]; then
-    # --keep-old will only change the type if there is not already a type set
-    /usr/lib/lightdm/lightdm-set-defaults --keep-old --type=unity
-else
-    # --remove will only remove if the type is currently set to "unity"
-    # Will exit with status 4 if the user has changed the value, so ignore that.
-    /usr/lib/lightdm/lightdm-set-defaults --remove --type=unity || [ $? = 4 ]
-fi
-
-#DEBHELPER#
 
=== removed file 'debian/templates'
--- debian/templates	2013-06-13 04:02:29 +0000
+++ debian/templates	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-Template: unity-system-compositor/enable
-Type: boolean
-Default: true
-_Description: Use Unity system compositor?
- The Unity system compositor provides improved graphical smoothness to startup,
- user-switching, and shutdown.
- .
- If the system compositor is enabled, but fails to work, LightDM will fall back
- to a regular session. It should be safe to enable the system compositor.