4 files changed, 29 insertions, 38 deletions
diff --git a/packages/libmimedir/libmimedir_0.3.1.bb b/packages/libmimedir/libmimedir_0.3.1.bb
index 5238cb7ef3..ff7ec3ec45 100644
--- a/packages/libmimedir/libmimedir_0.3.1.bb
+++ b/packages/libmimedir/libmimedir_0.3.1.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native"
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "1"
 
@@ -21,4 +21,4 @@ autotools_stage_all
 
 PACKAGES += "libmimedir-utils"
 FILES_libmimedir-utils = "${bindir}"
-FILES_${PN} = "${libdir}"
+FILES_${PN} = "${libdir}/*.so.*"
diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb
deleted file mode 100644
index f2d29d4fc0..0000000000
--- a/packages/libmimedir/libmimedir_0.4.0-20060804.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "intltool-native glib-2.0"
-PR = "r4"
-DEFAULT_PREFERENCE = "5"
-SRCDATE = "20060804"
-PV = "0.4.0+cvs${SRCDATE}"
-
-SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \
-           file://mimedir-update.patch;patch=1 \
-           file://mimedir-write-sequence.patch;patch=1;pnum=0 \
-	   file://gslist-fix.patch;patch=1;maxdate=20060814 \
-	   file://libmimedir-0.4.0-duration-wkst.patch"
-
-S = "${WORKDIR}/libmimedir"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-do_stage() {
-	autotools_stage_all
-}
-
-PACKAGES =+ "libmimedir-utils"
-FILES_libmimedir-utils = "${bindir}/*"
diff --git a/packages/libmimedir/libmimedir_0.4.2.bb b/packages/libmimedir/libmimedir_0.4.2.bb
new file mode 100644
index 0000000000..2f7cc4c3e8
--- /dev/null
+++ b/packages/libmimedir/libmimedir_0.4.2.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "intltool-native"
+PR = "r0"
+
+inherit autotools pkgconfig gpe
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+    autotools_stage_all
+}
+
+
+PACKAGES += "libmimedir-utils"
+FILES_libmimedir-utils = "${bindir}"
+FILES_${PN} = "${libdir}/*.so.*"
diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_svn.bb
index f687245fcd..8bd7cc47ca 100644
--- a/packages/libmimedir/libmimedir_cvs.bb
+++ b/packages/libmimedir/libmimedir_svn.bb
@@ -3,26 +3,26 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native"
-PR = "r2"
-#Remove the dash below when 0.3.1 changes in PV
-PV = "0.3.1+cvs-${SRCDATE}"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \
-           file://mimedir-update.patch;patch=1"
+PV = "0.4.1+svn${SRCDATE}"
+PR = "r1"
+
+SRC_URI = "${GPE_SVN}"
 
 S = "${WORKDIR}/libmimedir"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig lib_package
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
 do_stage() {
-	autotools_stage_all
+        autotools_stage_all
 }
 
 PACKAGES += "libmimedir-utils"
+
 FILES_libmimedir-utils = "${bindir}"
-FILES_${PN} = "${libdir}"
+FILES_${PN} = "${libdir}/*.so.*"