merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

diff --git a/packages/gloox/.mtn2git_empty b/packages/gloox/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gloox/gloox_0.8.1.bb b/packages/gloox/gloox_0.8.1.bb
new file mode 100644 (file)
index 0000000..09004a8
--- /dev/null
+++ b/packages/gloox/gloox_0.8.1.bb
@@ -0,0 +1,15 @@
+LICENSE     = "GPL"
+DESCRIPTION = "full-featured Jabber/XMPP client library."
+SECTION = "networking"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "iksemel libidn gnutls"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://camaya.net/download/${P}.tar.bz2"
+
+do_stage () {
+       autotools_stage_all
+}

diff --git a/packages/iksemel/.mtn2git_empty b/packages/iksemel/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/iksemel/iksemel_1.2.bb b/packages/iksemel/iksemel_1.2.bb
new file mode 100644 (file)
index 0000000..903d8f0
--- /dev/null
+++ b/packages/iksemel/iksemel_1.2.bb
@@ -0,0 +1,14 @@
+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
+}

diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
index 98ac64a..a919c30 100644 (file)
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
@@ -1,9 +1,8 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
-           ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet"
-
-#           file://sysconfig-bluetooth.patch;patch=1"
+           ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \
+           file://sysconfig-bluetooth.patch;patch=1"

diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb
index ccd75ca..787b408 100644 (file)
--- a/packages/opie-help-en/opie-help-en_cvs.bb
+++ b/packages/opie-help-en/opie-help-en_cvs.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.2+cvs-${SRCDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html "

diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb
index 6532cd1..3e269e7 100644 (file)
--- a/packages/opie-i18n/opie-i18n_cvs.bb
+++ b/packages/opie-i18n/opie-i18n_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.2+cvs-${SRCDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \
           ${HANDHELDS_CVS};module=opie/etc/dict"

diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb
index 9bce521..94401fa 100644 (file)
--- a/packages/opie-i18n/opie-lrelease-native_cvs.bb
+++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PV = "${OPIE_CVS_PV}"
-
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.2+cvs-${SRCDATE}"
 SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \
            ${HANDHELDS_CVS};module=opie/development/translation/shared"

diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb
index e7c33b6..5f2d834 100644 (file)
--- a/packages/opie-i18n/opie-lupdate-native_cvs.bb
+++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PV = "${OPIE_CVS_PV}"
-
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.2+cvs-${SRCDATE}"
 SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \
            ${HANDHELDS_CVS};module=opie/development/translation/shared"

diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb
index c81cd23..d18339a 100644 (file)
--- a/packages/opie-keytabs/opie-keytabs_cvs.bb
+++ b/packages/opie-keytabs/opie-keytabs_cvs.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.2+cvs-${SRCDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/etc"

diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
index 2389814..3cb7f85 100644 (file)
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.2+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
-PV = "${OPIE_CVS_PV}"
 
 RPROVIDES = "opie-mediaplayer2-skin"
 

diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
index bbfbd25..b2e826a 100644 (file)
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.2+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
-PV = "${OPIE_CVS_PV}"
 
 RPROVIDES = "opie-mediaplayer2-skin"
 

diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
index ac3f961..d091f50 100644 (file)
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.2+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
-PV = "${OPIE_CVS_PV}"
 
 RPROVIDES = "opie-mediaplayer2-skin"
 

diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
index 10a119a..ca44bfc 100644 (file)
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.2+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
-PV = "${OPIE_CVS_PV}"
 
 RPROVIDES = "opie-mediaplayer2-skin"
 

diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
index b080b3c..2badc15 100644 (file)
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.2+cvs-${SRCDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \
            ${HANDHELDS_CVS};module=opie/pics \

diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb
index 185ff2f..593ea5b 100644 (file)
--- a/packages/opie-pics/opie-pics_cvs.bb
+++ b/packages/opie-pics/opie-pics_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.2+cvs-${SRCDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/pics-hires"

diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
index 5f36686..5e69e87 100644 (file)
--- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
@@ -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"

diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb
index bbd3046..818a1c4 100644 (file)
--- a/packages/opie-sounds/opie-sounds_cvs.bb
+++ b/packages/opie-sounds/opie-sounds_cvs.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.2+cvs-${SRCDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/sounds"