diff -Nru lightdm-gtk-greeter-2.0.1/debian/01_ubuntu.conf lightdm-gtk-greeter-2.0.1/debian/01_ubuntu.conf
--- lightdm-gtk-greeter-2.0.1/debian/01_ubuntu.conf	1969-12-31 19:00:00.000000000 -0500
+++ lightdm-gtk-greeter-2.0.1/debian/01_ubuntu.conf	2015-06-05 19:26:13.000000000 -0400
@@ -0,0 +1,15 @@
+# Ubuntu specific defaults
+#
+
+[greeter]
+background=/usr/share/backgrounds/warty-final-ubuntu.png
+theme-name=Ambiance
+icon-theme-name=LoginIcons
+font-name=Ubuntu 11
+xft-antialias=true
+xft-dpi=96
+xft-hintstyle=slight
+xft-rgba=rgb
+show-indicators=~host;~spacer;~session;~language;~a11y;~clock;~power;
+show-clock=true
+clock-format=%d %b, %H:%M
diff -Nru lightdm-gtk-greeter-2.0.1/debian/60-lightdm-gtk-greeter.conf lightdm-gtk-greeter-2.0.1/debian/60-lightdm-gtk-greeter.conf
--- lightdm-gtk-greeter-2.0.1/debian/60-lightdm-gtk-greeter.conf	1969-12-31 19:00:00.000000000 -0500
+++ lightdm-gtk-greeter-2.0.1/debian/60-lightdm-gtk-greeter.conf	2014-07-05 05:06:23.000000000 -0400
@@ -0,0 +1,2 @@
+[SeatDefaults]
+greeter-session=lightdm-gtk-greeter
diff -Nru lightdm-gtk-greeter-2.0.1/debian/changelog lightdm-gtk-greeter-2.0.1/debian/changelog
--- lightdm-gtk-greeter-2.0.1/debian/changelog	2015-05-21 17:25:41.000000000 -0400
+++ lightdm-gtk-greeter-2.0.1/debian/changelog	2015-06-15 06:45:03.000000000 -0400
@@ -1,3 +1,30 @@
+lightdm-gtk-greeter (2.0.1-1ubuntu1) wily; urgency=low
+
+  [ Sean Davis ]
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/01_ubuntu.conf
+      + Renamed from lightdm-gtk-greeter-ubuntu.conf
+      + Removed unneeded comments
+    - debian/control, debian/rules:
+      + Add Indicators support.
+    - debian/control:
+      + Build-Depends on liblightdm-gobject-1-dev instead on
+        liblightdm-gobject-dev as it's non-existing in archive.
+    - debian/copyright:
+      + Update copyright for lightdm-gtk-greeter, it's been a long time
+        since lightdm housed all of the greeters
+    - debian/01_ubuntu.conf,
+      debian/lightdm-gtk-greeter.{post,pre}{inst,rm},
+      debian/60-lightdm-gtk-greeter.conf:
+      + Install and remove Ubuntu conf files.
+    - debian/lightdm-gtk-greeter.{preinst,prerm,postinstpostrm}
+      + Migrate post-1.0.0 configuration to conf.d/01_ubuntu.conf
+      + Do not use update-alternatives for lightdm-gtk-greeter config
+    - debian/rules
+      + Install lightdm and lightdm-gtk-greeter configuration
+
+ -- Sean Davis <smd.seandavis@gmail.com>  Fri, 05 Jun 2015 20:20:00 -0400
+
 lightdm-gtk-greeter (2.0.1-1) unstable; urgency=medium
 
   * New upstream release:
@@ -37,6 +64,34 @@
 
  -- Yves-Alexis Perez <corsac@debian.org>  Fri, 13 Mar 2015 22:40:19 +0100
 
