merge changes from experimental

debian/changelog

@@ -1,3 +1,21 @@
+lightdm-gtk-greeter (1.5.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/rules:
+    - enable all hardening flags.
+  * debian/patches:
+    - 04_default-gtk-greeter-config refreshed.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 07 Apr 2013 14:34:20 +0200
+
+lightdm-gtk-greeter (1.3.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/patches:
+    - 04_default-gtk-greeter-config refreshed.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 07 Oct 2012 09:38:09 +0200
+
 lightdm-gtk-greeter (1.1.6-2) unstable; urgency=low
 
   * debian/patches:

debian/patches/04_default-gtk-greeter-config.patch

@@ -9,24 +9,25 @@ Especially:
 
 Forwarded: not-needed
 
-Index: lightdm-gtk-greeter-1.1.1/data/lightdm-gtk-greeter.conf
-===================================================================
---- lightdm-gtk-greeter-1.1.1.orig/data/lightdm-gtk-greeter.conf	2011-11-29 05:14:02.000000000 +0100
-+++ lightdm-gtk-greeter-1.1.1/data/lightdm-gtk-greeter.conf	2012-01-14 15:04:49.258807325 +0100
-@@ -9,11 +9,11 @@
- # xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr)
+--- a/data/lightdm-gtk-greeter.conf
++++ b/data/lightdm-gtk-greeter.conf
+@@ -11,13 +11,13 @@
+ # show-indicators = semi-colon ";" separated list of allowed indicator modules (e.g. indicator-sound.so)
  #
  [greeter]
 -#background=
-+background=/usr/share/images/desktop-base/login-background.svg
- #show-language-selector=false
 -#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-language-selector=
 +xft-hintstyle=hintfull
 +xft-rgba=rgb
++show-language-selector=true
+ #show-indicators=

debian/rules

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
-export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-silent-rules