lxde-common: move version to % placeholder

remove consistent_defconfig_dirs.patch as it is no longer needed
starting with 0.5.6

consistent_defconfig_dirs.patch is no longer needed.
change bbappend to contain % instead of the version

18 files changed, 1 insertions, 14 deletions

diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/consistent_defconfig_dirs.patch b/recipes-lxde/lxde-common/lxde-common-0.5.5/consistent_defconfig_dirs.patch
deleted file mode 100644
index 1eff17b..0000000
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/consistent_defconfig_dirs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNdb lxde-common-0.5.5.orig//startlxde.in lxde-common-0.5.5//startlxde.in
---- lxde-common-0.5.5.orig//startlxde.in	2011-12-17 22:39:41.000000000 +0100
-+++ lxde-common-0.5.5//startlxde.in	2011-12-17 22:40:22.000000000 +0100
-@@ -8,7 +8,7 @@
- PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE"
- if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
- 	mkdir -p "$PCMANFM_CONF_DIR"
--	cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
-+	cp /etc/xdg/pcmanfm/LXDE/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
- fi
- 
- # Ensure the existance of openbox config file
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisT30.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisT30.png
index 50473a4..50473a4 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisT30.png
+++ b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisT30.png
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisiMX6D.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisiMX6D.png
index 5f145d3..5f145d3 100755
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisiMX6D.png
+++ b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisiMX6D.png
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisiMX6Q.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisiMX6Q.png
index 72623c1..72623c1 100755
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ApalisiMX6Q.png
+++ b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ApalisiMX6Q.png
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriT20.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriT20.png
index e91c869..e91c869 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriT20.png
+++ b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriT20.png
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriT30.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriT30.png
index 6af72d5..6af72d5 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriT30.png
+++ b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriT30.png
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriVF50.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriVF50.png
index d28e967..d28e967 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriVF50.png
+++ b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriVF50.png
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriVF61.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriVF61.png
index 404ae0f..404ae0f 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriVF61.png
+++ b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriVF61.png
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriiMX6DL.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriiMX6DL.png
index 37e8c2f..37e8c2f 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriiMX6DL.png
+++ b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriiMX6DL.png
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriiMX6S.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriiMX6S.png
index faca0ad..faca0ad 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_ColibriiMX6S.png
+++ b/recipes-lxde/lxde-common/lxde-common/Wallpaper_ColibriiMX6S.png
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_Toradex.png b/recipes-lxde/lxde-common/lxde-common/Wallpaper_Toradex.png
index dc56b11..dc56b11 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/Wallpaper_Toradex.png
+++ b/recipes-lxde/lxde-common/lxde-common/Wallpaper_Toradex.png
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/defaults.list b/recipes-lxde/lxde-common/lxde-common/defaults.list
index c683923..c683923 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/defaults.list
+++ b/recipes-lxde/lxde-common/lxde-common/defaults.list
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/desktop.conf b/recipes-lxde/lxde-common/lxde-common/desktop.conf
index 7e9862c..7e9862c 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/desktop.conf
+++ b/recipes-lxde/lxde-common/lxde-common/desktop.conf
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/mx6/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common/mx6/panel-buttons.patch
index 45bd988..45bd988 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/mx6/panel-buttons.patch
+++ b/recipes-lxde/lxde-common/lxde-common/mx6/panel-buttons.patch
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/tegra/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common/tegra/panel-buttons.patch
index 45bd988..45bd988 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/tegra/panel-buttons.patch
+++ b/recipes-lxde/lxde-common/lxde-common/tegra/panel-buttons.patch
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/vf60/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common/vf60/panel-buttons.patch
index ceba7f3..ceba7f3 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/vf60/panel-buttons.patch
+++ b/recipes-lxde/lxde-common/lxde-common/vf60/panel-buttons.patch
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/wallpaper.patch b/recipes-lxde/lxde-common/lxde-common/wallpaper.patch
index 0323ca8..0323ca8 100644
--- a/recipes-lxde/lxde-common/lxde-common-0.5.5/wallpaper.patch
+++ b/recipes-lxde/lxde-common/lxde-common/wallpaper.patch
diff --git a/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend b/recipes-lxde/lxde-common/lxde-common_%.bbappend
index 5422bed..16ef21c 100644
--- a/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend
+++ b/recipes-lxde/lxde-common/lxde-common_%.bbappend
@@ -3,12 +3,11 @@ WALLPAPER-MACHINE_colibri-t20 = "Wallpaper_ColibriT20.png"
 WALLPAPER-MACHINE_colibri-t30 = "Wallpaper_ColibriT30.png"
 WALLPAPER-MACHINE_apalis-t30 = "Wallpaper_ApalisT30.png"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SRC_URI += " \
-    file://consistent_defconfig_dirs.patch \
     file://Wallpaper_Toradex.png \
     file://${WALLPAPER-MACHINE} \
     file://wallpaper.patch \