+lightdm-gtk-greeter (2.0.0-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release, fixes:
+    - lightdm-gtk-greeter leaves a11y (at-spi*) process behind (LP: #1366534)
+    - Indicator services restart after every resume (LP: #1377743)
+    - No indicators displayed when systemd-sysv is installed (LP: #1398619)
+  * debian/control:
+    - Update Standards-Version to 3.9.6
+  * debian/copyright:
+    - Update copyright for lightdm-gtk-greeter, it's been a long time
+      since lightdm housed all of the greeters
+  * debian/lightdm-gtk-greeter-ubuntu.conf
+    - Refresh configuration template, fix appearance in Ubuntu
+  * debian/rules
+    - Drop obsolete configure argument
+
+ -- Sean Davis <smd.seandavis@gmail.com>  Sun, 15 Feb 2015 22:26:56 -0500
+
+lightdm-gtk-greeter (1.9.0-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release,
+    - Fixes AccountsService logon background conflict (LP: #1306362)
+    - Fixes Login screen wallpaper doesn't fill screen (LP: #1325719)
+    - Fixes user-supplied default user image (LP: #1317236)
+    - Fixes mouse-cursor theme changing after logon (LP: #1024482)
+
+ -- Sean Davis <smd.seandavis@gmail.com>  Wed, 20 Aug 2014 19:39:03 -0400
+
 lightdm-gtk-greeter (1.8.5-2) unstable; urgency=medium
 
   * debian/control, debian/copyright:
@@ -47,6 +102,40 @@
 
  -- Yves-Alexis Perez <corsac@debian.org>  Fri, 21 Nov 2014 18:03:40 +0100
 
+lightdm-gtk-greeter (1.8.5-1ubuntu2) utopic; urgency=medium
+
+  * Fix indicator support (LP: #1336727)
+    - debian/changelog:
+      + Build-Depends on libido3-0.1-dev
+
+ -- Sean Davis <smd.seandavis@gmail.com>  Wed, 02 Jul 2014 06:20:58 -0400
+
+lightdm-gtk-greeter (1.8.5-1ubuntu1) utopic; urgency=low
+
+  * Merge from Debian unstable. (LP: #1320830) Remaining changes:
+    - debian/control, debian/rules:
+      + Add Indicators support.
+    - debian/control:
+      + Build-Depends on liblightdm-gobject-1-dev instead on
+        liblightdm-gobject-dev as it's non-existing in archive.
+      + Fix binary-control-field-duplicates-source lintian tag.
+    - debian/copyright:
+      + Fix wiki-copyright-format-uri lintian tag.
+      + Fix obsolete-field-in-dep5-copyright lintian tags.
+      + Add missing license information.
+    - debian/lightdm-gtk-greeter-ubuntu.conf,
+      debian/lightdm-gtk-greeter.install,
+      debian/lightdm-gtk-greeter.{post,pre}{inst,rm},
+      debian/60-lightdm-gtk-greeter.conf:
+      + Install and remove Ubuntu conf files.
+    - debian/lightdm-gtk-greeter-ubuntu.conf, debian/rules:
+      + Updated per new template, replaced deprecated
+        "show-indicators" key.
+    - debian/patches/04_default-gtk-greeter-config.patch:
+      + Disabled, not used in Ubuntu.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Sat, 07 Jun 2014 15:45:56 +0200
+
 lightdm-gtk-greeter (1.8.5-1) unstable; urgency=medium
 
   * New upstream release.
@@ -59,6 +148,13 @@
 
  -- Yves-Alexis Perez <corsac@debian.org>  Tue, 22 Apr 2014 23:15:46 +0200
 
+lightdm-gtk-greeter (1.8.4-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release (LP: #1299397)
+    - Really fix exit bug (LP: #1290575)
+
+ -- Sean Davis <smd.seandavis@gmail.com>  Sat, 29 Mar 2014 05:51:45 -0400
+
 lightdm-gtk-greeter (1.8.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -68,12 +164,87 @@
 
  -- Yves-Alexis Perez <corsac@debian.org>  Tue, 25 Mar 2014 22:01:50 +0100
 
+lightdm-gtk-greeter (1.8.3-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release (LP: #1291913)
+    - Now correctly exits when logging in (LP: #1290575)
+
+ -- Sean Davis <smd.seandavis@gmail.com>  Thu, 13 Mar 2014 06:35:23 -0400
+
+lightdm-gtk-greeter (1.8.2-1ubuntu1) trusty; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/rules:
+      + add indicators to dh_auto_configure
+    - debian/control:
+      + add depends for indicator support
+      + add depends for liblightdm-gobject-1-dev (ubuntu naming is different)
+      + fix binary-control-field-duplicates-source lintian tag
+    - debian/copyright:
+      + fix wiki-copyright-format-uri lintian tag
+      + fix obsolete-field-in-dep5-copyright lintian tags
+      + add missing license information
+    - debian/lightdm-gtk-greeter-ubuntu.conf,
+    - debian/lightdm-gtk-greeter.install,
+    - debian/lightdm-gtk-greeter.{post,pre}{inst,rm},
+    - debian/60-lightdm-gtk-greeter.conf:
+      + install and remove ubuntu conf files 
+  * New upstream release (LP: #1286949).
+    - Fixes segfault on uninstalled session (LP: #1272910)
+    - Prefer the system default language over English (LP: #1276072)
+    - Remember last session and language per user (LP: #1282139)
+  * debian/lightdm-gtk-greeter-ubuntu.conf:
+    - Updated per new template, replaced deprecated "show-indicators" key
+  * debian/patches/update-session-language.patch:
+    - Removed as fix is included upstream in 1.8.2
+
+ -- Sean Davis <smd.seandavis@gmail.com>  Sun, 02 Mar 2014 19:43:01 -0500
+
 lightdm-gtk-greeter (1.8.2-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Sun, 02 Mar 2014 16:35:35 +0100
 
+lightdm-gtk-greeter (1.8.1-1ubuntu2) trusty; urgency=medium
+
+  [ Thaddäus Tintenfisch ]
+  * debian/patches/update-session-language.patch:
+    - Always update preselected session and language when another
+      user is selected (LP: #1282139).
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Sun, 02 Mar 2014 18:05:00 +0100
+
+lightdm-gtk-greeter (1.8.1-1ubuntu1) trusty; urgency=medium
+
+  [ Sean Davis ]
+  * Merge from debian experimental (LP: #1280670), remaining changes:
+    - debian/rules:
+      + add indicators to dh_auto_configure
+    - debian/control:
+      + add depends for indicator support
+      + add depends for liblightdm-gobject-1-dev (ubuntu naming is different)
+      + fix binary-control-field-duplicates-source lintian tag
+    - debian/copyright:
+      + fix wiki-copyright-format-uri lintian tag
+      + fix obsolete-field-in-dep5-copyright lintian tags
+    - debian/lightdm-gtk-greeter-ubuntu.conf,
+    - debian/lightdm-gtk-greeter.install,
+    - debian/lightdm-gtk-greeter.{post,pre}{inst,rm},
+    - debian/60-lightdm-gtk-greeter.conf,
+      + install and remove ubuntu conf files 
+  * debian/lightdm-gtk-greeter-ubuntu.conf:
+    - updated hints from 1.8 template file
+    - use new indicator loading for language, session, power indicators
+  * Remove debian patches:
+    - 04_default-gtk-greeter-config.patch: not used in ubuntu
+    - 07_fix-NULL-username.patch: patch was included upstream, no longer used
+
+  [ Dmitry Shachnev ]
+  * Add missing license information to debian/copyright.
+
+ -- Sean Davis <smd.seandavis@gmail.com>  Tue, 18 Feb 2014 04:29:53 -0500
+
 lightdm-gtk-greeter (1.8.1-1) experimental; urgency=medium
 
   * New upstream release.
@@ -158,6 +329,37 @@
 
  -- Yves-Alexis Perez <corsac@debian.org>  Sat, 21 Sep 2013 23:40:56 +0200
 
+lightdm-gtk-greeter (1.6.1-0ubuntu3) trusty; urgency=low
+
+  * debian/60-lightdm-gtk-greeter.conf,
+    debian/lightdm-gtk-greeter.install:
+    - Let lightdm-gtk-greeter take precedence over unity-greeter
+      (LP: #1275807).
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Mon, 03 Feb 2014 16:54:00 +0100
+
+lightdm-gtk-greeter (1.6.1-0ubuntu2) trusty; urgency=low
+
+  * debian/40-lightdm-gtk-greeter.conf:
+  * debian/lightdm-gtk-greeter.install:
+  * debian/lightdm-gtk-greeter.postinst:
+  * debian/lightdm-gtk-greeter.postrm:
+    - Install lightdm configuration for greeter instead of using deprecated
+      lightdm-set-defaults (LP: #1257372)
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Tue, 10 Dec 2013 09:08:05 +1300
+
+lightdm-gtk-greeter (1.6.1-0ubuntu1) saucy; urgency=low
+
+  [ Sean Davis ]
+  * New upstream release. (LP: #1226921)
+    - Fix inability to change session/language on logout (lp: #1213837)
+
+  [ Daniel Holbach ]
+  * d/watch: updated.
+
+ -- Sean Davis <smd.seandavis@gmail.com>  Tue, 17 Sep 2013 23:01:53 -0400
+
 lightdm-gtk-greeter (1.6.0-1) unstable; urgency=low
 
   * New upstream release.
@@ -172,6 +374,14 @@
 
  -- Yves-Alexis Perez <corsac@debian.org>  Mon, 03 Jun 2013 22:55:50 +0200
 
+lightdm-gtk-greeter (1.6.0-0ubuntu1) saucy; urgency=low
+
+  * New upstream release.
+  * debian/control: update standards version, add exo-utils dependency
+  * debian/lightdm-gtk-greeter-ubuntu.conf: update for new Ubuntu defaults
+
+ -- Sean Davis <smd.seandavis@gmail.com>  Fri, 05 Jul 2013 21:34:49 -0400
+
 lightdm-gtk-greeter (1.5.1-3) unstable; urgency=low
 
   * debian/control:
@@ -195,6 +405,20 @@
 
  -- Yves-Alexis Perez <corsac@debian.org>  Sun, 07 Apr 2013 14:34:20 +0200
 
+lightdm-gtk-greeter (1.5.1-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+  * debian/rules: disable silent rules.
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Sun, 10 Feb 2013 20:18:44 +0100
+
+lightdm-gtk-greeter (1.5.0-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+  * debian/control: bump liblightdm-gobject-1-dev b-dep to >= 1.3.5.
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Thu, 24 Jan 2013 16:10:33 +0100
+
 lightdm-gtk-greeter (1.3.1-1) experimental; urgency=low
 
   * New upstream release.
@@ -203,6 +427,30 @@
 
  -- Yves-Alexis Perez <corsac@debian.org>  Sun, 07 Oct 2012 09:38:09 +0200
 
+lightdm-gtk-greeter (1.3.1-0ubuntu2) raring; urgency=low
+
+  * debian/lightdm-gtk-greeter-ubuntu.conf:
+    - Show the language chooser by default (LP: #803858).
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Mon, 15 Oct 2012 21:59:00 +0200
+
+lightdm-gtk-greeter (1.3.1-0ubuntu1) quantal; urgency=low
+
+  * New upstream bugfix release, including ui fixes:
+    - don't hide action buttons when auth is cancelled
+    - don't show the cancel button with the userlist view (only useful in the
+      'greeter-hide-users' view).
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Thu, 30 Aug 2012 20:16:39 +0200
+
+lightdm-gtk-greeter (1.3.0-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+  * debian/patches:
+    - 09_show_lang_chooser_option.patch: dropped, applied upstream.
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Thu, 23 Aug 2012 19:52:36 +0200
+
 lightdm-gtk-greeter (1.1.6-2) unstable; urgency=low
 
   * debian/patches:
@@ -219,6 +467,14 @@
 
  -- Yves-Alexis Perez <corsac@debian.org>  Mon, 21 May 2012 21:40:54 +0200
 
+lightdm-gtk-greeter (1.1.6-0ubuntu1) quantal; urgency=low
+
+  * New upstream bugfix release, including:
+    - Fix 'Large Font' option for fontnames containing spaces lp: #908926
+    - Fix 'Cancel' button action, and clear the error label. lp: #983152
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Sun, 01 Jul 2012 13:16:54 +0200
+
 lightdm-gtk-greeter (1.1.5-2) unstable; urgency=low
 
   * Upload to unstable.
@@ -237,3 +493,4 @@
   * Initial release.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Fri, 06 Apr 2012 21:42:53 +0200
+
diff -Nru lightdm-gtk-greeter-2.0.1/debian/control lightdm-gtk-greeter-2.0.1/debian/control
--- lightdm-gtk-greeter-2.0.1/debian/control	2015-03-08 17:33:57.000000000 -0400
+++ lightdm-gtk-greeter-2.0.1/debian/control	2015-06-05 19:44:11.000000000 -0400
@@ -1,12 +1,14 @@
 Source: lightdm-gtk-greeter
 Section: x11
 Priority: optional
-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
+Maintainer: Xubuntu Developers <xubuntu-devel@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni@debian.org>, 
  Yves-Alexis Perez <corsac@debian.org>, Emanuele Rocca <ema@debian.org>, 
  Simon Huggins <huggie@earth.li>          
 Build-Depends: debhelper (>= 9), pkg-config, libgtk-3-dev, 
-  liblightdm-gobject-dev (>= 1.3.5), intltool, autotools-dev
+  liblightdm-gobject-1-dev (>= 1.3.5), intltool, autotools-dev,
+  libido3-0.1-dev, libindicator3-dev
 Standards-Version: 3.9.6
 Homepage: https://launchpad.net/lightdm-gtk-greeter
 Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm-gtk-greeter
diff -Nru lightdm-gtk-greeter-2.0.1/debian/copyright lightdm-gtk-greeter-2.0.1/debian/copyright
--- lightdm-gtk-greeter-2.0.1/debian/copyright	2014-06-11 15:25:00.000000000 -0400
+++ lightdm-gtk-greeter-2.0.1/debian/copyright	2015-05-22 00:26:24.000000000 -0400
@@ -1,125 +1,12 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: lightdm
-Upstream-Source: https://launchpad.net/lightdm
+Upstream-Name: lightdm-gtk-greeter
+Upstream-Source: https://launchpad.net/lightdm-gtk-greeter
 
-Files: debian/*
-Copyright: © 2010 Yves-Alexis Perez <corsac@debian.org>
-License: GPL-2
-
-Files: ./greeters/gtk/lightdm-gtk-greeter.c
- ./src/configuration.c
- ./src/configuration.h
- ./src/display-manager.c
- ./src/display-manager.h
- ./src/display-server.c
- ./src/display-server.h
- ./src/display.c
- ./src/display.h
- ./src/dmrc.c
- ./src/dmrc.h
- ./src/greeter.c
- ./src/greeter.h
- ./src/guest-account.c
- ./src/guest-account.h
- ./src/lightdm.c
- ./src/pam-session.c
- ./src/pam-session.h
- ./src/plymouth.c
- ./src/plymouth.h
- ./src/process.c
- ./src/process.h
- ./src/seat-xdmcp-session.c
- ./src/seat-xdmcp-session.h
- ./src/seat-xlocal.c
- ./src/seat-xlocal.h
- ./src/seat.c
- ./src/seat.h
- ./src/session.c
- ./src/session.h
- ./src/user.c
- ./src/user.h
- ./src/vt.c
- ./src/vt.h
- ./src/xauthority.c
- ./src/xauthority.h
- ./src/xdisplay.c
- ./src/xdisplay.h
- ./src/xdmcp-protocol.c
- ./src/xdmcp-protocol.h
- ./src/xdmcp-server.c
- ./src/xdmcp-server.h
- ./src/xdmcp-session-private.h
- ./src/xdmcp-session.c
- ./src/xdmcp-session.h
- ./src/xserver-local.c
- ./src/xserver-local.h
- ./src/xserver-remote.c
- ./src/xserver-remote.h
- ./src/xserver.c
- ./src/xserver.h
- ./src/xsession.c
- ./src/xsession.h
+Files: *
 Copyright: 2010-2011, Robert Ancell
 License: GPL-3+
 
-Files: ./liblightdm-gobject/greeter.c
- ./liblightdm-gobject/language.c
- ./liblightdm-gobject/layout.c
- ./liblightdm-gobject/lightdm.h
- ./liblightdm-gobject/lightdm/greeter.h
- ./liblightdm-gobject/lightdm/language.h
- ./liblightdm-gobject/lightdm/layout.h
- ./liblightdm-gobject/lightdm/power.h
- ./liblightdm-gobject/lightdm/session.h
- ./liblightdm-gobject/lightdm/system.h
- ./liblightdm-gobject/lightdm/user.h
- ./liblightdm-gobject/power.c
- ./liblightdm-gobject/session.c
- ./liblightdm-gobject/system.c
- ./liblightdm-gobject/user.c
-Copyright: 2010, Robert Ancell
- 2010-2011, Robert Ancell
-License: LGPL-3+
-
-Files: ./greeters/qt/greeter.cpp
- ./greeters/qt/greeter.h
- ./greeters/qt/loginprompt.cpp
- ./greeters/qt/loginprompt.h
- ./greeters/qt/main.cpp
- ./greeters/qt/panel.cpp
- ./greeters/qt/panel.h
-Copyright: 2010-2011, David Edmundson
 License: GPL-3+
-
-Files: ./liblightdm-qt/language.cpp
- ./liblightdm-qt/session.cpp
- ./liblightdm-qt/user.cpp
-Copyright: 2010-2011, David Edmundson
-License: LGPL-3+
-
-Files: ./liblightdm-qt/greeter.cpp
- ./liblightdm-qt/power.cpp
- ./liblightdm-qt/system.cpp
-Copyright: 2010-2011, David Edmundson
- 2010-2011, Robert Ancell
-License: LGPL-3+
-
-License: GPL-2
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in
- `/usr/share/common-licenses/GPL-2'.
-
-License: GPL-3
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in
  `/usr/share/common-licenses/GPL-3'.
-
-License: GPL-3+
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in
- `/usr/share/common-licenses/GPL-3'.
-
-License: LGPL-3+
- On Debian systems, the complete text of the GNU Lesser
- General Public License version 3 can be found in
- `/usr/share/common-licenses/LGPL-3'.
diff -Nru lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.postinst lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.postinst
--- lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.postinst	2012-03-27 15:17:17.000000000 -0400
+++ lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.postinst	2015-06-15 06:42:59.000000000 -0400
@@ -2,6 +2,13 @@
 
 set -e
 
+if dpkg-maintscript-helper supports mv_conffile; then
+  dpkg-maintscript-helper mv_conffile \
+    /etc/lightdm/lightdm-gtk-greeter-ubuntu.conf \
+    /etc/lightdm/lightdm-gtk-greeter.conf.d/01_ubuntu.conf \
+    2.0.1-1ubuntu1 -- "$@"
+fi
+
 if [ "$1" = "configure" ]; then
   update-alternatives --install /usr/share/xgreeters/lightdm-greeter.desktop \
   lightdm-greeter /usr/share/xgreeters/lightdm-gtk-greeter.desktop 60
diff -Nru lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.postrm lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.postrm
--- lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.postrm	1969-12-31 19:00:00.000000000 -0500
+++ lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.postrm	2015-06-15 06:43:30.000000000 -0400
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports mv_conffile; then
+  dpkg-maintscript-helper mv_conffile \
+    /etc/lightdm/lightdm-gtk-greeter-ubuntu.conf \
+    /etc/lightdm/lightdm-gtk-greeter.conf.d/01_ubuntu.conf \
+    2.0.1-1ubuntu1 -- "$@"
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.preinst lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.preinst
--- lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.preinst	1969-12-31 19:00:00.000000000 -0500
+++ lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.preinst	2015-06-15 06:43:38.000000000 -0400
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports mv_conffile; then
+  dpkg-maintscript-helper mv_conffile \
+    /etc/lightdm/lightdm-gtk-greeter-ubuntu.conf \
+    /etc/lightdm/lightdm-gtk-greeter.conf.d/01_ubuntu.conf \
+    2.0.1-1ubuntu1 -- "$@"
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru lightdm-gtk-greeter-2.0.1/debian/rules lightdm-gtk-greeter-2.0.1/debian/rules
--- lightdm-gtk-greeter-2.0.1/debian/rules	2015-05-21 06:48:27.000000000 -0400
+++ lightdm-gtk-greeter-2.0.1/debian/rules	2015-06-15 06:46:34.000000000 -0400
@@ -7,7 +7,8 @@
 	dh_auto_configure -- --disable-silent-rules
 
 override_dh_install:
-	dh_install debian/01_debian.conf usr/share/lightdm/lightdm-gtk-greeter.conf.d/
+	dh_install debian/60-lightdm-gtk-greeter.conf usr/share/lightdm/lightdm.conf.d/
+	dh_install debian/01_ubuntu.conf usr/share/lightdm/lightdm-gtk-greeter.conf.d/
 
 %:
 	dh $@ --parallel --with autotools-dev