[oe-commits] org.oe.dev merge of '0ee0a20f5d8af386a339a53032acfcaf526b83c1'

[xora commit]

merge of '0ee0a20f5d8af386a339a53032acfcaf526b83c1'
     and 'cc22e31466f497241a124a8c98fb74205831a60a'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 44cb388c967771c3afb8acffa545cc8473c203a9
ViewMTN: http://monotone.openembedded.org/revision/info/44cb388c967771c3afb8acffa545cc8473c203a9
Files:
1
conf/distro/include/angstrom-2007-for-openmoko-versions.inc
packages/xserver-common/xserver-common_1.22.bb
packages/mtd/mtd-utils_1.0.0+git.bb
packages/mtd/mtd-utils_1.1.0.bb
Diffs:

#
# mt diff -r0ee0a20f5d8af386a339a53032acfcaf526b83c1 -r44cb388c967771c3afb8acffa545cc8473c203a9
#
# 
# 
# patch "conf/distro/include/angstrom-2007-for-openmoko-versions.inc"
#  from [340506c9f1360260d8ad4ca3914b04642d150348]
#    to [6d3aaaaa7a79cacb60e353fc0bd6e8a27dc724c3]
# 
============================================================
--- conf/distro/include/angstrom-2007-for-openmoko-versions.inc	340506c9f1360260d8ad4ca3914b04642d150348
+++ conf/distro/include/angstrom-2007-for-openmoko-versions.inc	6d3aaaaa7a79cacb60e353fc0bd6e8a27dc724c3
@@ -1111,8 +1111,8 @@ PREFERRED_VERSION_libxsettings-client ?=
 PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
 PREFERRED_VERSION_libxsettings ?= "0.11"
 PREFERRED_VERSION_libxsettings-client ?= "0.17"
-PREFERRED_VERSION_libxslt ?= "1.1.21"
-PREFERRED_VERSION_libxslt-native ?= "1.1.21"
+PREFERRED_VERSION_libxslt ?= "1.1.22"
+PREFERRED_VERSION_libxslt-native ?= "1.1.22"
 PREFERRED_VERSION_libxt ?= "1.0.5"
 PREFERRED_VERSION_libxtrap ?= "1.0.0"
 PREFERRED_VERSION_libxtst ?= "1.0.3"


#
# mt diff -rcc22e31466f497241a124a8c98fb74205831a60a -r44cb388c967771c3afb8acffa545cc8473c203a9
#
# 
# 
# add_file "packages/xserver-common/xserver-common_1.22.bb"
#  content [14f7d103bf373a302fc67211bc1c91f71605d7fb]
# 
# patch "packages/mtd/mtd-utils_1.0.0+git.bb"
#  from [7eddd005976dfff21ab5df1d7f4010a0cb36c45a]
#    to [84c980d81b31831e212ab06f383190f75f5c49f6]
# 
# patch "packages/mtd/mtd-utils_1.1.0.bb"
#  from [55322b9b44a9887ed3b3f6a0dc04916c921b45f7]
#    to [62670e998ad85120543b4c4d96eb8c4d85363ab3]
# 
============================================================
--- packages/xserver-common/xserver-common_1.22.bb	14f7d103bf373a302fc67211bc1c91f71605d7fb
+++ packages/xserver-common/xserver-common_1.22.bb	14f7d103bf373a302fc67211bc1c91f71605d7fb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r0"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh "
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
============================================================
--- packages/mtd/mtd-utils_1.0.0+git.bb	7eddd005976dfff21ab5df1d7f4010a0cb36c45a
+++ packages/mtd/mtd-utils_1.0.0+git.bb	84c980d81b31831e212ab06f383190f75f5c49f6
@@ -36,12 +36,12 @@ do_install () {
 
 do_install () {
 	install -d ${D}${bindir}
-	install -d ${D}${includedir}
+	install -d ${D}${includedir}/mtd
 	for binary in ${mtd_utils}; do
 		install -m 0755 $binary ${D}${bindir}
 	done
 	for f in ${S}/include/mtd/*.h; do
-		install -m 0644 $f ${D}${includedir}
+		install -m 0644 $f ${D}${includedir}/mtd
 	done
 }
 
============================================================
--- packages/mtd/mtd-utils_1.1.0.bb	55322b9b44a9887ed3b3f6a0dc04916c921b45f7
+++ packages/mtd/mtd-utils_1.1.0.bb	62670e998ad85120543b4c4d96eb8c4d85363ab3
@@ -33,12 +33,12 @@ do_install () {
 
 do_install () {
 	install -d ${D}${bindir}
-	install -d ${D}${includedir}
+	install -d ${D}${includedir}/mtd
 	for binary in ${mtd_utils}; do
 		install -m 0755 $binary ${D}${bindir}
 	done
 	for f in ${S}/include/mtd/*.h; do
-		install -m 0644 $f ${D}${includedir}
+		install -m 0644 $f ${D}${includedir}/mtd
 	done
 }