merge of '4a859de905afc30ec35cf91dcd1dd6c18307c1f8'

     and '9c6ceb61576fa98453a24fedb60c9d2b23d79c72'

7 files changed, 12 insertions, 10 deletions

diff --git a/packages/gnome/gnome-common/.mtn2git_empty b/packages/gnome/gnome-common-2.18.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnome/gnome-common/.mtn2git_empty
+++ b/packages/gnome/gnome-common-2.18.0/.mtn2git_empty
diff --git a/packages/gnome/gnome-common/omf.patch b/packages/gnome/gnome-common-2.18.0/omf.patch
index 334425e4b2..0d85b001e0 100644
--- a/packages/gnome/gnome-common/omf.patch
+++ b/packages/gnome/gnome-common-2.18.0/omf.patch
@@ -9,5 +9,5 @@
 +			$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 +		fi; \
  	done
- 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ 	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
  
diff --git a/packages/gnome/gnome-common_2.4.0.bb b/packages/gnome/gnome-common_2.18.0.bb
index fc67bf9243..2991db81c7 100644
--- a/packages/gnome/gnome-common_2.4.0.bb
+++ b/packages/gnome/gnome-common_2.18.0.bb
@@ -20,8 +20,9 @@ do_stage () {
 	mkdir -p ${STAGE_TEMP}
 	make DESTDIR="${STAGE_TEMP}" install
 	cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
-	install -d ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
-	cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
-	cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal
+	install -d ${STAGING_DATADIR}/gnome-common
+	install -d ${STAGING_DATADIR}/aclocal
+	cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
+	cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
 	rm -rf ${STAGE_TEMP}
 }
diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb
index 02beafa044..e341fd31ab 100644
--- a/packages/gnome/gnome-desktop_2.18.3.bb
+++ b/packages/gnome/gnome-desktop_2.18.3.bb
@@ -11,8 +11,6 @@ SRC_URI += "file://scrollkeeper.patch;patch=1 \
 
 EXTRA_OECONF = "--disable-scrollkeeper"
 
-EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
-
 do_configure_prepend () {
 	cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
 }
diff --git a/packages/gnome/gnome-panel_2.18.1.bb b/packages/gnome/gnome-panel_2.18.1.bb
index 349951143b..59c6f3e6e0 100644
--- a/packages/gnome/gnome-panel_2.18.1.bb
+++ b/packages/gnome/gnome-panel_2.18.1.bb
@@ -1,8 +1,9 @@
 LICENSE = "GPL"
 DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus"
 
-inherit gnome pkgconfig
+PR = "r1"
 
+inherit gnome pkgconfig
 
 do_configure_prepend() {
         sed -i -e s:help:: ${S}/Makefile.am
@@ -12,6 +13,9 @@ do_configure_prepend() {
 PACKAGES =+ "libpanel-applet"
 FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
 
+FILES_${PN} =+ "${datadir}/gnome* \
+                ${datadir}/icons"
+
 do_stage() {
         autotools_stage_all
 }
diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb
index 701ab1556d..e829ad39ca 100644
--- a/packages/gnome/libsoup_2.2.100.bb
+++ b/packages/gnome/libsoup_2.2.100.bb
@@ -8,9 +8,9 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
 inherit autotools pkgconfig
 
 do_stage() {
-	rm -f ${PKG_CONFIG_PATH}/libsoup*
+	rm -f ${PKG_CONFIG_DIR}/libsoup*
 	autotools_stage_all
-	ln -sf ${PKG_CONFIG_PATH}/libsoup.pc ${PKG_CONFIG_PATH}/libsoup-2.2.pc
+	ln -sf ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc
 }
 
 FILES_${PN} = "${libdir}/lib*.so.*"
diff --git a/packages/gnome/libwnck_2.13.5.bb b/packages/gnome/libwnck_2.13.5.bb
index 1830a7540a..5ad3e00cbf 100644
--- a/packages/gnome/libwnck_2.13.5.bb
+++ b/packages/gnome/libwnck_2.13.5.bb
@@ -1,7 +1,6 @@
 LICENSE =	"LGPL"
 DEPENDS = 	"gtk+"
 DESCRIPTION =	"Window navigation construction toolkit"
-HOMEPAGE =	""
 
 inherit gnome