[oe-commits] org.oe.dev merge of '3c4f69f9ba263ccd43af4bc408f5a6cb8337233a'

[xora commit]

merge of '3c4f69f9ba263ccd43af4bc408f5a6cb8337233a'
     and 'a5257d19c1dd5c319436cc57245e4ac23ffcd467'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 46d0b6fe30d528b16a8db80eaef57458efd028c7
ViewMTN: http://monotone.openembedded.org/revision/info/46d0b6fe30d528b16a8db80eaef57458efd028c7
Files:
1
packages/openmoko2/openmoko-theme-standard2_svn.bb
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r3c4f69f9ba263ccd43af4bc408f5a6cb8337233a -r46d0b6fe30d528b16a8db80eaef57458efd028c7
#
# 
# 
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
#  from [8f9ad5c93b1857a0649e886d81d0470451dab960]
#    to [6420f38b554beea805e3d0e7428a5751cfb6eae3]
# 
============================================================
--- packages/openmoko2/openmoko-theme-standard2_svn.bb	8f9ad5c93b1857a0649e886d81d0470451dab960
+++ packages/openmoko2/openmoko-theme-standard2_svn.bb	6420f38b554beea805e3d0e7428a5751cfb6eae3
@@ -1,8 +1,8 @@ PV = "0.1.0+${SVNREV}"
 DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
 PV = "0.1.0+${SVNREV}"
-PR = "r3"
+PR = "r4"
 
 inherit openmoko2
 
@@ -15,11 +15,7 @@ do_install() {
 	cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
 	rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
 	
-	install -d ${D}${sysconfdir}/gtk-2.0
-	echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
 }
 
-CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
-
 PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir}"
-FILES_${PN} = "${datadir} ${sysconfdir}"


#
# mt diff -ra5257d19c1dd5c319436cc57245e4ac23ffcd467 -r46d0b6fe30d528b16a8db80eaef57458efd028c7
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [5d252a434632ec2bd023dab3ea432972270f3467]
#    to [af45a2489208d242783d3c9acda6d2681fa1ac97]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	5d252a434632ec2bd023dab3ea432972270f3467
+++ conf/distro/include/sane-srcrevs.inc	af45a2489208d242783d3c9acda6d2681fa1ac97
@@ -18,7 +18,7 @@ SRCREV_pn-hildon-1 ?= "14173"
 SRCREV_pn-gconf-dbus ?= "606"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-hildon-1 ?= "14173"
-SRCREV_pn-libgsmd ?= "2957"
+SRCREV_pn-libgsmd ?= "3074"
 SRCREV_pn-libmokogsmd2 ?= "2950"
 SRCREV_pn-libmokojournal2 ?= "2780"
 SRCREV_pn-libmokopanelui2 ?= "2958"
@@ -33,7 +33,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-keyboard ?= "1675"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
-SRCREV_pn-moko-gtk-engine ?= "3058"
+SRCREV_pn-moko-gtk-engine ?= "3069"
 SRCREV_pn-neod ?= "2956"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
@@ -51,7 +51,7 @@ SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-dates2 ?= "617"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "2976"
+SRCREV_pn-openmoko-dialer2 ?= "3073"
 SRCREV_pn-openmoko-feedreader2 ?= "3060"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "2873"
@@ -69,7 +69,7 @@ SRCREV_pn-openmoko-panel-gps ?= "2900"
 SRCREV_pn-openmoko-panel-demo ?= "1622"
 SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
 SRCREV_pn-openmoko-panel-gps ?= "2900"
-SRCREV_pn-openmoko-panel-gsm ?= "2936"
+SRCREV_pn-openmoko-panel-gsm ?= "3074"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "2893"
 SRCREV_pn-openmoko-session ?= "152"