[oe-commits] org.oe.dev merge of '13782a894c357c51a3fa0c51cda4e964f6e42721'

[pfalcon commit]

merge of '13782a894c357c51a3fa0c51cda4e964f6e42721'
     and 'f75a9fcd060f03cadb8d0c99ad2649c5fb05293e'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 0adebdd3d2a6f90edbc7d379bdc5e99fb896b38e
ViewMTN: http://monotone.openembedded.org/revision/info/0adebdd3d2a6f90edbc7d379bdc5e99fb896b38e
Files:
1
packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
packages/gcc/gcc-package.inc
packages/hwdata/hwdata_0.191.bb
Diffs:

#
# mt diff -r13782a894c357c51a3fa0c51cda4e964f6e42721 -r0adebdd3d2a6f90edbc7d379bdc5e99fb896b38e
#
# 
# 
# patch "packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb"
#  from [a79fc9235430d1e8d00a7ab6f52a52890112f30b]
#    to [4f2fbdbb9722d91bf03057187e07ab0daa4d2deb]
# 
============================================================
--- packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb	a79fc9235430d1e8d00a7ab6f52a52890112f30b
+++ packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb	4f2fbdbb9722d91bf03057187e07ab0daa4d2deb
@@ -1,9 +1,9 @@ SECTION = "x11/wm"
 DESCRIPTION = "Matchbox Startup monitor applet"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-startup-monitor/${PV}/mb-applet-startup-monitor-${PV}.tar.gz \
     file://85mb-applet-startup-monitor"
@@ -13,5 +13,5 @@ do_install_append() {
 
 do_install_append() {
         install -d ${D}${sysconfdir}/X11/Xsession.d
-        install -m 0755 ${WORKDIR}/10mb-applet-startup-monitor ${D}${sysconfdir}/X11/Xsession.d/
+        install -m 0755 ${WORKDIR}/85mb-applet-startup-monitor ${D}${sysconfdir}/X11/Xsession.d/
 }


#
# mt diff -rf75a9fcd060f03cadb8d0c99ad2649c5fb05293e -r0adebdd3d2a6f90edbc7d379bdc5e99fb896b38e
#
# 
# 
# patch "packages/gcc/gcc-package.inc"
#  from [1cc2816065e59a4b33fa88fb69ad95372838e537]
#    to [760299e5f8168507c53a5d73b89438f7a75d5c7c]
# 
# patch "packages/hwdata/hwdata_0.191.bb"
#  from [a4e6f065bfb933c005991e7b3698b9b17758f174]
#    to [75972da3f9c8058b901b63c5530afa723f824921]
# 
============================================================
--- packages/gcc/gcc-package.inc	1cc2816065e59a4b33fa88fb69ad95372838e537
+++ packages/gcc/gcc-package.inc	760299e5f8168507c53a5d73b89438f7a75d5c7c
@@ -92,7 +92,11 @@ do_install () {
 
 	# Move libgcc_s into /lib
 	mkdir -p ${D}${base_libdir}
-	mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
+	if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
+		mv ${D}${libdir}/nof/libgcc_s.so.* ${D}${base_libdir}
+	else
+		mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
+	fi
 	rm -f ${D}${libdir}/libgcc_s.so
 	ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${BINV} \
 		| tr -s / \
============================================================
--- packages/hwdata/hwdata_0.191.bb	a4e6f065bfb933c005991e7b3698b9b17758f174
+++ packages/hwdata/hwdata_0.191.bb	75972da3f9c8058b901b63c5530afa723f824921
@@ -1,14 +1,16 @@ LICENSE = "GPL + X11"
 DESCRIPTION = "This package contains various hardware identification and configuration data, such as the pci.ids database, or the XFree86/xorg Cards database. It's needed for the kudzu hardware detection."
 LICENSE = "GPL + X11"
 
+PR = "r1"
+
 SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/h/hwdata/hwdata_0.191.orig.tar.gz \
            http://archive.ubuntu.com/ubuntu/pool/main/h/hwdata/hwdata_0.191-1.diff.gz;patch=1 \
 	   "
 
 PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir}"
 
-
 do_install() {
 	mkdir -p ${D}${datadir}/hwdata	
-	install -m644 MonitorsDB pci* usb.ids video* upgradelist  ${D}${datadir}/hwdata
+	install -m 644 MonitorsDB pci* usb.ids video* upgradelist  ${D}${datadir}/hwdata
 }