4 files changed, 7 insertions, 22 deletions
diff --git a/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb b/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb
index 1762800b6d..848209d850 100644
--- a/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb
+++ b/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb
@@ -1,4 +1,4 @@
-include gpe-contacts.inc
+require gpe-contacts.inc
 
 PR="r2"
 SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2"
diff --git a/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb b/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb
index 1762800b6d..848209d850 100644
--- a/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb
+++ b/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb
@@ -1,4 +1,4 @@
-include gpe-contacts.inc
+require gpe-contacts.inc
 
 PR="r2"
 SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2"
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/gpe-contacts/gpe-contacts_0.43.bb b/packages/gpe-contacts/gpe-contacts_0.46.bb
index b5afbb3a3c..04bea951f6 100644
--- a/packages/gpe-contacts/gpe-contacts_0.43.bb
+++ b/packages/gpe-contacts/gpe-contacts_0.46.bb
@@ -1,14 +1,13 @@
+DESCRIPTION = "GPE contacts manager"
 LICENSE = "GPL"
-inherit gpe autotools
-
-PR = "r0"
+SECTION = "gpe"
 
 DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus"
-SECTION = "gpe"
 RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE contacts manager"
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
 
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools
 
 FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts"