merge

diff --git a/packages/gypsy/files/docs-reference-am.patch b/packages/gypsy/files/docs-reference-am.patch
deleted file mode 100644 (file)
index 9eb0051..0000000
--- a/packages/gypsy/files/docs-reference-am.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: gypsy/docs/reference/Makefile.am
-===================================================================
---- gypsy.orig/docs/reference/Makefile.am      2008-03-10 13:15:06.000000000 +0800
-+++ gypsy/docs/reference/Makefile.am   2008-03-10 13:15:24.000000000 +0800
-@@ -88,10 +88,10 @@
- 
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
--EXTRA_DIST += version.xml.in \
-+EXTRA_DIST = version.xml.in \
-       gypsy-design.png
- 
--CLEANFILES += $(dbus_docs)
-+CLEANFILES = $(dbus_docs)
- 
- ref-%.xml: $(top_srcdir)/interfaces/%-full.xml
-       $(XSLT) -o $@ $(top_srcdir)/docs/tools/spec-to-docbook.xsl $<

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

diff --git a/packages/openmoko-projects.merge/assassin_svn.bb b/packages/openmoko-projects.merge/assassin_svn.bb
new file mode 100644 (file)
index 0000000..987d440
--- /dev/null
+++ b/packages/openmoko-projects.merge/assassin_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Action GUI for Installer"
+HOMEPAGE = "http://assassin.projects.openmoko.org/"
+LICENSE = "GPL"
+DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus"
+PV = "0.2+svn${SRCREV}"
+PR = "r4"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
+
+S = "${WORKDIR}/assassin"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = ""
+
+FILES_${PN} += "${prefix}/share/*"

diff --git a/packages/openmoko-projects.merge/diversity-daemon_svn.bb b/packages/openmoko-projects.merge/diversity-daemon_svn.bb
new file mode 100644 (file)
index 0000000..02e1ea2
--- /dev/null
+++ b/packages/openmoko-projects.merge/diversity-daemon_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Diveristy Daemon"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "net/misc"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
+RDEPENDS = "eds-dbus openmoko-dialer2"
+PV = "0.0+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
+
+S = "${WORKDIR}/diversity-daemon"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-nm --disable-xmpp --enable-session-bus"
+
+FILES_${PN} += "${datadir}/dbus-1/"
+FILES_${PN} += "${sysconfdir}/dbus-1/"

diff --git a/packages/openmoko-projects.merge/diversity-nav_svn.bb b/packages/openmoko-projects.merge/diversity-nav_svn.bb
new file mode 100644 (file)
index 0000000..23d6b4d
--- /dev/null
+++ b/packages/openmoko-projects.merge/diversity-nav_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Diversity_nav - a GPS location based communicative application"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "openmoko/applications"
+LICENSE = "GPL"
+DEPENDS = "evas edje ecore edbus"
+RDEPENDS = "diversity-daemon"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
+
+S = "${WORKDIR}/diversity-nav"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"

diff --git a/packages/openmoko-projects.merge/illume/.mtn2git_empty b/packages/openmoko-projects.merge/illume/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/openmoko-projects.merge/illume/include-path.diff b/packages/openmoko-projects.merge/illume/include-path.diff
new file mode 100644 (file)
index 0000000..0b5ed8a
--- /dev/null
+++ b/packages/openmoko-projects.merge/illume/include-path.diff
@@ -0,0 +1,16 @@
+Include path fixes for Illume:
+
+$(includedir) is pointing to /usr/include, we do not want to have this when compiling
+
+Index: src/Makefile.am
+===================================================================
+--- a/src/Makefile.am  (Revision 12)
++++ b/src/Makefile.am  (Arbeitskopie)
+@@ -3,7 +3,6 @@
+ 
+ INCLUDES = -I. \
+        -I$(top_srcdir) \
+-       -I$(includedir) \
+        @e_cflags@
+ 
+ pkgdir = $(datadir)/$(MODULE_ARCH)

diff --git a/packages/openmoko-projects.merge/illume_svn.bb b/packages/openmoko-projects.merge/illume_svn.bb
new file mode 100644 (file)
index 0000000..f7dec16
--- /dev/null
+++ b/packages/openmoko-projects.merge/illume_svn.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
+DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
+LICENSE = "MIT BSD"
+PV = "svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
+           file://include-path.diff;patch=1"
+S = "${WORKDIR}/${PN}"
+
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR} \
+               --enable-simple-x11 \
+                --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+                
+FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*"
+FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
+
+do_install_append() {
+  for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
+  for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
+  for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
+  for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
+}

diff --git a/packages/openmoko-projects.merge/tangogps/.mtn2git_empty b/packages/openmoko-projects.merge/tangogps/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/openmoko-projects.merge/tangogps/global-config-h.patch b/packages/openmoko-projects.merge/tangogps/global-config-h.patch
new file mode 100644 (file)
index 0000000..973710c
--- /dev/null
+++ b/packages/openmoko-projects.merge/tangogps/global-config-h.patch
@@ -0,0 +1,30 @@
+Index: tangoGPS-0.7/src/globals.c
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.c    2008-03-13 14:21:02.000000000 +0800
++++ tangoGPS-0.7/src/globals.c 2008-03-13 14:28:49.000000000 +0800
+@@ -3,11 +3,11 @@
+  *  License    GPLv2
+  ****************************************************************************/
+ 
++#include "globals.h"
++
+ #include <gtk/gtk.h>
+ #include <gps.h>
+ 
+-#include "globals.h"
+-
+ GdkPixmap *pixmap = NULL;
+ GtkWidget *window1 = NULL;
+ GtkWidget *window2 = NULL;
+Index: tangoGPS-0.7/src/globals.h
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.h    2008-03-13 14:27:46.000000000 +0800
++++ tangoGPS-0.7/src/globals.h 2008-03-13 14:27:48.000000000 +0800
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+ 

diff --git a/packages/openmoko-projects.merge/tangogps_0.7.bb b/packages/openmoko-projects.merge/tangogps_0.7.bb
new file mode 100644 (file)
index 0000000..63513ff
--- /dev/null
+++ b/packages/openmoko-projects.merge/tangogps_0.7.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "tangoGPS map"
+AUTHOR = "Marcus Bauer <marcus.bauer@gmail.com>"
+HOMEPAGE = "http://tangogps.org/"
+SECTION = "openmoko/pim"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "curl gtk+ gpsd"
+PR = "r1"
+
+SRC_URI = "http://tangogps.org/tangoGPS-0.7.tar.gz \
+           file://global-config-h.patch;patch=1"
+
+S = "${WORKDIR}/tangoGPS-0.7"
+
+inherit autotools
+
+CPPFLAGS += "-I${STAGING_INCDIR}/gconf/2/"

diff --git a/packages/openmoko-projects/.mtn2git_empty b/packages/openmoko-projects/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb
deleted file mode 100644 (file)
index 987d440..0000000
--- a/packages/openmoko-projects/assassin_svn.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Action GUI for Installer"
-HOMEPAGE = "http://assassin.projects.openmoko.org/"
-LICENSE = "GPL"
-DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus"
-PV = "0.2+svn${SRCREV}"
-PR = "r4"
-
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
-
-S = "${WORKDIR}/assassin"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = ""
-
-FILES_${PN} += "${prefix}/share/*"

diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb
deleted file mode 100644 (file)
index 02e1ea2..0000000
--- a/packages/openmoko-projects/diversity-daemon_svn.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Diveristy Daemon"
-HOMEPAGE = "http://diversity.projects.openmoko.org/"
-SECTION = "net/misc"
-LICENSE = "GPL"
-DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
-RDEPENDS = "eds-dbus openmoko-dialer2"
-PV = "0.0+svnr${SRCREV}"
-PR = "r2"
-
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
-
-S = "${WORKDIR}/diversity-daemon"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-nm --disable-xmpp --enable-session-bus"
-
-FILES_${PN} += "${datadir}/dbus-1/"
-FILES_${PN} += "${sysconfdir}/dbus-1/"

diff --git a/packages/openmoko-projects/diversity-nav_svn.bb b/packages/openmoko-projects/diversity-nav_svn.bb
deleted file mode 100644 (file)
index 23d6b4d..0000000
--- a/packages/openmoko-projects/diversity-nav_svn.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Diversity_nav - a GPS location based communicative application"
-HOMEPAGE = "http://diversity.projects.openmoko.org/"
-SECTION = "openmoko/applications"
-LICENSE = "GPL"
-DEPENDS = "evas edje ecore edbus"
-RDEPENDS = "diversity-daemon"
-PV = "0.0.1+svnr${SRCREV}"
-PR = "r2"
-
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
-
-S = "${WORKDIR}/diversity-nav"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"

diff --git a/packages/openmoko-projects/illume/.mtn2git_empty b/packages/openmoko-projects/illume/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/openmoko-projects/illume/include-path.diff b/packages/openmoko-projects/illume/include-path.diff
deleted file mode 100644 (file)
index 0b5ed8a..0000000
--- a/packages/openmoko-projects/illume/include-path.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Include path fixes for Illume:
-
-$(includedir) is pointing to /usr/include, we do not want to have this when compiling
-
-Index: src/Makefile.am
-===================================================================
---- a/src/Makefile.am  (Revision 12)
-+++ b/src/Makefile.am  (Arbeitskopie)
-@@ -3,7 +3,6 @@
- 
- INCLUDES = -I. \
-        -I$(top_srcdir) \
--       -I$(includedir) \
-        @e_cflags@
- 
- pkgdir = $(datadir)/$(MODULE_ARCH)

diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb
deleted file mode 100644 (file)
index f7dec16..0000000
--- a/packages/openmoko-projects/illume_svn.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
-DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
-LICENSE = "MIT BSD"
-PV = "svnr${SRCREV}"
-PR = "r1"
-
-inherit e
-
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
-           file://include-path.diff;patch=1"
-S = "${WORKDIR}/${PN}"
-
-EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
-                --x-libraries=${STAGING_LIBDIR} \
-               --enable-simple-x11 \
-                --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-                
-FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*"
-FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
-
-do_install_append() {
-  for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
-  for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
-  for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
-  for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
-}

diff --git a/packages/openmoko-projects/tangogps/.mtn2git_empty b/packages/openmoko-projects/tangogps/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/openmoko-projects/tangogps/global-config-h.patch b/packages/openmoko-projects/tangogps/global-config-h.patch
deleted file mode 100644 (file)
index 973710c..0000000
--- a/packages/openmoko-projects/tangogps/global-config-h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: tangoGPS-0.7/src/globals.c
-===================================================================
---- tangoGPS-0.7.orig/src/globals.c    2008-03-13 14:21:02.000000000 +0800
-+++ tangoGPS-0.7/src/globals.c 2008-03-13 14:28:49.000000000 +0800
-@@ -3,11 +3,11 @@
-  *  License    GPLv2
-  ****************************************************************************/
- 
-+#include "globals.h"
-+
- #include <gtk/gtk.h>
- #include <gps.h>
- 
--#include "globals.h"
--
- GdkPixmap *pixmap = NULL;
- GtkWidget *window1 = NULL;
- GtkWidget *window2 = NULL;
-Index: tangoGPS-0.7/src/globals.h
-===================================================================
---- tangoGPS-0.7.orig/src/globals.h    2008-03-13 14:27:46.000000000 +0800
-+++ tangoGPS-0.7/src/globals.h 2008-03-13 14:27:48.000000000 +0800
-@@ -1,3 +1,7 @@
-+#ifdef HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
- #include <gtk/gtk.h>
- #include <gconf/gconf-client.h>
- 

