From: Chris Larson <clarson@kergoth.com>
Date: Sat, 22 May 2004 23:26:48 +0000 (+0000)
Subject: Merge openembedded@openembedded.bkbits.net:packages
X-Git-Tag: Release-2010-05/1~19028
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=947ebff17d271ee08440acc44bbadeb6e0ee1a6e;p=openembedded.git

Merge openembedded@openembedded.bkbits.net:packages
into hyperion.(none):/home/kergoth/code/projects/packages

2004/05/22 18:26:17-05:00 (none)!kergoth
Bugfix in the glib builds (removed a duplicate item from src_uri).

BKrev: 40afe1b84jKMEC4xOjqGVwM0FiC-eQ
---

diff --git a/glib-2.0/glib-2.0-native_2.4.1.oe b/glib-2.0/glib-2.0-native_2.4.1.oe
index 7987a828f9..717be6ad1f 100644
--- a/glib-2.0/glib-2.0-native_2.4.1.oe
+++ b/glib-2.0/glib-2.0-native_2.4.1.oe
@@ -12,7 +12,6 @@ EXTRA_OECONF = "--disable-debug"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glib-2.0-${PV}"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
-           file://glibconfig-sysdefs.h \
            file://gtk-doc.patch;patch=1 \
            file://glibconfig-sysdefs.h"
 
diff --git a/glib-2.0/glib-2.0_2.4.1.oe b/glib-2.0/glib-2.0_2.4.1.oe
index 013b901c17..f6b83ce432 100644
--- a/glib-2.0/glib-2.0_2.4.1.oe
+++ b/glib-2.0/glib-2.0_2.4.1.oe
@@ -15,7 +15,6 @@ FILES_glib-2.0-utils = "${bindir}/*"
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
-           file://glibconfig-sysdefs.h \
            file://gtk-doc.patch;patch=1 \
            file://glibconfig-sysdefs.h"