merge of '1516e610cec317d2dbc1f14ae7359ef7c80a1182'

     and '6e924857d53cc46c5b976a0cc3aa2dce32bf74a2'

14 files changed, 12 insertions, 0 deletions

diff --git a/packages/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty b/packages/libg15/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty
+++ b/packages/libg15/.mtn2git_empty
diff --git a/packages/libg15/libg15_1.2.1.bb b/packages/libg15/libg15_1.2.1.bb
new file mode 100644
index 0000000000..520c9441b8
--- /dev/null
+++ b/packages/libg15/libg15_1.2.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "This is a library to handle the LCD and extra keys on the Logitech G15 Gaming Keyboard."
+HOMEPAGE = "http://g15tools.sourceforge.net"
+LICENSE = "GPLv2"
+SECTION = "console/utils"
+PRIORITY = "optional"
+DEPENDS = "libusb"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/g15tools/libg15-${PV}.tar.bz2"
+
+inherit autotools
+
diff --git a/packages/obsolete/libsdl/.mtn2git_empty b/packages/obsolete/libsdl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/obsolete/libsdl/.mtn2git_empty
diff --git a/packages/obsolete/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch
index b47a127398..b47a127398 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/acinclude.m4 b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/acinclude.m4
index ca2df9d5e5..ca2df9d5e5 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/acinclude.m4
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/acinclude.m4
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch
index 7f3622ea4c..7f3622ea4c 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/fixlibs.patch
index 899e31482c..899e31482c 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/fixlibs.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/gcc34.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/gcc34.patch
index e3738e961e..e3738e961e 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/gcc34.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/gcc34.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/ipaq.patch
index bf57953c08..bf57953c08 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/ipaq.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch
index 9629583f9b..9629583f9b 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/mouse.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/mouse.patch
index 99320fad0d..99320fad0d 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/mouse.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/mouse.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/pygame.patch
index 4b39267a8a..4b39267a8a 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/pygame.patch
diff --git a/packages/libsdl/libsdl-qpe_1.2.7.bb b/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb
index 60c2a9d385..60c2a9d385 100644
--- a/packages/libsdl/libsdl-qpe_1.2.7.bb
+++ b/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb