Rediffing desktop-background.patch with common diff options.
authorDaniel Baumann <daniel@debian.org>
Wed, 18 Apr 2012 23:00:01 +0000 (01:00 +0200)
committerDaniel Baumann <daniel@debian.org>
Wed, 18 Apr 2012 23:00:01 +0000 (01:00 +0200)
debian/patches/02-desktop-background.patch [new file with mode: 0644]
debian/patches/02_alternative_desktop-background.patch [deleted file]
debian/patches/series

diff --git a/debian/patches/02-desktop-background.patch b/debian/patches/02-desktop-background.patch
new file mode 100644 (file)
index 0000000..ab9cca8
--- /dev/null
@@ -0,0 +1,15 @@
+Author: Richard Nelson <unixabg@gmail.com>
+Description: Use background image from desktop-base (Closes: #634004).
+
+diff -Naurp lxde-common.orig/pcmanfm/pcmanfm.conf.in lxde-common/pcmanfm/pcmanfm.conf.in
+--- lxde-common.orig/pcmanfm/pcmanfm.conf.in   2012-04-19 00:07:05.131258426 +0200
++++ lxde-common/pcmanfm/pcmanfm.conf.in        2012-04-19 00:56:39.291706654 +0200
+@@ -4,7 +4,7 @@ su_cmd=xdg-su -c '%s'
+ [desktop]
+ wallpaper_mode=1
+-wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
++wallpaper=/etc/alternatives/desktop-background
+ desktop_bg=#000000
+ desktop_fg=#ffffff
+ desktop_shadow=#000000
diff --git a/debian/patches/02_alternative_desktop-background.patch b/debian/patches/02_alternative_desktop-background.patch
deleted file mode 100644 (file)
index d3127d6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pcmanfm/pcmanfm.conf.in
-+++ b/pcmanfm/pcmanfm.conf.in
-@@ -4,7 +4,7 @@
- [desktop]
- wallpaper_mode=1
--wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
-+wallpaper=/etc/alternatives/desktop-background
- desktop_bg=#000000
- desktop_fg=#ffffff
- desktop_shadow=#000000
index 1762245..d47f548 100644 (file)
@@ -1,5 +1,5 @@
 01-default-config.patch
-02_alternative_desktop-background.patch
+02-desktop-background.patch
 03_menu-xdg.patch
 05_default_terminal.patch
 12_autostart-gnome-polkit.patch