Rediffing gnome-polkit.patch with common diff options.
authorDaniel Baumann <daniel@debian.org>
Wed, 18 Apr 2012 23:08:47 +0000 (01:08 +0200)
committerDaniel Baumann <daniel@debian.org>
Wed, 18 Apr 2012 23:08:47 +0000 (01:08 +0200)
debian/patches/05-gnome-polkit.patch [new file with mode: 0644]
debian/patches/12_autostart-gnome-polkit.patch [deleted file]
debian/patches/series

diff --git a/debian/patches/05-gnome-polkit.patch b/debian/patches/05-gnome-polkit.patch
new file mode 100644 (file)
index 0000000..565f3cc
--- /dev/null
@@ -0,0 +1,13 @@
+Author: Julien Lavergne <gilir@ubuntu.com>
+Description:
+ Autostart polkit-gnome-authentication-agent-1 to make polkit working on LXDE
+ session. This should be changed when LXDE will have a polkit-agent.
+
+diff -Naurp lxde-common.orig/autostart lxde-common/autostart
+--- lxde-common.orig/autostart 2012-04-19 00:07:05.123258370 +0200
++++ lxde-common/autostart      2012-04-19 01:06:40.027757734 +0200
+@@ -1,3 +1,4 @@
+ @lxpanel --profile LXDE
+ @pcmanfm --desktop --profile LXDE
+ @xscreensaver -no-splash
++@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
diff --git a/debian/patches/12_autostart-gnome-polkit.patch b/debian/patches/12_autostart-gnome-polkit.patch
deleted file mode 100644 (file)
index 43a6134..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autostart polkit-gnome-authentication-agent-1 to enable polkit support
-# This should be changed when LXDE will have a polkit-agent.
-Index: lxde-common/autostart
-===================================================================
---- lxde-common.orig/autostart 2010-05-25 22:58:28.000000000 +0200
-+++ lxde-common/autostart      2010-05-25 22:59:13.000000000 +0200
-@@ -1,3 +1,4 @@
- @lxpanel --profile LXDE
- @pcmanfm --desktop --profile LXDE
- @xscreensaver -no-splash
-+@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
index f08b786..f61ac5c 100644 (file)
@@ -1,5 +1,5 @@
 01-default-config.patch
 02-desktop-background.patch
 03-menu-xdg.patch
-05_default_terminal.patch
-12_autostart-gnome-polkit.patch
+04-default-terminal.patch
+05-gnome-polkit.patch