merge of '05cc5d66198a3d72159d333ad23069009f5c5cda'

     and '54fa1e3c0521ed472d0150900302a759edeb5c95'

2 files changed, 29 insertions, 3 deletions

diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb
index 63e6dd9265..fe512ccb48 100644
--- a/packages/matchbox2/matchbox-panel-2_svn.bb
+++ b/packages/matchbox2/matchbox-panel-2_svn.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "matchbox-panel-2 is a lightweight dock (system tray) application
 LICENSE = "GPL"
 SECTION = "x11/panels"
 DEPENDS = "gtk+ apmd startup-notification"
-
 PV = "0.1+svn${SRCDATE}"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"
@@ -24,4 +23,5 @@ do_stage() {
 
 PACKAGES += "${PN}-applets"
 FILES_${PN}-applets = "${libdir}/matchbox-panel/lib*.so* ${datadir}/*"
+FILES_${PN}-dbg += "${libdir}/matchbox-panel/lib*.a ${libdir}/matchbox-panel/lib*.la"
 
diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb
index 5b21cc4e57..8d9a5245ca 100644
--- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb
+++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The OpenMoko Command Line Console"
 SECTION = "openmoko/applications"
 RDEPENDS += "mrxvt"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2
 
@@ -14,3 +14,29 @@ do_install() {
         install -m 0644 ${WORKDIR}/openmoko-terminal.png ${D}${datadir}/pixmaps/
         install -m 0644 ${WORKDIR}/openmoko-terminal.desktop ${D}${datadir}/applications/
 }
+
+pkg_postinst_${PN}() {
+        if [ "x$D" != "x" ]; then
+                exit 1
+        fi
+		echo "adding font defaults to system-wide mrxvtrc..."
+		cat <<EOF >> ${sysconfdir}/mrxvt/mrxvtrc
+#
+# ---------------------------------- FONTS ----------------------------------- #
+#
+Mrxvt.xft:                      1
+Mrxvt.xftFont:                  Bitstream Vera Sans Mono
+Mrxvt.xftSize:                  8
+Mrxvt.xftAntialias:             1
+
+# Don't load a multi-char font. This will reduce the line space if your multi
+# char font has different dimensions than the regular font. You might need to
+# comment it out if you want to use XIM and non-english fonts.
+Mrxvt.xftNomFont:               1
+
+# Font to use for tab bar / menus. This need not be mono-spaced ;).
+Mrxvt.xftPFont:                 Bitstream Vera Sans
+Mrxvt.xftPSize:                 8
+EOF
+
+}