From: Phil Blundell <philb@gnu.org>
Date: Sun, 21 Nov 2004 00:50:31 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages-devel
X-Git-Tag: Release-2010-05/1~16058
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a80b88a1904dfeca7ba91cf72053546be6c040f8;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/21 00:50:11+00:00 nexus.co.uk!pb
also stage gpg-error.m4

BKrev: 419fe657ntbkb-WTPuC0iokde5jWYQ
---

diff --git a/libgpg-error/libgpg-error_0.7.oe b/libgpg-error/libgpg-error_0.7.oe
index 57b131791d..b37d8792fa 100644
--- a/libgpg-error/libgpg-error_0.7.oe
+++ b/libgpg-error/libgpg-error_0.7.oe
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 DESCRIPTION = "GPG-Error library"
 SECTION = "libs"
 PRIORITY = "optional"
@@ -23,4 +23,6 @@ do_stage() {
 		install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X
 	done
 
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/
 }
diff --git a/sylpheed/sylpheed_0.9.9-gtk2-20040229.oe b/sylpheed/sylpheed_0.9.9-gtk2-20040229.oe
deleted file mode 100644
index 5c4cb62d31..0000000000
--- a/sylpheed/sylpheed_0.9.9-gtk2-20040229.oe
+++ /dev/null
@@ -1,8 +0,0 @@
-SECTION = "x11/network"
-DESCRIPTION = "Mail user agent"
-DEPENDS = "gtk+"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/sylpheed-gtk2/sylpheed-0.9.9-gtk2-20040229.tar.gz"
-
-inherit autotools