diff --git a/packages/openmoko-projects/tangogps_0.7.bb b/packages/openmoko-projects/tangogps_0.7.bb
deleted file mode 100644 (file)
index 63513ff..0000000
--- a/packages/openmoko-projects/tangogps_0.7.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "tangoGPS map"
-AUTHOR = "Marcus Bauer <marcus.bauer@gmail.com>"
-HOMEPAGE = "http://tangogps.org/"
-SECTION = "openmoko/pim"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-DEPENDS = "curl gtk+ gpsd"
-PR = "r1"
-
-SRC_URI = "http://tangogps.org/tangoGPS-0.7.tar.gz \
-           file://global-config-h.patch;patch=1"
-
-S = "${WORKDIR}/tangoGPS-0.7"
-
-inherit autotools
-
-CPPFLAGS += "-I${STAGING_INCDIR}/gconf/2/"

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

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

diff --git a/packages/packagekit.merge/files/disable-docbook2man.patch b/packages/packagekit.merge/files/disable-docbook2man.patch
new file mode 100644 (file)
index 0000000..0c7d423
--- /dev/null
+++ b/packages/packagekit.merge/files/disable-docbook2man.patch
@@ -0,0 +1,12 @@
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac      2008-02-20 17:57:44.000000000 +0800
++++ git/configure.ac   2008-02-20 17:58:30.000000000 +0800
+@@ -115,6 +115,7 @@
+ if test "$DOCBOOK2MAN" = "no" ; then
+       AC_MSG_WARN([docbook2man not found, will not be able to build man documentation])
+       fi
++DOCBOOK2MAN="no"
+ AM_CONDITIONAL(HAVE_DOCBOOK2MAN, [test "$DOCBOOK2MAN" != "no"])
+ 
+ dnl ---------------------------------------------------------------------------

diff --git a/packages/packagekit.merge/packagekit_git.bb b/packages/packagekit.merge/packagekit_git.bb
new file mode 100644 (file)
index 0000000..6f3419a
--- /dev/null
+++ b/packages/packagekit.merge/packagekit_git.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "PackageKit package management abstraction"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)"
+RDEPENDS = "opkg"
+PV = "0.1+git${SRCREV}"
+PR = "r8"
+
+SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
+           file://disable-docbook2man.patch;patch=1"
+
+SRCREV = "${AUTOREV}"
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-security-framework=dummy --with-default-backend=opkg --enable-opkg"
+
+do_configure_prepend() {
+        echo "EXTRA_DIST=" > gtk-doc.make
+}
+do_stage () {
+        autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/packagekit-backend/*.so ${datadir}/dbus-1/system-services/"
+FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so "

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

diff --git a/packages/packagekit/files/.mtn2git_empty b/packages/packagekit/files/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/packagekit/files/disable-docbook2man.patch b/packages/packagekit/files/disable-docbook2man.patch
deleted file mode 100644 (file)
index 0c7d423..0000000
--- a/packages/packagekit/files/disable-docbook2man.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac      2008-02-20 17:57:44.000000000 +0800
-+++ git/configure.ac   2008-02-20 17:58:30.000000000 +0800
-@@ -115,6 +115,7 @@
- if test "$DOCBOOK2MAN" = "no" ; then
-       AC_MSG_WARN([docbook2man not found, will not be able to build man documentation])
-       fi
-+DOCBOOK2MAN="no"
- AM_CONDITIONAL(HAVE_DOCBOOK2MAN, [test "$DOCBOOK2MAN" != "no"])
- 
- dnl ---------------------------------------------------------------------------

diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb
deleted file mode 100644 (file)
index 6f3419a..0000000
--- a/packages/packagekit/packagekit_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "PackageKit package management abstraction"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)"
-RDEPENDS = "opkg"
-PV = "0.1+git${SRCREV}"
-PR = "r8"
-
-SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
-           file://disable-docbook2man.patch;patch=1"
-
-SRCREV = "${AUTOREV}"
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-security-framework=dummy --with-default-backend=opkg --enable-opkg"
-
-do_configure_prepend() {
-        echo "EXTRA_DIST=" > gtk-doc.make
-}
-do_stage () {
-        autotools_stage_all
-}
-
-FILES_${PN} += "${libdir}/packagekit-backend/*.so ${datadir}/dbus-1/system-services/"
-FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so "