Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev

5 files changed, 13 insertions, 9 deletions

diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
index f21bf99645..8fc80a64f1 100644
--- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
@@ -1,6 +1,9 @@
+require squashfs-tools_${PV}.bb
+
 inherit native
 
-require squashfs-tools_${PV}.bb
+DEPENDS = "zlib-native lzma-native "
+
 PR = "${INC_PR}.1"
 
 PACKAGES = ""
diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb
index a4503fcf0f..17ab6dc61b 100644
--- a/recipes/squashfs-tools/squashfs-tools_4.0.bb
+++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb
@@ -7,6 +7,8 @@ EXTRA_OEMAKE = "USE_LZMA=1 \
                 LZMA_LIB='${STAGING_LIBDIR}/liblzma.a'"
 
 DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
+
 SRC_URI += " file://portability.patch;patch=1;pnum=2 \
              file://lzma-support.patch;patch=1;pnum=2"
 
diff --git a/recipes/transmission/transmission.inc b/recipes/transmission/transmission.inc
index 7f3ca2a035..9c8b395b07 100644
--- a/recipes/transmission/transmission.inc
+++ b/recipes/transmission/transmission.inc
@@ -3,7 +3,7 @@ SECTION = "network"
 HOMEPAGE = "www.transmissionbt.com/"
 DEPENDS = "gtk+ gnutls openssl gettext libtool intltool-native curl glib-2.0-native"
 LICENSE = "GPLv2"
-PR = "r3"
+PR = "r4"
 SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \
            file://init \
            file://config"
@@ -21,12 +21,12 @@ do_install_append() {
 	install -d ${D}${localstatedir}/lib/transmission-daemon
 }
 
-PACKAGES =+ "${PN}-daemon ${PN}-client"
+PACKAGES += "${PN}-gui ${PN}-client"
 
-FILES_${PN}-daemon = "${bindir}/transmission-daemon ${datadir}/transmission ${sysconfdir} ${localstatedir}/lib/${PN}-daemon"
+FILES_${PN} = "${bindir}/transmission-daemon ${datadir}/transmission ${sysconfdir} ${localstatedir}/lib/${PN}-daemon"
 FILES_${PN}-client = "${bindir}/transmissioncli ${bindir}/transmission-remote"
-FILES_${PN} += "${datadir}/icons"
-CONFFILES_${PN}-daemon = "${sysconfdir}/default/transmission-daemon"
+FILES_${PN}-gui += "${bindir}/transmission ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps"
+CONFFILES_${PN} = "${sysconfdir}/default/transmission-daemon"
 
 # No need for online check, since update-rc.d will prepend it to here
 pkg_postinst_${PN}() {
@@ -39,4 +39,3 @@ pkg_postrm_${PN}() {
 delgroup transmission
 deluser transmission
 }
-
diff --git a/recipes/vala/vala-native_0.7.8.bb b/recipes/vala/vala-native_0.7.8.bb
index 0be4626488..7a5cad2d30 100644
--- a/recipes/vala/vala-native_0.7.8.bb
+++ b/recipes/vala/vala-native_0.7.8.bb
@@ -5,4 +5,4 @@ PR = "r0"
 
 DEPENDS = "glib-2.0-native"
 
-SRC_URI = "http://download.gnome.org/sources/vala/0.7/vala-${PV}.tar.bz2"
+SRC_URI = "${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2"
diff --git a/recipes/vala/vala_0.7.8.bb b/recipes/vala/vala_0.7.8.bb
index 0b93248116..2d0b5b7765 100644
--- a/recipes/vala/vala_0.7.8.bb
+++ b/recipes/vala/vala_0.7.8.bb
@@ -1,4 +1,4 @@
 require vala.inc
 PR = "r0"
 
-SRC_URI = "http://download.gnome.org/sources/vala/0.7/vala-${PV}.tar.bz2"
+SRC_URI = "${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2"