merge of 40dd65ee679ec60cc190d4c6be30ff366e22f0db

     and 8430d0607315085d8609a176b022ef4857edf05f

3 files changed, 9 insertions, 10 deletions

diff --git a/packages/ipkg-utils/ipkg-link_1.6cvs.bb b/packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb
index 94f749cf62..bcd3c7b1a0 100644
--- a/packages/ipkg-utils/ipkg-link_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb
@@ -2,11 +2,10 @@ SECTION = "base"
 DESCRIPTION = "Itsy Package Manager utilities link script"
 LICENSE = "GPL"
 CONFLICTS = "ipkg-utils"
-PV_append = "${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils"
-	   	   
+
 S = "${WORKDIR}/ipkg-utils"
 
 do_compile() {
diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb
index cd24007f02..9c1ab32963 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb
@@ -1,8 +1,10 @@
-SECTION = "base"
 include ipkg-utils_${PV}.bb
-PR = "r4"
-inherit native
+
 RDEPENDS = "python-native"
+PR = "r5"
+
+inherit native
+
 # Avoid circular dependencies from package_ipk.bbclass
 PACKAGES = ""
 
diff --git a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb
index e315c82264..b0acd94954 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb
@@ -1,15 +1,13 @@
 DESCRIPTION = "Itsy Package Manager utilities"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
-PV_append = "${SRCDATE}"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils"
-	   
+
 S = "${WORKDIR}/ipkg-utils"
 
 INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py"