From 0bf1c92290d0f770a7c60bff105542e86149fb7a Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Sat, 3 Jan 2015 15:18:17 +0100
Subject: lxde-common: use generic panel-buttons.patch

There is no difference between iMX6 / Tegra based modules
---
 .../lxde-common/mx6/panel-buttons.patch            | 14 -------------
 .../lxde-common/lxde-common/panel-buttons.patch    | 24 ++++++++++++++++++++++
 .../lxde-common/tegra/panel-buttons.patch          | 24 ----------------------
 3 files changed, 24 insertions(+), 38 deletions(-)
 delete mode 100644 recipes-lxde/lxde-common/lxde-common/mx6/panel-buttons.patch
 create mode 100644 recipes-lxde/lxde-common/lxde-common/panel-buttons.patch
 delete mode 100644 recipes-lxde/lxde-common/lxde-common/tegra/panel-buttons.patch

diff --git a/recipes-lxde/lxde-common/lxde-common/mx6/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common/mx6/panel-buttons.patch
deleted file mode 100644
index 45bd988..0000000
--- a/recipes-lxde/lxde-common/lxde-common/mx6/panel-buttons.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- lxde-common-0.5.5/lxpanel/panel.in~	2011-07-29 16:04:03.000000000 +0200
-+++ lxde-common-0.5.5/lxpanel/panel.in	2012-07-27 14:19:20.661190542 +0200
-@@ -53,7 +53,10 @@
-             id=pcmanfm.desktop
-         }
-         Button {
--            id=firefox.desktop
-+            id=mozilla-firefox.desktop
-+        }
-+        Button {
-+            id=lxterminal.desktop
-         }
-     }
- }
diff --git a/recipes-lxde/lxde-common/lxde-common/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common/panel-buttons.patch
new file mode 100644
index 0000000..1a20937
--- /dev/null
+++ b/recipes-lxde/lxde-common/lxde-common/panel-buttons.patch
@@ -0,0 +1,24 @@
+--- lxde-common-0.99.0/lxpanel/panel.in~	2014-10-23 16:08:00.000000000 +0200
++++ lxde-common-0.99.0/lxpanel/panel.in	2014-12-29 22:16:04.310587839 +0100
+@@ -53,7 +53,10 @@
+             id=pcmanfm.desktop
+         }
+         Button {
+-            id=firefox.desktop
++            id=mozilla-firefox.desktop
++        }
++        Button {
++            id=lxterminal.desktop
+         }
+     }
+ }
+@@ -134,9 +137,6 @@
+     type = launchbar
+     Config {
+         Button {
+-            id=lxde-screenlock.desktop
+-        }
+-        Button {
+             id=lxde-logout.desktop
+         }
+     }
diff --git a/recipes-lxde/lxde-common/lxde-common/tegra/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common/tegra/panel-buttons.patch
deleted file mode 100644
index 1a20937..0000000
--- a/recipes-lxde/lxde-common/lxde-common/tegra/panel-buttons.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- lxde-common-0.99.0/lxpanel/panel.in~	2014-10-23 16:08:00.000000000 +0200
-+++ lxde-common-0.99.0/lxpanel/panel.in	2014-12-29 22:16:04.310587839 +0100
-@@ -53,7 +53,10 @@
-             id=pcmanfm.desktop
-         }
-         Button {
--            id=firefox.desktop
-+            id=mozilla-firefox.desktop
-+        }
-+        Button {
-+            id=lxterminal.desktop
-         }
-     }
- }
-@@ -134,9 +137,6 @@
-     type = launchbar
-     Config {
-         Button {
--            id=lxde-screenlock.desktop
--        }
--        Button {
-             id=lxde-logout.desktop
-         }
-     }
-- 
cgit v1.2.3