From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sat, 23 Jul 2005 14:31:41 +0000 (+0000)
Subject: merge of 366c9cacab100ffea940e562c6e00a915c9b135b
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f1eb1ee094942fffde90cb4bf01e28650e4f9a6;p=openembedded.git

merge of 366c9cacab100ffea940e562c6e00a915c9b135b
     and 7d0136e54bdf205173cc235d2b4a5d747c2bd8bc
---

2f1eb1ee094942fffde90cb4bf01e28650e4f9a6
diff --cc packages/meta/meta-sdk.bb
index 962572d546,565988763b..757c72ecb3
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@@ -1,7 -1,7 +1,6 @@@
- PR = "r3"
 -PR      = "r4"
 -LICENSE = MIT
++PR = "r2"
 +
  DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross fakeroot-native meta-gpe"
- DEPENDS += "libidl libsvg-cairo"
 -DEPENDS += "libidl libsvg-cairo sed-native"
  
  PACKAGES = ""
  
@@@ -20,7 -20,7 +19,7 @@@ compositeext-dev 
  damageext-dev \
  dbus-dev \
  fixesext-dev \
--gconf-dbus-dev \
++gconf-dev \
  gtk+-dev \
  gtk-engines-dev \
  libapm-dev \
@@@ -87,15 -87,15 +86,17 @@@ libxtst-dev 
  libz-dev \
  matchbox-desktop-dev \
  ncurses-dev \
++orbit2-dev \
  pango-dev \
  randrext-dev \
  recordext-dev \
  renderext-dev \
  resourceext-dev \
--libiw-dev \
++rxvt-unicode-dev \
++wireless-tools-dev \
  xcalibrateext-dev \
  xextensions-dev \
--libxmu-dev \
++xmu-dev \
  xproto-dev \
  xtrans-dev \
  "
@@@ -147,7 -147,7 +148,7 @@@ EO
          echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
          echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
  	# remove unwanted housekeeping files
--	mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
++	mv ${SDK_OUTPUT}${libdir}/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
  	rm -rf ${SDK_OUTPUT}${libdir}/ipkg
  
  	# remove unwanted executables