merge of '4b62fa79052d762d8ae8226a013c16c6ee6aa842'

     and 'f246f66dc73bb9a4a723a8abd18f7d6b1a116411'

6 files changed, 56 insertions, 18 deletions

diff --git a/packages/gpe-conf/gpe-conf_0.2.3.bb b/packages/gpe-conf/gpe-conf_0.2.3.bb
index 3f8ae1e9d5..0cb645c5d4 100644
--- a/packages/gpe-conf/gpe-conf_0.2.3.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.3.bb
@@ -4,10 +4,10 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client"
-RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones"
+RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons tzdata"
 RDEPENDS_gpe-conf-panel = "gpe-conf"
 
-PR = "r0"
+PR = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-conf/gpe-conf_0.2.4.bb b/packages/gpe-conf/gpe-conf_0.2.4.bb
index aa458d089e..15a5bce0f3 100644
--- a/packages/gpe-conf/gpe-conf_0.2.4.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.4.bb
@@ -4,10 +4,10 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr"
-RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones xrandr"
+RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons tzdata xrandr"
 RDEPENDS_gpe-conf-panel = "gpe-conf"
 
-PR = "r1"
+PR = "r2"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-conf/gpe-conf_0.2.5.bb b/packages/gpe-conf/gpe-conf_0.2.5.bb
index 39f7679cc0..eff9f55033 100644
--- a/packages/gpe-conf/gpe-conf_0.2.5.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.5.bb
@@ -4,13 +4,13 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr"
-RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones xrandr"
+RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons tzdata xrandr"
 RDEPENDS_gpe-conf-panel = "gpe-conf"
 
 RPROVIDES_${PN} += " bl"
 RCONFLICTS_${PN} = "bl"
 
-PR = "r0"
+PR = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-conf/gpe-conf_svn.bb b/packages/gpe-conf/gpe-conf_svn.bb
index f3782ef0ac..266053073a 100644
--- a/packages/gpe-conf/gpe-conf_svn.bb
+++ b/packages/gpe-conf/gpe-conf_svn.bb
@@ -6,13 +6,13 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ntp gpe-login gpe-icons"
-RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons"
+RDEPENDS_${PN} = "xst tzdata xset ntpdate gpe-login gpe-icons"
 RDEPENDS_gpe-conf-panel = "gpe-conf"
 
 inherit autotools gpe
 
 PV = "0.2.5+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${GPE_SVN}"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/ltrace/ltrace_0.4.bb b/packages/ltrace/ltrace_0.4.bb
index 97b7d18d22..bae6d49b65 100644
--- a/packages/ltrace/ltrace_0.4.bb
+++ b/packages/ltrace/ltrace_0.4.bb
@@ -3,29 +3,61 @@ HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html"
 SECTION = "devel"
 DEPENDS = "libelf"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4.orig.tar.gz \
-           ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \
+SRC_URI = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4.orig.tar.gz \
+           ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \
            file://no-usr-include.patch;patch=1"
 inherit autotools
 
 PARALLEL_MAKE = ""
-EXTRA_OEMAKE = "ARCH=${LTRACE_ARCH} \
-		INSTALL_FILE='$(INSTALL) -p -m 0644' \
+EXTRA_OEMAKE = "INSTALL_FILE='$(INSTALL) -p -m 0644' \
 		INSTALL_PROGRAM='$(INSTALL) -p -m 0755' \
 		INSTALL_SCRIPT='$(INSTALL) -p -m 0755' \
 		INSTALL_DIR='$(INSTALL) -p -d -m 0755' "
 
 export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGET_SYS}/include"
 
-LTRACE_ARCH = "${TARGET_ARCH}"
-LTRACE_ARCH_x86 = "i386"
-
 do_configure_prepend() {
 	ln -sf ./linux-gnu sysdeps/linux-gnueabi
 }
 
 do_compile() {
-	oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE}
+	case ${TARGET_ARCH} in
+		alpha*)   LTRACE_ARCH=alpha ;;
+		arm*)     LTRACE_ARCH=arm ;;
+		cris*)    LTRACE_ARCH=cris ;;
+		hppa*)    LTRACE_ARCH=parisc ;;
+		i*86*)    LTRACE_ARCH=i386 ;;
+		ia64*)    LTRACE_ARCH=ia64 ;;
+		mips*)    LTRACE_ARCH=mips ;;
+		m68k*)    LTRACE_ARCH=m68k ;;
+		powerpc*) LTRACE_ARCH=ppc ;;
+		s390*)    LTRACE_ARCH=s390 ;;
+		sh*)      LTRACE_ARCH=sh ;;
+		sparc64*) LTRACE_ARCH=sparc64 ;;
+		sparc*)   LTRACE_ARCH=sparc ;;
+		x86_64*)  LTRACE_ARCH=x86_64 ;;
+	esac
+	oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH}
+}
+
+do_install() {
+	case ${TARGET_ARCH} in
+		alpha*)   LTRACE_ARCH=alpha ;;
+		arm*)     LTRACE_ARCH=arm ;;
+		cris*)    LTRACE_ARCH=cris ;;
+		hppa*)    LTRACE_ARCH=parisc ;;
+		i*86*)    LTRACE_ARCH=i386 ;;
+		ia64*)    LTRACE_ARCH=ia64 ;;
+		mips*)    LTRACE_ARCH=mips ;;
+		m68k*)    LTRACE_ARCH=m68k ;;
+		powerpc*) LTRACE_ARCH=ppc ;;
+		s390*)    LTRACE_ARCH=s390 ;;
+		sh*)      LTRACE_ARCH=sh ;;
+		sparc64*) LTRACE_ARCH=sparc64 ;;
+		sparc*)   LTRACE_ARCH=sparc ;;
+		x86_64*)  LTRACE_ARCH=x86_64 ;;
+	esac
+	oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} INSTALL=${STAGING_BINDIR_NATIVE}/install DESTDIR=${D}
 }
diff --git a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
index 3961042a2d..ff240607cb 100644
--- a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
+++ b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
@@ -1,9 +1,9 @@
 require xorg-lib-common.inc
 
 DESCRIPTION = "Xaw is the X Athena Widget Set."
-
 DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
 PROVIDES = "xaw"
+PR = "r1"
 
 XORG_PN = "libXaw"
 
@@ -13,3 +13,9 @@ do_stage () {
 	ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
 	ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
 }
+
+PACKAGES =+ "libxaw6 libxaw7 libxaw8"
+
+FILES_libxaw6 = "${libdir}/libXaw6.so.6*"
+FILES_libxaw7 = "${libdir}/libXaw7.so.7*"
+FILES_libxaw8 = "${libdir}/libXaw8.so.8*"