[oe-commits] org.oe.dev merge of 'ca6fbf391be11c49f263e75d6b8ab2d4fd9211d6'

[oe commit]

merge of 'ca6fbf391be11c49f263e75d6b8ab2d4fd9211d6'
     and 'ff2abfa528baed226e80118e78794712e9f9395f'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: bf193ee4fe4a260a041204252d2f09524a5e8f15
ViewMTN: http://monotone.openembedded.org/revision/info/bf193ee4fe4a260a041204252d2f09524a5e8f15
Files:
1
packages/dbus/dbus-1.1.20
packages/dbus/dbus-1.2.1
packages/dbus/dbus-native_1.1.20.bb
packages/dbus/dbus-native_1.2.1.bb
packages/dbus/dbus_1.1.20.bb
packages/dbus/dbus_1.2.1.bb
packages/php/php-5.2.0
packages/php/php-5.2.5
packages/php/php-native_5.2.0.bb
packages/php/php-native_5.2.5.bb
packages/php/php_5.2.0.bb
packages/php/php_5.2.5.bb
Diffs:

#
# mt diff -rca6fbf391be11c49f263e75d6b8ab2d4fd9211d6 -rbf193ee4fe4a260a041204252d2f09524a5e8f15
#
#
#
# rename "packages/dbus/dbus-1.1.20"
#     to "packages/dbus/dbus-1.2.1"
# 
# rename "packages/dbus/dbus-native_1.1.20.bb"
#     to "packages/dbus/dbus-native_1.2.1.bb"
# 
# rename "packages/dbus/dbus_1.1.20.bb"
#     to "packages/dbus/dbus_1.2.1.bb"
# 
# patch "packages/dbus/dbus_1.2.1.bb"
#  from [3eed7451679b21ff1bcacbf99ad5688ff790ea26]
#    to [a2cc3e97b81b0b31c12bde4ee5e19b2a7f139f88]
#
============================================================
--- packages/dbus/dbus_1.1.20.bb	3eed7451679b21ff1bcacbf99ad5688ff790ea26
+++ packages/dbus/dbus_1.2.1.bb	a2cc3e97b81b0b31c12bde4ee5e19b2a7f139f88
@@ -1,5 +1,5 @@ include dbus.inc
 include dbus.inc
 
-PR = "r1"
+PR = "r0"
 
+#SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"
-SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"


#
# mt diff -rff2abfa528baed226e80118e78794712e9f9395f -rbf193ee4fe4a260a041204252d2f09524a5e8f15
#
#
#
# rename "packages/php/php-5.2.0"
#     to "packages/php/php-5.2.5"
# 
# rename "packages/php/php-native_5.2.0.bb"
#     to "packages/php/php-native_5.2.5.bb"
# 
# rename "packages/php/php_5.2.0.bb"
#     to "packages/php/php_5.2.5.bb"
#