[oe-commits] org.oe.dev merge of '80c52e76bb10a5094aed318ae2fdb1dd54142fa6'

[oe commit]

merge of '80c52e76bb10a5094aed318ae2fdb1dd54142fa6'
     and 'eb3456028de695d23262b2922803a1c67199d914'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 640c7935544ada76836c603c8781fd8ce150dc72
ViewMTN: http://monotone.openembedded.org/revision/info/640c7935544ada76836c603c8781fd8ce150dc72
Files:
1
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
packages/ttf-fonts/ttf-sazanami_20040629.bb
Diffs:

#
# mt diff -r80c52e76bb10a5094aed318ae2fdb1dd54142fa6 -r640c7935544ada76836c603c8781fd8ce150dc72
#
# 
# 
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
#  from [4b5d3af5cb182cae469a03c02b833de42df211ed]
#    to [f1caae19a93c8361eb50c4ba8af029abf6a8d324]
# 
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb	4b5d3af5cb182cae469a03c02b833de42df211ed
+++ packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb	f1caae19a93c8361eb50c4ba8af029abf6a8d324
@@ -9,7 +9,6 @@ PR = "r4"
 PE = "1"
 PR = "r4"
 
-FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
 	file://kdrive-evdev.patch;patch=1  \


#
# mt diff -reb3456028de695d23262b2922803a1c67199d914 -r640c7935544ada76836c603c8781fd8ce150dc72
#
# 
# 
# patch "packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb"
#  from [1fc46ba6b41a744f4d9b6325ab9a0a9e60b0c449]
#    to [2c8e299c354f397856eea007f40d25e394290d27]
# 
# patch "packages/ttf-fonts/ttf-sazanami_20040629.bb"
#  from [e4733934ecd19b8573d564e08970529bdf2d650d]
#    to [d79c6c82745e6209ecc1faf35918daa85a5fbdf5]
# 
============================================================
--- packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb	1fc46ba6b41a744f4d9b6325ab9a0a9e60b0c449
+++ packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb	2c8e299c354f397856eea007f40d25e394290d27
@@ -10,5 +10,6 @@ PACKAGES = "${PN}-dbg ttf-hunky-sans ttf
 S = "${WORKDIR}/hunkyfonts-${PV}/TTF/"
 
 PACKAGES = "${PN}-dbg ttf-hunky-sans ttf-hunky-serif"
+RRECOMMENDS_${PN}-dbg = ""
 FILES_ttf-hunky-sans = "${datadir}/fonts/truetype/HunkySans*.ttf"
 FILES_ttf-hunky-serif = "${datadir}/fonts/truetype/HunkySerif*.ttf"
============================================================
--- packages/ttf-fonts/ttf-sazanami_20040629.bb	e4733934ecd19b8573d564e08970529bdf2d650d
+++ packages/ttf-fonts/ttf-sazanami_20040629.bb	d79c6c82745e6209ecc1faf35918daa85a5fbdf5
@@ -14,6 +14,7 @@ PACKAGES = "${PN}-dbg ttf-sazanami-gothi
 S = "${WORKDIR}/sazanami-20040629"
 
 PACKAGES = "${PN}-dbg ttf-sazanami-gothic ttf-sazanami-mincho"
+RRECOMMENDS_${PN}-dbg = ""
 FILES_ttf-sazanami-gothic = "${datadir}/fonts/truetype/sazanami-gothic.ttf \
 			     ${datadir}/doc/ttf-sazanami-gothic/README"
 FILES_ttf-sazanami-mincho = "${datadir}/fonts/truetype/sazanami-mincho.ttf \