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

[koen commit]

merge of '3ec7cab836f802bb1b737eb375a0d1422ea5099b'
     and 'f0acec47ef997751817df5f6b967a73fec86904a'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 4363471130869dabc3d90ccdcff57628e3ce25e1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4363471130869dabc3d90ccdcff57628e3ce25e1
Files:
1
packages/openmoko2/openmoko-icon-theme-standard_svn.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
Diffs:

#
# mt diff -r3ec7cab836f802bb1b737eb375a0d1422ea5099b -r4363471130869dabc3d90ccdcff57628e3ce25e1
#
# 
# 
# patch "packages/openmoko2/openmoko-icon-theme-standard_svn.bb"
#  from [098dd7669bcd0356b71b33296b1b20ea51151034]
#    to [3889e0cbc8b415f8ccc206cf34c0b2d3f5324e5b]
# 
============================================================
--- packages/openmoko2/openmoko-icon-theme-standard_svn.bb	098dd7669bcd0356b71b33296b1b20ea51151034
+++ packages/openmoko2/openmoko-icon-theme-standard_svn.bb	3889e0cbc8b415f8ccc206cf34c0b2d3f5324e5b
@@ -1,6 +1,6 @@ SECTION = "openmoko/base"
 DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1.0+svn${SRCDATE}"
 PR = "r1"
 
 inherit openmoko-base autotools


#
# mt diff -rf0acec47ef997751817df5f6b967a73fec86904a -r4363471130869dabc3d90ccdcff57628e3ce25e1
#
# 
# 
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
#  from [35b2127baed9a06ff6abae932dbd14077257dbde]
#    to [fe0910c4f9d4b2220369f293fdf57c3fcb0b1bf4]
# 
============================================================
--- packages/openmoko2/openmoko-theme-standard2_svn.bb	35b2127baed9a06ff6abae932dbd14077257dbde
+++ packages/openmoko2/openmoko-theme-standard2_svn.bb	fe0910c4f9d4b2220369f293fdf57c3fcb0b1bf4
@@ -1,7 +1,7 @@ RCONFLICTS = "openmoko-theme-standard"
 DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
-PV = "0.1.0+srvn${SRCDATE}"
+PV = "0.1.0+svn${SRCDATE}"
 PR = "r1"
 
 inherit openmoko2