[oe-commits] org.oe.dev merge of '0f8f649521fff401e2d8ec3f053ed9378b84ad4d'

[oe commit]

merge of '0f8f649521fff401e2d8ec3f053ed9378b84ad4d'
     and '737ced6a79f80f5d666816c42ce1938783ee1494'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 23988f0f297607cb4abccc22c457de8588d2bb36
ViewMTN: http://monotone.openembedded.org/revision/info/23988f0f297607cb4abccc22c457de8588d2bb36
Files:
1
packages/python/python-pyrtc_svn.bb
packages/python/python-pyrtc_git.bb
conf/distro/include/sane-srcrevs.inc
packages/libxsettings-client/make_pkgconfig_x11.patch
packages/libxsettings-client/files/make_pkgconfig_x11.patch
packages/libxsettings-client/no-host-includes.patch
packages/libxsettings-client/files/no-host-includes.patch
packages/libxsettings-client/files
packages/libxsettings-client/libxsettings-client.inc
packages/libxsettings-client/libxsettings-client_0.16.bb
Diffs:

#
# mt diff -r0f8f649521fff401e2d8ec3f053ed9378b84ad4d -r23988f0f297607cb4abccc22c457de8588d2bb36
#
#
#
# rename "packages/python/python-pyrtc_svn.bb"
#     to "packages/python/python-pyrtc_git.bb"
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [3f68781354a48bcde95fae1b91ce841a0f88ae0f]
#    to [992c2c8673ed907ddd1cfe89f10980cce30e9c02]
# 
# patch "packages/python/python-pyrtc_git.bb"
#  from [bfeeeeccaeaceda2fa0fee0dfffed426bfcad026]
#    to [897deb798f42695b6f26679036d6e4bbf4c70b67]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	3f68781354a48bcde95fae1b91ce841a0f88ae0f
+++ conf/distro/include/sane-srcrevs.inc	992c2c8673ed907ddd1cfe89f10980cce30e9c02
@@ -37,7 +37,7 @@ SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "287"
+SRCREV_pn-gsm0710muxd ?= "295"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
@@ -159,7 +159,7 @@ SRCREV_pn-python-lightmediascanner = "68
 SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-python-gsmd = "148"
 SRCREV_pn-python-lightmediascanner = "68"
-SRCREV_pn-python-pyrtc = "152"
+SRCREV_pn-python-pyrtc = "4b7fd8841ab62d81fa78509ef7f9b14d2118dcae"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
============================================================
--- packages/python/python-pyrtc_svn.bb	bfeeeeccaeaceda2fa0fee0dfffed426bfcad026
+++ packages/python/python-pyrtc_git.bb	897deb798f42695b6f26679036d6e4bbf4c70b67
@@ -6,11 +6,11 @@ DEPENDS = "python-cython-native"
 LICENSE = "GPLv2"
 SRCNAME = "pyrtc"
 DEPENDS = "python-cython-native"
-PV = "1.0.0+svnr${SRCREV}"
+PV = "1.0.0+gitr${SRCREV}"
 PR = "ml0"
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=${SRCNAME}"
-S = "${WORKDIR}/${SRCNAME}"
+SRC_URI = "git://git.freesmartphone.org/python-helpers.git;protocol=git;branch=master"
+S = "${WORKDIR}/git/${SRCNAME}"
 
 inherit distutils
 


#
# mt diff -r737ced6a79f80f5d666816c42ce1938783ee1494 -r23988f0f297607cb4abccc22c457de8588d2bb36
#
#
#
# rename "packages/libxsettings-client/make_pkgconfig_x11.patch"
#     to "packages/libxsettings-client/files/make_pkgconfig_x11.patch"
# 
# rename "packages/libxsettings-client/no-host-includes.patch"
#     to "packages/libxsettings-client/files/no-host-includes.patch"
# 
# add_dir "packages/libxsettings-client/files"
# 
# patch "packages/libxsettings-client/libxsettings-client.inc"
#  from [2594fbbde20644741473910afd39bb869e3fd05c]
#    to [5b0e41bc8b6784e36e6fd0882e186f5dde04bb6d]
# 
# patch "packages/libxsettings-client/libxsettings-client_0.16.bb"
#  from [0a77cd7a791e9d539fbcf81be38e536fb052bb54]
#    to [79837dfbfe91d07b6a2a9d6e7f58604b8b5d118e]
#
============================================================
--- packages/libxsettings-client/libxsettings-client.inc	2594fbbde20644741473910afd39bb869e3fd05c
+++ packages/libxsettings-client/libxsettings-client.inc	5b0e41bc8b6784e36e6fd0882e186f5dde04bb6d
@@ -9,7 +9,7 @@ SRC_URI = "${GPE_MIRROR}/libxsettings-cl
 inherit autotools pkgconfig gpe
 
 SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \
-        file://Makefile-am.patch;patch=1"
+"
 
 headers = "xsettings-client.h xsettings-common.h"
 do_stage () {
============================================================
--- packages/libxsettings-client/libxsettings-client_0.16.bb	0a77cd7a791e9d539fbcf81be38e536fb052bb54
+++ packages/libxsettings-client/libxsettings-client_0.16.bb	79837dfbfe91d07b6a2a9d6e7f58604b8b5d118e
@@ -1,3 +1,6 @@ require libxsettings-client.inc
 require libxsettings-client.inc
 
+SRC_URI += "        file://Makefile-am.patch;patch=1"
+
+
 PR="r2"