diff --git a/Makefile b/Makefile
index 019ded9..f442ccb 100644
--- a/Makefile
+++ b/Makefile
@@ -106,10 +106,6 @@ install:
# GNOME background descriptor
mkdir -p $(DESTDIR)/usr/share/gnome-background-properties
$(INSTALL) gnome-backgrounds.xml $(DESTDIR)/usr/share/gnome-background-properties/debian.xml
- # GDM 3 theme
- mkdir -p $(DESTDIR)/usr/share/gdm/dconf
- $(INSTALL) gdm3/background.svg $(DESTDIR)/usr/share/images/desktop-base/login-background.svg
- $(INSTALL) gdm3/10-desktop-base-settings $(DESTDIR)/usr/share/gdm/dconf/
# grub
$(INSTALL) grub/lines-grub.png $(DESTDIR)/usr/share/images/desktop-base/
diff --git a/backgrounds/lines-lockscreen.xml b/backgrounds/lines-lockscreen.xml
new file mode 100644
index 0000000..2848da2
--- /dev/null
+++ b/backgrounds/lines-lockscreen.xml
@@ -0,0 +1,12 @@
+
+
+ 8640000.0
+
+ /usr/share/images/desktop-base/lines-lockscreen_1280x1024.svg
+ /usr/share/images/desktop-base/lines-lockscreen_1600x1200.svg
+ /usr/share/images/desktop-base/lines-lockscreen_1920x1080.svg
+ /usr/share/images/desktop-base/lines-lockscreen_1920x1200.svg
+ /usr/share/images/desktop-base/lines-lockscreen_2560x1080.svg
+
+
+
diff --git a/backgrounds/lines-lockscreen_1280x1024.svg b/backgrounds/lines-lockscreen_1280x1024.svg
new file mode 100644
index 0000000..9ef27a1
--- /dev/null
+++ b/backgrounds/lines-lockscreen_1280x1024.svg
@@ -0,0 +1,392 @@
+
+
\ No newline at end of file
diff --git a/backgrounds/lines-lockscreen_1600x1200.svg b/backgrounds/lines-lockscreen_1600x1200.svg
new file mode 100644
index 0000000..4a4a7f2
--- /dev/null
+++ b/backgrounds/lines-lockscreen_1600x1200.svg
@@ -0,0 +1,388 @@
+
+
\ No newline at end of file
diff --git a/backgrounds/lines-lockscreen_1920x1080.svg b/backgrounds/lines-lockscreen_1920x1080.svg
new file mode 100644
index 0000000..2665dad
--- /dev/null
+++ b/backgrounds/lines-lockscreen_1920x1080.svg
@@ -0,0 +1,390 @@
+
+
\ No newline at end of file
diff --git a/backgrounds/lines-lockscreen_1920x1200.svg b/backgrounds/lines-lockscreen_1920x1200.svg
new file mode 100644
index 0000000..d3bc544
--- /dev/null
+++ b/backgrounds/lines-lockscreen_1920x1200.svg
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/backgrounds/lines-lockscreen_2560x1080.svg b/backgrounds/lines-lockscreen_2560x1080.svg
new file mode 100644
index 0000000..b7411b2
--- /dev/null
+++ b/backgrounds/lines-lockscreen_2560x1080.svg
@@ -0,0 +1,390 @@
+
+
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index ab4aef7..3d127f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-desktop-base (8.0.1) UNRELEASED; urgency=medium
+desktop-base (8.0.1) unstable; urgency=medium
+ [ Coucouf ]
* Fix KSplash preview for Lines. (Closes: #772900)
- -- Coucouf Fri, 12 Dec 2014 08:04:04 +0100
+ [ Josselin Mouette ]
+ * Remove old GDM theme.
+ * Add GDM/GNOME lockscreen based on Lines.
+ * gsettings-override: set it as the default.
+ * Update gnome-backgrounds.xml. Closes: #772944.
+
+ -- Josselin Mouette Fri, 12 Dec 2014 19:22:33 +0100
desktop-base (8.0.0) unstable; urgency=medium
diff --git a/debian/gsettings-override b/debian/gsettings-override
index ac6e08e..40644ec 100644
--- a/debian/gsettings-override
+++ b/debian/gsettings-override
@@ -1,3 +1,7 @@
[org.gnome.desktop.background]
picture-options='zoom'
picture-uri='file:///usr/share/images/desktop-base/desktop-background.xml'
+
+[org.gnome.desktop.screensaver]
+picture-options='zoom'
+picture-uri='file:///usr/share/images/desktop-base/lines-lockscreen.xml'
diff --git a/debian/postinst b/debian/postinst
index 8fbd698..17a32e1 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -98,9 +98,4 @@ EOF
update-initramfs -u
fi
- # Reload gdm3 configuration
- if [ -x /usr/sbin/gdm3 ]; then
- invoke-rc.d gdm3 reload || true
- fi
-
fi
diff --git a/debian/postrm b/debian/postrm
index 8de3138..7d28658 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -11,8 +11,5 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
if which update-grub2 > /dev/null ; then
update-grub2 || true
fi
- if [ -x /usr/sbin/gdm3 ]; then
- invoke-rc.d gdm3 reload || true
- fi
fi
diff --git a/gdm3/10-desktop-base-settings b/gdm3/10-desktop-base-settings
deleted file mode 100644
index dfbdd65..0000000
--- a/gdm3/10-desktop-base-settings
+++ /dev/null
@@ -1,3 +0,0 @@
-[org/gnome/desktop/background]
-picture-uri='file:///usr/share/images/desktop-base/login-background.svg'
-picture-options='zoom'
diff --git a/gdm3/background.svg b/gdm3/background.svg
deleted file mode 100644
index bd12218..0000000
--- a/gdm3/background.svg
+++ /dev/null
@@ -1,240 +0,0 @@
-
-
-
diff --git a/gnome-backgrounds.xml b/gnome-backgrounds.xml
index beefcd7..9417852 100644
--- a/gnome-backgrounds.xml
+++ b/gnome-backgrounds.xml
@@ -3,7 +3,21 @@
- Debian
+ Lines
+ /usr/share/images/desktop-base/lines.xml
+ zoom
+ #ffffff
+ #000000
+
+
+ Lines lock screen
+ /usr/share/images/desktop-base/lines-lockscreen.xml
+ zoom
+ #ffffff
+ #000000
+
+
+ Joy
/usr/share/images/desktop-base/joy.xml
zoom
horizontal-gradient
@@ -11,7 +25,7 @@
#006699
- Debian Inksplat
+ Joy Inksplat
/usr/share/images/desktop-base/joy-inksplat-wallpaper_1920x1080.svg
zoom
horizontal-gradient