Rediffing default-config.patch with common diff options.
authorDaniel Baumann <daniel@debian.org>
Wed, 18 Apr 2012 22:56:11 +0000 (00:56 +0200)
committerDaniel Baumann <daniel@debian.org>
Wed, 18 Apr 2012 22:56:11 +0000 (00:56 +0200)
debian/patches/01-default-config.patch [new file with mode: 0644]
debian/patches/01_default-config.patch [deleted file]
debian/patches/series

diff --git a/debian/patches/01-default-config.patch b/debian/patches/01-default-config.patch
new file mode 100644 (file)
index 0000000..add0ba9
--- /dev/null
@@ -0,0 +1,36 @@
+Author: Andrew Lee <andrew@linux.org.tw>
+Description: Change default terminal and browser.
+
+diff -Naurp lxde-common.orig/lxpanel/panel.in lxde-common/lxpanel/panel.in
+--- lxde-common.orig/lxpanel/panel.in  2012-04-19 00:07:05.131258426 +0200
++++ lxde-common/lxpanel/panel.in       2012-04-19 00:49:37.444863442 +0200
+@@ -53,7 +53,7 @@ Plugin {
+             id=pcmanfm.desktop
+         }
+         Button {
+-            id=firefox.desktop
++            id=lxde-x-www-browser.desktop
+         }
+     }
+ }
+@@ -110,10 +110,6 @@ Plugin {
+ }
+ Plugin {
+-    type = netstat
+-}
+-
+-Plugin {
+     type = cpu
+ }
+@@ -134,6 +130,9 @@ Plugin {
+     type = launchbar
+     Config {
+         Button {
++            id=lxde-screenlock.desktop
++        }
++        Button {
+             id=lxde-logout.desktop
+         }
+     }
diff --git a/debian/patches/01_default-config.patch b/debian/patches/01_default-config.patch
deleted file mode 100644 (file)
index 96e3fc3..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Andrew Lee <andrew@linux.org.tw>
-Description: change default terminal and browser
---- a/lxpanel/panel.in
-+++ b/lxpanel/panel.in
-@@ -53,7 +53,7 @@
-             id=pcmanfm.desktop
-         }
-         Button {
--            id=firefox.desktop
-+            id=lxde-x-www-browser.desktop
-         }
-     }
- }
-@@ -110,10 +110,6 @@
- }
- Plugin {
--    type = netstat
--}
--
--Plugin {
-     type = cpu
- }
-@@ -134,6 +130,9 @@
-     type = launchbar
-     Config {
-         Button {
-+            id=lxde-screenlock.desktop
-+        }
-+        Button {
-             id=lxde-logout.desktop
-         }
-     }
index a7f14fe..1762245 100644 (file)
@@ -1,4 +1,4 @@
-01_default-config.patch
+01-default-config.patch
 02_alternative_desktop-background.patch
 03_menu-xdg.patch
 05_default_terminal.patch