From: Koen Kooi <koen@openembedded.org>
Date: Thu, 12 Apr 2007 08:16:08 +0000 (+0000)
Subject: merge of 'a1c14f5ed3aa4310fcbbae2ab8eaf084e777f6b4'
X-Git-Tag: Release-2010-05/1~8868^2~701^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37a87ac34f26f3e5f4afeded2fb1fc25d4f0137d;p=openembedded.git

Merge ... 'a1c14f5ed3aa4310fcbbae2ab8eaf084e777f6b4'
     and 'aee4afc7bd079e28f35b43cc08b0559015472e42'
---

37a87ac34f26f3e5f4afeded2fb1fc25d4f0137d
diff --cc packages/gloox/.mtn2git_empty
index 0000000000,0000000000..e69de29bb2
new file mode 100644
--- /dev/null
+++ b/packages/gloox/.mtn2git_empty
diff --cc packages/gloox/gloox_0.8.1.bb
index 09004a8182,0000000000..09004a8182
mode 100644,000000..100644
--- a/packages/gloox/gloox_0.8.1.bb
+++ b/packages/gloox/gloox_0.8.1.bb
diff --cc packages/iksemel/.mtn2git_empty
index 0000000000,0000000000..e69de29bb2
new file mode 100644
--- /dev/null
+++ b/packages/iksemel/.mtn2git_empty
diff --cc packages/iksemel/iksemel_1.2.bb
index 40ad32ce0e,0000000000..903d8f046d
mode 100644,000000..100644
--- a/packages/iksemel/iksemel_1.2.bb
+++ b/packages/iksemel/iksemel_1.2.bb
@@@ -1,14 -1,0 +1,14 @@@
 +LICENSE     = "LGPL"
 +DESCRIPTION = "A simple, powerful XML-parsing library written in C."
 +SECTION = "libs"
 +PRIORITY    = "optional"
- DEPENDS     = "glibc"
++DEPENDS     = "glibc gnutls"
 +PR          = "r0"
 +
 +inherit pkgconfig autotools
 +
 +SRC_URI = "http://files.jabberstudio.org/iksemel/${P}.tar.gz"
 +
 +do_stage () {
 +	autotools_stage_all
 +}