[oe-commits] org.oe.dev merge of '5b34006a886a797a6d06678129380ba60e87a9d8'

[crofton commit]

merge of '5b34006a886a797a6d06678129380ba60e87a9d8'
     and '61f3fd528334e7f514021b99ecf6ab6cf271760a'

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 062c86a45e80afdf55210cc9ca2fc6ea24716b54
ViewMTN: http://monotone.openembedded.org/revision.psp?id=062c86a45e80afdf55210cc9ca2fc6ea24716b54
Files:
1
packages/libnfnetlink/libnfnetlink_0.0.30.bb
packages/ttf-fonts/ttf-dejavu
packages/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf
packages/ttf-fonts/ttf-dejavu_2.18.bb
Diffs:

#
# mt diff -r5b34006a886a797a6d06678129380ba60e87a9d8 -r062c86a45e80afdf55210cc9ca2fc6ea24716b54
#
# 
# 
# patch "packages/libnfnetlink/libnfnetlink_0.0.30.bb"
#  from [0bb5cccf99fbfae2cfaf7e9737675f1933d83c2b]
#    to [bfbb90ec91d7018e619075ddf641c1ecfc833c67]
# 
============================================================
--- packages/libnfnetlink/libnfnetlink_0.0.30.bb	0bb5cccf99fbfae2cfaf7e9737675f1933d83c2b
+++ packages/libnfnetlink/libnfnetlink_0.0.30.bb	bfbb90ec91d7018e619075ddf641c1ecfc833c67
@@ -15,6 +15,7 @@ do_configure() {
 
 do_configure() {
 	gnu-configize
+	libtoolize --force
 	oe_runconf
 }
 


#
# mt diff -r61f3fd528334e7f514021b99ecf6ab6cf271760a -r062c86a45e80afdf55210cc9ca2fc6ea24716b54
#
# 
# 
# add_dir "packages/ttf-fonts/ttf-dejavu"
# 
# add_file "packages/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf"
#  content [970b8a3896b9d5e57838ae9f7e4009666bc9a01a]
# 
# patch "packages/ttf-fonts/ttf-dejavu_2.18.bb"
#  from [665c70fb6e7e241ecda05c4b6b6df295d101fc78]
#    to [a6cdcbd1a325a43002867893e4f3d909beaf5d8d]
# 
============================================================
--- packages/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf	970b8a3896b9d5e57838ae9f7e4009666bc9a01a
+++ packages/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf	970b8a3896b9d5e57838ae9f7e4009666bc9a01a
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<alias>
+		<family>DejaVu Serif</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>DejaVu Sans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+ 	<alias>
+		<family>DejaVu Sans Mono</family>
+		<default><family>monospace</family></default>
+	</alias>
+</fontconfig>
============================================================
--- packages/ttf-fonts/ttf-dejavu_2.18.bb	665c70fb6e7e241ecda05c4b6b6df295d101fc78
+++ packages/ttf-fonts/ttf-dejavu_2.18.bb	a6cdcbd1a325a43002867893e4f3d909beaf5d8d
@@ -1,11 +1,12 @@ RDEPENDS_ttf-dejavu-common = ""
 DESCRIPTION = "DejaVu font - TTF Edition"
 LICENSE = "Bitstream Vera"
 HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page"
 RDEPENDS = "ttf-dejavu-common"
 RDEPENDS_ttf-dejavu-common = ""
+PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2"
-#           file://30-dejavu-aliases.conf"
+SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2 \
+           file://30-dejavu-aliases.conf"
 
 require ttf.inc
 
@@ -13,7 +14,7 @@ do_install_append () { 
 
 do_install_append () { 
 	install -d ${D}${sysconfdir}/fonts/conf.d/
-#	install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
+	install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
 }
 
 PACKAGES = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \