Merge bk://oe-devel@oe-devel.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/12/05 13:03:39+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/12/05 01:31:19+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/12/04 13:38:43+01:00 uni-frankfurt.de!mickeyl
define opensimpad FEED_URIs in [gpe|opie]-image

2004/12/04 02:12:00+01:00 uni-frankfurt.de!mickeyl
add resistorui, a resistor calculation application for Opie

2004/12/04 02:10:50+01:00 uni-frankfurt.de!mickeyl
metadatafix for qpenmapfe

2004/12/04 01:27:12+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/12/04 00:55:03+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/12/04 00:33:55+01:00 uni-frankfurt.de!mickeyl
glib-1.2: install more headers into staging

2004/12/03 17:53:22+01:00 uni-frankfurt.de!mickeyl
Merge

2004/12/03 15:51:29+01:00 uni-frankfurt.de!mickeyl
add feeds to bootstrap-image as pointed out by J

2004/12/03 13:19:29+01:00 uni-frankfurt.de!mickeyl
minor cosmetics in opie-gutenbrowser and opie-ftplib

BKrev: 41b30d74fBSOes8LEt7BVgB2z8wtKA

9 files changed, 47 insertions, 11 deletions

diff --git a/glib-1.2/glib-1.2_1.2.10.oe b/glib-1.2/glib-1.2_1.2.10.oe
index ba4b3805bd..6ee6789bb4 100644
--- a/glib-1.2/glib-1.2_1.2.10.oe
+++ b/glib-1.2/glib-1.2_1.2.10.oe
@@ -1,10 +1,11 @@
-PR = "r1"
 DESCRIPTION = "GLib 1.2 is a deprecated libray to \
 provide support for old glib 1.2 based applications"
 SECTION = "libs"
 PRIORITY = "optional"
+LICENSE = "LGPL"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-1.2-native"
+PR = "r2"
 
 LEAD_SONAME = "libglib-1.2.*"
 
