merge of '5c57f792fa4408bfd1d31632734168b1434d7100'

     and 'de01edf0c06eb0cc6e3c6b19195f32bc67519b19'

29 files changed, 0 insertions, 15 deletions

diff --git a/packages/efl1/imlib2/.mtn2git_empty b/packages/efl1/imlib2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/efl1/imlib2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/efl1/imlib2/remove-local-includes.patch b/packages/efl1/imlib2/remove-local-includes.patch
deleted file mode 100644
index bc85b10424..0000000000
--- a/packages/efl1/imlib2/remove-local-includes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: imlib2/configure.in
-===================================================================
---- imlib2.orig/configure.in	2007-09-01 14:34:26.000000000 +0000
-+++ imlib2/configure.in	2007-09-01 14:35:07.000000000 +0000
-@@ -188,9 +188,7 @@
- 
- if test "x$have_x" = "xyes"; then
-   AC_PATH_XTRA
--  x_dir=${x_dir:-/usr/X11R6}
--  x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+  x_libs="-lX11 -lXext"
-   AM_CONDITIONAL(BUILD_X11, true)
-   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
- else
diff --git a/packages/atmelwlandriver/.mtn2git_empty b/packages/nonworking/atmelwlandriver/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/atmelwlandriver/.mtn2git_empty
+++ b/packages/nonworking/atmelwlandriver/.mtn2git_empty
diff --git a/packages/atmelwlandriver/atmelwlandriver-3.3.5.6/.mtn2git_empty b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.3.5.6/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/atmelwlandriver/atmelwlandriver-3.3.5.6/.mtn2git_empty
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.3.5.6/.mtn2git_empty
diff --git a/packages/atmelwlandriver/atmelwlandriver-3.3.5.6/dotconfig b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.3.5.6/dotconfig
index c08a063593..c08a063593 100644
--- a/packages/atmelwlandriver/atmelwlandriver-3.3.5.6/dotconfig
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.3.5.6/dotconfig
diff --git a/packages/atmelwlandriver/atmelwlandriver-3.3.5.6/makefile.patch b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.3.5.6/makefile.patch
index 4e6efe1df6..4e6efe1df6 100644
--- a/packages/atmelwlandriver/atmelwlandriver-3.3.5.6/makefile.patch
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.3.5.6/makefile.patch
diff --git a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/.mtn2git_empty b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.4.1.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/.mtn2git_empty
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.4.1.0/.mtn2git_empty
diff --git a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/add-compaq-usb-ids.patch b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.4.1.0/add-compaq-usb-ids.patch
index 6fb70a6497..6fb70a6497 100644
--- a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/add-compaq-usb-ids.patch
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.4.1.0/add-compaq-usb-ids.patch
diff --git a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/dotconfig b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.4.1.0/dotconfig
index 79e699962a..79e699962a 100644
--- a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/dotconfig
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.4.1.0/dotconfig
diff --git a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/fix-kernel-version-test-for-hh.patch b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.4.1.0/fix-kernel-version-test-for-hh.patch
index 96e2cd947f..96e2cd947f 100644
--- a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/fix-kernel-version-test-for-hh.patch
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.4.1.0/fix-kernel-version-test-for-hh.patch
diff --git a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/makefile.patch b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.4.1.0/makefile.patch
index c90c778703..c90c778703 100644
--- a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/makefile.patch
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.4.1.0/makefile.patch
diff --git a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/power-on-and-leds.patch b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.4.1.0/power-on-and-leds.patch
index 0ac06f1482..0ac06f1482 100644
--- a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/power-on-and-leds.patch
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver-3.4.1.0/power-on-and-leds.patch
diff --git a/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb b/packages/nonworking/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
index 18df2e860b..18df2e860b 100644
--- a/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
diff --git a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb b/packages/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
index 136f6ca42a..136f6ca42a 100644
--- a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
diff --git a/packages/atmelwlandriver/pcmf502rd.conf b/packages/nonworking/atmelwlandriver/pcmf502rd.conf
index 90981830f6..90981830f6 100644
--- a/packages/atmelwlandriver/pcmf502rd.conf
+++ b/packages/nonworking/atmelwlandriver/pcmf502rd.conf
diff --git a/packages/centericq/.mtn2git_empty b/packages/nonworking/centericq/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/centericq/.mtn2git_empty
+++ b/packages/nonworking/centericq/.mtn2git_empty
diff --git a/packages/centericq/centericq-4.11.0/.mtn2git_empty b/packages/nonworking/centericq/centericq-4.11.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/centericq/centericq-4.11.0/.mtn2git_empty
+++ b/packages/nonworking/centericq/centericq-4.11.0/.mtn2git_empty
diff --git a/packages/centericq/centericq-4.11.0/configure.patch b/packages/nonworking/centericq/centericq-4.11.0/configure.patch
index aea7a493f8..aea7a493f8 100644
--- a/packages/centericq/centericq-4.11.0/configure.patch
+++ b/packages/nonworking/centericq/centericq-4.11.0/configure.patch
diff --git a/packages/centericq/centericq-4.11.0/m4.patch b/packages/nonworking/centericq/centericq-4.11.0/m4.patch
index 60276a0ba6..60276a0ba6 100644
--- a/packages/centericq/centericq-4.11.0/m4.patch
+++ b/packages/nonworking/centericq/centericq-4.11.0/m4.patch
diff --git a/packages/centericq/centericq-4.9.10/.mtn2git_empty b/packages/nonworking/centericq/centericq-4.9.10/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/centericq/centericq-4.9.10/.mtn2git_empty
+++ b/packages/nonworking/centericq/centericq-4.9.10/.mtn2git_empty
diff --git a/packages/centericq/centericq-4.9.10/configure.patch b/packages/nonworking/centericq/centericq-4.9.10/configure.patch
index f95bf9f86f..f95bf9f86f 100644
--- a/packages/centericq/centericq-4.9.10/configure.patch
+++ b/packages/nonworking/centericq/centericq-4.9.10/configure.patch
diff --git a/packages/centericq/centericq-4.9.10/m4.patch b/packages/nonworking/centericq/centericq-4.9.10/m4.patch
index 60276a0ba6..60276a0ba6 100644
--- a/packages/centericq/centericq-4.9.10/m4.patch
+++ b/packages/nonworking/centericq/centericq-4.9.10/m4.patch
diff --git a/packages/centericq/centericq-4.9.7/.mtn2git_empty b/packages/nonworking/centericq/centericq-4.9.7/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/centericq/centericq-4.9.7/.mtn2git_empty
+++ b/packages/nonworking/centericq/centericq-4.9.7/.mtn2git_empty
diff --git a/packages/centericq/centericq-4.9.7/configure.patch b/packages/nonworking/centericq/centericq-4.9.7/configure.patch
index 77682793b1..77682793b1 100644
--- a/packages/centericq/centericq-4.9.7/configure.patch
+++ b/packages/nonworking/centericq/centericq-4.9.7/configure.patch
diff --git a/packages/centericq/centericq-4.9.7/m4.patch b/packages/nonworking/centericq/centericq-4.9.7/m4.patch
index 60276a0ba6..60276a0ba6 100644
--- a/packages/centericq/centericq-4.9.7/m4.patch
+++ b/packages/nonworking/centericq/centericq-4.9.7/m4.patch
diff --git a/packages/centericq/centericq.inc b/packages/nonworking/centericq/centericq.inc
index 2773ac61fd..2773ac61fd 100644
--- a/packages/centericq/centericq.inc
+++ b/packages/nonworking/centericq/centericq.inc
diff --git a/packages/centericq/centericq_4.11.0.bb b/packages/nonworking/centericq/centericq_4.11.0.bb
index dc227c4a93..dc227c4a93 100644
--- a/packages/centericq/centericq_4.11.0.bb
+++ b/packages/nonworking/centericq/centericq_4.11.0.bb
diff --git a/packages/centericq/centericq_4.9.10.bb b/packages/nonworking/centericq/centericq_4.9.10.bb
index 6d02f2c787..6d02f2c787 100644
--- a/packages/centericq/centericq_4.9.10.bb
+++ b/packages/nonworking/centericq/centericq_4.9.10.bb
diff --git a/packages/centericq/centericq_4.9.7.bb b/packages/nonworking/centericq/centericq_4.9.7.bb
index c4af2f4437..c4af2f4437 100644
--- a/packages/centericq/centericq_4.9.7.bb
+++ b/packages/nonworking/centericq/centericq_4.9.7.bb