merge of 635cbb19e0568d65029138d49de7e16737269724

     and f5124452885299a376f34aacc5a24848ccafde47

4 files changed, 54 insertions, 30 deletions

diff --git a/packages/gpe-contacts/gpe-contacts_0.43.bb b/packages/gpe-contacts/gpe-contacts_0.43.bb
deleted file mode 100644
index b5afbb3a3c..0000000000
--- a/packages/gpe-contacts/gpe-contacts_0.43.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-PR = "r0"
-
-DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE contacts manager"
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-
-FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts"
-
diff --git a/packages/gpe-contacts/gpe-contacts_0.44.bb b/packages/gpe-contacts/gpe-contacts_0.44.bb
deleted file mode 100644
index b5afbb3a3c..0000000000
--- a/packages/gpe-contacts/gpe-contacts_0.44.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-PR = "r0"
-
-DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE contacts manager"
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-
-FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts"
-
diff --git a/packages/libmimedir/files/mimedir-write-sequence.patch b/packages/libmimedir/files/mimedir-write-sequence.patch
new file mode 100644
index 0000000000..b03c5d9ca7
--- /dev/null
+++ b/packages/libmimedir/files/mimedir-write-sequence.patch
@@ -0,0 +1,51 @@
+? mimedir/.deps
+? mimedir/.libs
+? mimedir/libmimedir.la
+? mimedir/mimedir-attachment.lo
+? mimedir/mimedir-attendee.lo
+? mimedir/mimedir-attribute.lo
+? mimedir/mimedir-datetime.lo
+? mimedir/mimedir-init.lo
+? mimedir/mimedir-marshal.lo
+? mimedir/mimedir-period.lo
+? mimedir/mimedir-profile.lo
+? mimedir/mimedir-recurrence.lo
+? mimedir/mimedir-utils.lo
+? mimedir/mimedir-valarm.lo
+? mimedir/mimedir-vcal.lo
+? mimedir/mimedir-vcard-address.lo
+? mimedir/mimedir-vcard-email.lo
+? mimedir/mimedir-vcard-phone.lo
+? mimedir/mimedir-vcard.lo
+? mimedir/mimedir-vcomponent.lo
+? mimedir/mimedir-vevent.lo
+? mimedir/mimedir-vfreebusy.lo
+? mimedir/mimedir-vjournal.lo
+? mimedir/mimedir-vtimezone.lo
+? mimedir/mimedir-vtodo.lo
+Index: mimedir/mimedir-vcomponent.c
+===================================================================
+RCS file: /cvs/gnome/libmimedir/mimedir/mimedir-vcomponent.c,v
+retrieving revision 1.28
+diff -B -b -u -r1.28 mimedir-vcomponent.c
+--- mimedir/mimedir-vcomponent.c	26 Nov 2005 15:40:20 -0000	1.28
++++ mimedir/mimedir-vcomponent.c	7 Aug 2006 12:20:01 -0000
+@@ -456,7 +456,7 @@
+ 				   _("Sequence"),
+ 				   _("Sequence number"),
+ 				   0, G_MAXINT, 0,
+-				   G_PARAM_READABLE);
++				   G_PARAM_READWRITE);
+ 	g_object_class_install_property (gobject_class, PROP_SEQ, pspec);
+ }
+ 
+@@ -684,6 +684,9 @@
+ 		g_object_ref (G_OBJECT (priv->last_modified));
+ 		break;
+ 	}
++	case PROP_SEQ:
++		priv->sequence = g_value_get_uint (value);
++	break;
+ 
+ 	default:
+ 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
diff --git a/packages/libmimedir/libmimedir_0.3.1-20060804.bb b/packages/libmimedir/libmimedir_0.3.1-20060804.bb
index cf6b9890a8..5337f30df3 100644
--- a/packages/libmimedir/libmimedir_0.3.1-20060804.bb
+++ b/packages/libmimedir/libmimedir_0.3.1-20060804.bb
@@ -3,13 +3,14 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native glib-2.0"
-PR = "r0"
+PR = "r1"
 SRCDATE = "20060804"
 #Remove the dash below when 0.3.1 changes in PV
 PV = "0.3.1+cvs-${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \
-           file://mimedir-update.patch;patch=1"
+           file://mimedir-update.patch;patch=1 \
+           file://mimedir-write-sequence.patch;patch=1;pnum=0"
 
 S = "${WORKDIR}/libmimedir"