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

diff --git a/debian/patches/03-menu-xdg.patch b/debian/patches/03-menu-xdg.patch
new file mode 100644 (file)
index 0000000..8831e6f
--- /dev/null
@@ -0,0 +1,14 @@
+Author: Andrew Lee (李健秋) <ajqlee@debian.org>
+Description: Add support for Debian Menu (Closes:#517190).
+
+diff -Naurp lxde-common.orig/startlxde.in lxde-common/startlxde.in
+--- lxde-common.orig/startlxde.in      2012-04-19 00:07:05.131258426 +0200
++++ lxde-common/startlxde.in   2012-04-19 01:00:54.805429244 +0200
+@@ -1,5 +1,7 @@
+ #!/bin/sh
++export XDG_DATA_DIRS="/usr/local/share/:/usr/share/:/usr/share/gdm/:/var/lib/menu-xdg/"
++
+ if [ -z "$XDG_CONFIG_HOME" ]; then
+       export XDG_CONFIG_HOME="$HOME/.config"
+ fi
diff --git a/debian/patches/03_menu-xdg.patch b/debian/patches/03_menu-xdg.patch
deleted file mode 100644 (file)
index f42f45c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Author: Andrew Lee (李健秋) <ajqlee@debian.org>
-Description: No description.
---- a/startlxde.in
-+++ b/startlxde.in
-@@ -1,5 +1,7 @@
- #!/bin/sh
-+export XDG_DATA_DIRS="/usr/local/share/:/usr/share/:/usr/share/gdm/:/var/lib/menu-xdg/"
-+
- if [ -z "$XDG_CONFIG_HOME" ]; then
-       export XDG_CONFIG_HOME="$HOME/.config"
- fi
index d47f548..f08b786 100644 (file)
@@ -1,5 +1,5 @@
 01-default-config.patch
 02-desktop-background.patch
-03_menu-xdg.patch
+03-menu-xdg.patch
 05_default_terminal.patch
 12_autostart-gnome-polkit.patch