merge of '362d00084fcab0dc4cba423bee3c23d68532cb36'

     and '52dfcd4e8a176e28df32baa61ee5584aa8d4c9c6'

13 files changed, 45 insertions, 21 deletions

diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb
index a4f7bb7e3a..b0e2a2ed06 100644
--- a/packages/ipkg/ipkg-collateral.bb
+++ b/packages/ipkg/ipkg-collateral.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ipkg configuration files"
 SECTION = "base"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = " \
 file://ipkg.conf.comments	\
diff --git a/packages/ipkg/ipkg-native_0.99.152.bb b/packages/ipkg/ipkg-native_0.99.152.bb
index d59eab3a61..f2deb33fba 100644
--- a/packages/ipkg/ipkg-native_0.99.152.bb
+++ b/packages/ipkg/ipkg-native_0.99.152.bb
@@ -1,2 +1,3 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
+require ipkg_${PV}.bb
+require ipkg-native.inc
+PR = "r1"
diff --git a/packages/ipkg/ipkg-native_0.99.153.bb b/packages/ipkg/ipkg-native_0.99.153.bb
index d59eab3a61..f2deb33fba 100644
--- a/packages/ipkg/ipkg-native_0.99.153.bb
+++ b/packages/ipkg/ipkg-native_0.99.153.bb
@@ -1,2 +1,3 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
+require ipkg_${PV}.bb
+require ipkg-native.inc
+PR = "r1"
diff --git a/packages/ipkg/ipkg-native_0.99.154.bb b/packages/ipkg/ipkg-native_0.99.154.bb
index d59eab3a61..f2deb33fba 100644
--- a/packages/ipkg/ipkg-native_0.99.154.bb
+++ b/packages/ipkg/ipkg-native_0.99.154.bb
@@ -1,2 +1,3 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
+require ipkg_${PV}.bb
+require ipkg-native.inc
+PR = "r1"
diff --git a/packages/ipkg/ipkg-native_0.99.159.bb b/packages/ipkg/ipkg-native_0.99.159.bb
index d59eab3a61..f2deb33fba 100644
--- a/packages/ipkg/ipkg-native_0.99.159.bb
+++ b/packages/ipkg/ipkg-native_0.99.159.bb
@@ -1,2 +1,3 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
+require ipkg_${PV}.bb
+require ipkg-native.inc
+PR = "r1"
diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb
index 6f6a1ea4fd..bf060f89fe 100644
--- a/packages/ipkg/ipkg-native_0.99.163.bb
+++ b/packages/ipkg/ipkg-native_0.99.163.bb
@@ -1,7 +1,8 @@
 S = "${WORKDIR}/ipkg-${PV}"
 
-include ipkg_${PV}.bb
-include ipkg-native.inc
+#require ipkg_${PV}.bb
+require ipkg-native.inc
+PR = "r1"
 
 inherit autotools pkgconfig native
 
diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc
index d0622c990e..3543095af8 100644
--- a/packages/ipkg/ipkg.inc
+++ b/packages/ipkg/ipkg.inc
@@ -6,7 +6,7 @@ PROVIDES = "virtual/ipkg libipkg"
 
 PACKAGES =+ "libipkg-dev libipkg"
 FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
-FILES_libipkg = "${libdir}"
+FILES_libipkg = "${libdir}/*.so.*"
 AUTO_LIBNAME_PKGS = "libipkg"
 
 SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/ipkg/ipkg_0.99.152.bb b/packages/ipkg/ipkg_0.99.152.bb
index 9285c61819..0d10a29c3f 100644
--- a/packages/ipkg/ipkg_0.99.152.bb
+++ b/packages/ipkg/ipkg_0.99.152.bb
@@ -1,2 +1,2 @@
-include ipkg.inc
-PR = "r2"
+require ipkg.inc
+PR = "r3"
diff --git a/packages/ipkg/ipkg_0.99.153.bb b/packages/ipkg/ipkg_0.99.153.bb
index 02de5e7f92..5852b6afc4 100644
--- a/packages/ipkg/ipkg_0.99.153.bb
+++ b/packages/ipkg/ipkg_0.99.153.bb
@@ -1,8 +1,8 @@
 DEFAULT_PREFERENCE = "-1"
 
-include ipkg.inc
+require ipkg.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://fix-bug1393.patch;patch=1"
 
diff --git a/packages/ipkg/ipkg_0.99.154.bb b/packages/ipkg/ipkg_0.99.154.bb
index de6af147b6..20a1996658 100644
--- a/packages/ipkg/ipkg_0.99.154.bb
+++ b/packages/ipkg/ipkg_0.99.154.bb
@@ -1,2 +1,2 @@
-include ipkg.inc
-PR = "r3"
+require ipkg.inc
+PR = "r4"
diff --git a/packages/ipkg/ipkg_0.99.155.bb b/packages/ipkg/ipkg_0.99.155.bb
index d3ef6e22a8..e5ff6dc4c2 100644
--- a/packages/ipkg/ipkg_0.99.155.bb
+++ b/packages/ipkg/ipkg_0.99.155.bb
@@ -1,3 +1,3 @@
-include ipkg.inc
-PR = "r1"
+require ipkg.inc
+PR = "r2"
 SRC_URI += "file://upgrade-message-garbage.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.159.bb b/packages/ipkg/ipkg_0.99.159.bb
index 1898c6656e..8455050622 100644
--- a/packages/ipkg/ipkg_0.99.159.bb
+++ b/packages/ipkg/ipkg_0.99.159.bb
@@ -1 +1,2 @@
-include ipkg.inc
+require ipkg.inc
+PR = "r1"
diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb
new file mode 100644
index 0000000000..5d8a834b20
--- /dev/null
+++ b/packages/ipkg/ipkg_0.99.163.bb
@@ -0,0 +1,18 @@
+include ipkg.inc
+PR = "r1"
+
+S = "${WORKDIR}/ipkg-${PV}"
+
+SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
+	file://terse.patch;patch=1"
+
+
+do_stage() {
+	oe_libinstall -so libipkg ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/libipkg/
+	for f in *.h  
+	do   
+		install -m 0644 $f ${STAGING_INCDIR}/libipkg/   
+	done
+}
+