From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 9 Aug 2007 08:41:19 +0000 (+0000)
Subject: merge of '76e1e69496801009ea0aa69c84f76e858978ab99'
X-Git-Tag: Release-2010-05/1~9084
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d829ed05c295df608b4fc108eb1c628fd06fd39;p=openembedded.git

Merge ... '76e1e69496801009ea0aa69c84f76e858978ab99'
     and 'db976a98427dd6a195e2cf167e225de2d0206aea'
---

9d829ed05c295df608b4fc108eb1c628fd06fd39
diff --cc packages/gloox/.mtn2git_empty
index e69de29bb2,0000000000..e69de29bb2
mode 100644,000000..100644
--- a/packages/gloox/.mtn2git_empty
+++ 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 e69de29bb2,0000000000..e69de29bb2
mode 100644,000000..100644
--- a/packages/iksemel/.mtn2git_empty
+++ 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
 +}
diff --cc packages/opie-sh-snes/opie-sh-snes_cvs.bb
index 7c49fdd77b,5f36686636..5e69e87688
--- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
@@@ -1,5 -1,4 +1,5 @@@
  require ${PN}.inc
  
 -PV = "${OPIE_CVS_PV}"
 +#Remove the dash below when 1.2.1 changes
 +PV = "1.2.2+cvs-${SRCDATE}"
- 
+ PR = "r1"