--- lightdm-gtk-greeter-2.0.0/debian/01_debian.conf	1969-12-31 19:00:00.000000000 -0500
+++ lightdm-gtk-greeter-2.0.1/debian/01_debian.conf	2015-05-21 06:48:27.000000000 -0400
@@ -0,0 +1,9 @@
+# Debian specific defaults
+#
+
+[greeter]
+background=/usr/share/images/desktop-base/login-background.svg
+theme-name=Adwaita
+xft-antialias=true
+xft-hintstyle=hintfull
+xft-rgba=rgb
--- lightdm-gtk-greeter-2.0.0/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
--- lightdm-gtk-greeter-2.0.0/debian/changelog	2015-02-15 22:28:29.000000000 -0500
+++ lightdm-gtk-greeter-2.0.1/debian/changelog	2015-06-05 20:34:13.000000000 -0400
@@ -1,3 +1,69 @@
+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:
+    - fix multiple issues in multi-monitor setup.               closes: #785055
+  * debian/01_debian.conf: 
+    - add Debian default configuration
+  * debian/rules:
+    - ship Debian configuration in newly supported
+    /u/s/lightdm/lightdm-gtk-greeter.conf.d folder.
+  * debian/patches:
+    - 04_default-gtk-greeter-config dropped, we use config folders now.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Thu, 21 May 2015 23:25:38 +0200
+
+lightdm-gtk-greeter (2.0.0-3) unstable; urgency=medium
+
+  * debian/patches:
+    - 04_default-gtk-greeter-config: stop overriding upstream configuration
+    for indicators, brings the clock back.                      closes: #784627
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 12 May 2015 20:51:05 +0200
+
+lightdm-gtk-greeter (2.0.0-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 06 May 2015 22:47:48 +0200
+
+lightdm-gtk-greeter (2.0.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * debian/patches:
+    - 01_unset_AT_SPI_BUS-X11-property dropped, normally not needed anymore.
+    - 04_default-gtk-greeter-config refreshed for new upstream.
+  * debian/control:
+    - update standards version to 3.9.6.
+
+ -- 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:
@@ -26,6 +92,16 @@
 
  -- 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:
+    - patch from Artur Rona to fix various lintian warnings.    closes: #750901
+  * debian/patches:
+    - 01_unset_AT_SPI_BUS-X11-property added, unset AT_SPI_BUS property from
+     the root window.                                           closes: #760740
+
+ -- 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)
@@ -417,3 +493,4 @@
   * Initial release.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Fri, 06 Apr 2012 21:42:53 +0200
+
--- lightdm-gtk-greeter-2.0.0/debian/lightdm-gtk-greeter.install	2014-07-05 05:06:23.000000000 -0400
+++ lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.install	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-debian/lightdm-gtk-greeter-ubuntu.conf etc/lightdm
-debian/60-lightdm-gtk-greeter.conf /usr/share/lightdm/lightdm.conf.d/
--- lightdm-gtk-greeter-2.0.0/debian/lightdm-gtk-greeter.postinst	2014-07-05 05:06:23.000000000 -0400
+++ lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.postinst	2015-06-05 19:36:15.000000000 -0400
@@ -4,17 +4,14 @@
 
 if dpkg-maintscript-helper supports mv_conffile; then
   dpkg-maintscript-helper mv_conffile \
-    /etc/lightdm/lightdm-gtk-greeter.conf \
     /etc/lightdm/lightdm-gtk-greeter-ubuntu.conf \
-    1.0.0-0ubuntu1 -- "$@"
+    usr/share/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
-  update-alternatives --install /etc/lightdm/lightdm-gtk-greeter.conf \
-    lightdm-gtk-greeter-config-derivative \
-    /etc/lightdm/lightdm-gtk-greeter-ubuntu.conf 10
 fi
 
 #DEBHELPER#
--- lightdm-gtk-greeter-2.0.0/debian/lightdm-gtk-greeter.postrm	2014-07-05 05:06:23.000000000 -0400
+++ lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.postrm	2015-06-05 19:37:22.000000000 -0400
@@ -4,10 +4,10 @@
 
 if dpkg-maintscript-helper supports mv_conffile; then
   dpkg-maintscript-helper mv_conffile \
-    /etc/lightdm/lightdm-gtk-greeter.conf \
     /etc/lightdm/lightdm-gtk-greeter-ubuntu.conf \
-    1.0.0-0ubuntu1 -- "$@"
-fi    
+    usr/share/lightdm/lightdm-gtk-greeter.conf.d/01_ubuntu.conf \
+    2.0.1-1ubuntu1 -- "$@"
+fi
 
 #DEBHELPER#
 
--- lightdm-gtk-greeter-2.0.0/debian/lightdm-gtk-greeter.preinst	2014-07-05 05:06:23.000000000 -0400
+++ lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.preinst	2015-06-05 19:37:44.000000000 -0400
@@ -4,10 +4,10 @@
 
 if dpkg-maintscript-helper supports mv_conffile; then
   dpkg-maintscript-helper mv_conffile \
-    /etc/lightdm/lightdm-gtk-greeter.conf \
     /etc/lightdm/lightdm-gtk-greeter-ubuntu.conf \
-    1.0.0-0ubuntu1 -- "$@"
-fi    
+    usr/share/lightdm/lightdm-gtk-greeter.conf.d/01_ubuntu.conf \
+    2.0.1-1ubuntu1 -- "$@"
+fi
 
 #DEBHELPER#
 
--- lightdm-gtk-greeter-2.0.0/debian/lightdm-gtk-greeter.prerm	2014-07-05 05:06:23.000000000 -0400
+++ lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter.prerm	2015-06-05 19:38:10.000000000 -0400
@@ -4,8 +4,6 @@
 
 if [ "$1" = "remove" ]; then
   update-alternatives --remove lightdm-greeter /usr/share/xgreeters/lightdm-gtk-greeter.desktop
-  update-alternatives --remove lightdm-gtk-greeter-config-derivative \
-    /etc/lightdm/lightdm-gtk-greeter-ubuntu.conf
 fi
 
 #DEBHELPER#
--- lightdm-gtk-greeter-2.0.0/debian/lightdm-gtk-greeter-ubuntu.conf	2015-02-15 21:01:05.000000000 -0500
+++ lightdm-gtk-greeter-2.0.1/debian/lightdm-gtk-greeter-ubuntu.conf	1969-12-31 19:00:00.000000000 -0500
@@ -1,58 +0,0 @@
-# LightDM GTK+ Configuration
-# Available configuration options listed below.
-#
-# Appearance:
-#  theme-name = GTK+ theme to use
-#  icon-theme-name = Icon theme to use
-#  background = Background file to use, either an image path or a color (e.g. #772953)
-#  user-background = false|true ("true" by default")  Display user background (if available)
-#  transition-duration = Length of time (in milliseconds) to transition between background images ("500" by default)
-#  transition-type = ease-in-out|linear|none  ("ease-in-out" by default)
-#
-# Fonts:
-#  font-name = Font to use
-#  xft-antialias = false|true  Whether to antialias Xft fonts
-#  xft-dpi = Resolution for Xft in dots per inch (e.g. 96)
-#  xft-hintstyle = none|slight|medium|hintfull  What degree of hinting to use
-#  xft-rgba = none|rgb|bgr|vrgb|vbgr  Type of subpixel antialiasing
-#
-# Login window:
-#  active-monitor = Monitor to display greeter window (name or number). Use #cursor value to display greeter at monitor with cursor.
-#  position = x y ("50% 50%" by default)  Login window position
-#  default-user-image = Image used as default user icon, path or #icon-name
-#  hide-user-image = false|true ("false" by default)
-#
-# Panel:
-#  panel-position = top|bottom ("top" by default)
-#  show-clock = false|true ("false" by default)
-#  clock-format = strftime-format string, e.g. %H:%M
-#  show-indicators = semi-colon ";" separated list of allowed indicator modules. Built-in indicators include "~a11y", "~language", "~session", "~power". Unity indicators can be represented by short name (e.g. "sound", "power"), service file name, or absolute path
-#
-# Accessibility:
-#  a11y-states = states of accessibility features: "name" - save state on exit, "-name" - disabled at start (default value for unlisted), "+name" - enabled at start. Allowed names: contrast, font, keyboard, reader.
-#  keyboard = command to launch on-screen keyboard (e.g. "onboard")
-#  keyboard-position = x y[;width height] ("50%,center -0;50% 25%" by default)
-#  reader = command to launch screen reader (e.g. "orca")
-#
-# Security:
-#  allow-debugging = false|true ("false" by default)
-#  screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen
-#
-# Template for per-monitor configuration:
-#  [monitor: name]
-#  background = overrides default value
-#  user-background = overrides default value
-#  laptop = false|true ("false" by default) Marks monitor as laptop display
-# 
-[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
--- lightdm-gtk-greeter-2.0.0/debian/patches/04_default-gtk-greeter-config.patch	2014-07-05 05:06:23.000000000 -0400
+++ lightdm-gtk-greeter-2.0.1/debian/patches/04_default-gtk-greeter-config.patch	1969-12-31 19:00:00.000000000 -0500
@@ -1,35 +0,0 @@
-Author: Yves-Alexis Perez <corsac@debian.org>
-Author: Lionel Le Folgoc <mrpouit@gmail.com>
-Description: adapt GTK+ greeter config to Debian
-Especially:
-
-* use background from desktop-base
-* force the use of default GTK+ 3 theme (Adwaita)
-* use some hinting
-
-Forwarded: not-needed
-
---- a/data/lightdm-gtk-greeter.conf
-+++ b/data/lightdm-gtk-greeter.conf
-@@ -16,15 +16,15 @@
- # screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen
- # 
- [greeter]
--#background=
--#theme-name=
-+background=/usr/share/images/desktop-base/login-background.svg
-+theme-name=Adwaita
- #icon-theme-name=
- #font-name=
--#xft-antialias=
-+xft-antialias=true
- #xft-dpi=
--#xft-hintstyle=
--#xft-rgba=
--#show-indicators=
-+xft-hintstyle=hintfull
-+xft-rgba=rgb
-+show-indicators=~language;~session;~power
- #show-clock=
- #clock-format=
- #keyboard=
--- lightdm-gtk-greeter-2.0.0/debian/patches/series	2014-07-05 05:06:23.000000000 -0400
+++ lightdm-gtk-greeter-2.0.1/debian/patches/series	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-#04_default-gtk-greeter-config.patch
--- lightdm-gtk-greeter-2.0.0/debian/rules	2015-02-15 21:01:23.000000000 -0500
+++ lightdm-gtk-greeter-2.0.1/debian/rules	2015-06-05 19:29:07.000000000 -0400
@@ -7,9 +7,8 @@
 	dh_auto_configure -- --disable-silent-rules
 
 override_dh_install:
-	# Remove conf file from upstream, we ship an Ubuntu specific on instead
-	rm -f $(CURDIR)/debian/lightdm-gtk-greeter/etc/lightdm/lightdm-gtk-greeter.conf
-	dh_install --list-missing
+	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