@@ -22,7 +23,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/glib-${PV}.tar.gz \
 
 S = "${WORKDIR}/glib-${PV}"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig binconfig
 
 acpaths = ""
 do_configure_prepend () {
@@ -31,16 +32,14 @@ do_configure_prepend () {
 	rm -f ltconfig acinclude.m4 libtool ltmain.sh
 }
 
-
 do_stage () {
 	oe_libinstall -so libglib ${STAGING_LIBDIR}
 	oe_libinstall -so -C gmodule libgmodule ${STAGING_LIBDIR}
 	oe_libinstall -so -C gthread libgthread ${STAGING_LIBDIR}
 	autotools_stage_includes
 	install -d ${STAGING_INCDIR}/glib-1.2
-	install -m 0644 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-1.2/glibconfig.h
+	install -m 0644 glibconfig.h glib.h ${STAGING_INCDIR}/glib-1.2/
 	install -d ${STAGING_DATADIR}/aclocal
 	install -m 0644 ${S}/glib.m4 ${STAGING_DATADIR}/aclocal/glib-1.2.m4
-	install -m 0755 ${S}/glib-config ${STAGING_BINDIR}
 }
 
diff --git a/meta/bootstrap-image.oe b/meta/bootstrap-image.oe
index 773dab2da2..1157a7a44b 100644
--- a/meta/bootstrap-image.oe
+++ b/meta/bootstrap-image.oe
@@ -5,3 +5,14 @@ export IPKG_INSTALL = "task-bootstrap"
 DEPENDS = "task-bootstrap"
 
 inherit image_ipk
+
+FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
+                                gpe##http://openzaurus.org/official/unstable/3.5.2/feed/gpe \
+                               opie##http://openzaurus.org/official/unstable/3.5.2/feed/opie \
+                                  e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
+
+FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/0.8/feed/x11 \
+                                gpe##http://familiar.handhelds.org/releases/0.8/feed/gpe \
+                               opie##http://familiar.handhelds.org/releases/0.8/feed/opie \
+                                  e##http://familiar.handhelds.org/releases/0.8/feed/e"
+
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 67c01d4bf6..156f0c8626 100644
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -2,7 +2,8 @@ MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 
 FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
                                 gpe##http://openzaurus.org/official/unstable/3.5.2/feed/gpe"
-
+FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
+                                gpe##http://openzaurus.org/official/unstable/3.5.2/feed/gpe"
 FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/0.8/feed/x11 \
                                 gpe##http://familiar.handhelds.org/releases/0.8/feed/gpe"
 
diff --git a/meta/meta-opie.oe b/meta/meta-opie.oe
index 6a2c96f875..4f1c3523a3 100644
--- a/meta/meta-opie.oe
+++ b/meta/meta-opie.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "Meta-package for Opie and QPE"
 MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 SECTION = "opie/base"
 ALLOW_EMPTY = 1
-PR = "r15"
+PR = "r16"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 
@@ -130,12 +130,14 @@ qpe-gaim \
 qpegps \
 qpenmapfe \
 qplot \
+resistorui \
 shopper \
 timesleuth \
 txdrug \
 tximage \
 ubahnnav \
 visiscript \
+zeecookbook \
 zbedic \
 zbench \
 zgscore \
diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index 1043dd7ed3..757b16b52c 100644
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -2,9 +2,10 @@ export IMAGE_BASENAME = "opie-image"
 export IMAGE_LINGUAS = ""
 
 FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/3.5.2/feed/opie"
+FEED_URIS_append-opensimpad = " opie##http://openzaurus.org/official/unstable/3.5.2/feed/opie"
 FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/0.8/feed/opie"
 
-PR = "r7"
+PR = "r8"
 
 include opie-collections.inc
 
diff --git a/opie-gutenbrowser/opie-gutenbrowser_1.1.7.oe b/opie-gutenbrowser/opie-gutenbrowser_1.1.7.oe
index 31f838e9e8..e42e0e0565 100644
--- a/opie-gutenbrowser/opie-gutenbrowser_1.1.7.oe
+++ b/opie-gutenbrowser/opie-gutenbrowser_1.1.7.oe
@@ -3,8 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-DEPENDS = "  opie-ftplib"
-
+DEPENDS = "opie-ftplib"
 APPNAME = "gutenbrowser"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
diff --git a/opie-gutenbrowser/opie-gutenbrowser_cvs.oe b/opie-gutenbrowser/opie-gutenbrowser_cvs.oe
index f61bcb8c7f..f7e00061dc 100644
--- a/opie-gutenbrowser/opie-gutenbrowser_cvs.oe
+++ b/opie-gutenbrowser/opie-gutenbrowser_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-DEPENDS = "  opie-ftplib"
+DEPENDS = "opie-ftplib"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "gutenbrowser"
 
diff --git a/qpenmapfe/qpenmapfe_1.0.0.oe b/qpenmapfe/qpenmapfe_1.0.0.oe
index e69de29bb2..8a9f8fac4d 100644
--- a/qpenmapfe/qpenmapfe_1.0.0.oe
+++ b/qpenmapfe/qpenmapfe_1.0.0.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "A frontend for the nmap port scanner, Qt/Embedded based Palmtop Environments Edition"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+AUTHOR = "Dennis Webb"
+APPNAME = "qpenmapfe"
+APPTYPE = "binary"
+APPDESKTOP = "${WORKDIR}"
+PR = "r0"
+
+SRC_URI = "http://home.midsouth.rr.com/zaurus/qpenmapfe_${PV}_src.tar.gz \
+           file://qpenmapfe.desktop \
+           file://qpenmapfe.png"
+S = "${WORKDIR}/qpe-nmapfe"
+
+inherit opie
+
+do_install () {
+	install -d ${D}/${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${WORKDIR}/*.png ${D}/${palmtopdir}/pics/
+	
+}
diff --git a/resistorui/resistorui_0.9.oe b/resistorui/resistorui_0.9.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/resistorui/resistorui_0.9.oe