merge of 'a1c14f5ed3aa4310fcbbae2ab8eaf084e777f6b4'

     and 'aee4afc7bd079e28f35b43cc08b0559015472e42'

diff --cc packages/gloox/.mtn2git_empty
index 0000000,0000000..e69de29
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/packages/gloox/.mtn2git_empty

diff --cc packages/gloox/gloox_0.8.1.bb
index 09004a8,0000000..09004a8
mode 100644,000000..100644
--- 1/packages/gpephone/gloox_0.8.1.bb
--- /dev/null
+++ b/packages/gloox/gloox_0.8.1.bb

diff --cc packages/iksemel/.mtn2git_empty
index 0000000,0000000..e69de29
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/packages/iksemel/.mtn2git_empty

diff --cc packages/iksemel/iksemel_1.2.bb
index 40ad32c,0000000..903d8f0
mode 100644,000000..100644
--- 1/packages/gpephone/iksemel_1.2.bb
--- /dev/null
+++ b/packages/iksemel/iksemel_1.2.bb
@@@ -1,14 -1,0 +1,14 @@@
- DEPENDS     = "glibc"
 +LICENSE     = "LGPL"
 +DESCRIPTION = "A simple, powerful XML-parsing library written in C."
 +SECTION = "libs"
 +PRIORITY    = "optional"
++DEPENDS     = "glibc gnutls"
 +PR          = "r0"
 +
 +inherit pkgconfig autotools
 +
 +SRC_URI = "http://files.jabberstudio.org/iksemel/${P}.tar.gz"
 +
 +do_stage () {
 +      autotools_stage_all
 +}