[oe-commits] org.oe.dev merge of '2ee8158109b81fad266d6373b64175e13ea659e4'
mickeyl commit
oe at amethyst.openembedded.net
Sat May 3 22:44:48 UTC 2008
merge of '2ee8158109b81fad266d6373b64175e13ea659e4'
and 'f2a34edab33cdaedb8303991dc23cc54c1c370ff'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 98a21ca090385ce509733ee4070961b91b9156f2
ViewMTN: http://monotone.openembedded.org/revision/info/98a21ca090385ce509733ee4070961b91b9156f2
Files:
1
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
packages/xserver-common/files/kdrive-1.4-fixes.patch
packages/xserver-common/xserver-common_1.22.bb
packages/freesmartphone/gsm0710muxd_svn.bb
packages/freesmartphone/gsm0710muxd_git.bb
packages/freesmartphone/py-odeviced
packages/freesmartphone/python-odeviced
packages/freesmartphone/py-odeviced_svn.bb
packages/freesmartphone/python-odeviced_git.bb
packages/freesmartphone/pyneod_svn.bb
packages/freesmartphone/pyneod_git.bb
packages/freesmartphone/pyneog_svn.bb
packages/freesmartphone/pyneog_git.bb
packages/freesmartphone/python-ophoned
conf/distro/include/fso-autorev.inc
packages/freesmartphone/pygsm_git.bb
packages/freesmartphone/python-ophoned_git.bb
conf/distro/include/sane-srcrevs.inc
Diffs:
#
# mt diff -r2ee8158109b81fad266d6373b64175e13ea659e4 -r98a21ca090385ce509733ee4070961b91b9156f2
#
#
#
# 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]
#
# patch "packages/xserver-common/files/kdrive-1.4-fixes.patch"
# from [6f8c983da8f0da91ef2cab52bfad178dab5bcf12]
# to [8f5baf832334e48f1611b7ad8a89d1dc103d81b5]
#
# patch "packages/xserver-common/xserver-common_1.22.bb"
# from [23c77e3a8a146e6a540d93b19586f6d621fa494c]
# to [9291843b220f9d344ce56e4f5ac171696e38b2ad]
#
============================================================
--- 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"
============================================================
--- packages/xserver-common/files/kdrive-1.4-fixes.patch 6f8c983da8f0da91ef2cab52bfad178dab5bcf12
+++ packages/xserver-common/files/kdrive-1.4-fixes.patch 8f5baf832334e48f1611b7ad8a89d1dc103d81b5
@@ -13,7 +13,7 @@
+ ARGS="$ARGS -mouse tslib"
+else
+ if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then
-+ ARGS="$ARGS -mouse /dev/input/mice"
++ ARGS="$ARGS -mouse mouse"
+ fi
fi
============================================================
--- packages/xserver-common/xserver-common_1.22.bb 23c77e3a8a146e6a540d93b19586f6d621fa494c
+++ packages/xserver-common/xserver-common_1.22.bb 9291843b220f9d344ce56e4f5ac171696e38b2ad
@@ -2,7 +2,7 @@ RDEPENDS_${PN} = "xmodmap xrandr xdpyinf
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r2"
+PR = "r3"
PACKAGE_ARCH = "all"
#
# mt diff -rf2a34edab33cdaedb8303991dc23cc54c1c370ff -r98a21ca090385ce509733ee4070961b91b9156f2
#
#
#
# rename "packages/freesmartphone/gsm0710muxd_svn.bb"
# to "packages/freesmartphone/gsm0710muxd_git.bb"
#
# rename "packages/freesmartphone/py-odeviced"
# to "packages/freesmartphone/python-odeviced"
#
# rename "packages/freesmartphone/py-odeviced_svn.bb"
# to "packages/freesmartphone/python-odeviced_git.bb"
#
# rename "packages/freesmartphone/pyneod_svn.bb"
# to "packages/freesmartphone/pyneod_git.bb"
#
# rename "packages/freesmartphone/pyneog_svn.bb"
# to "packages/freesmartphone/pyneog_git.bb"
#
# add_dir "packages/freesmartphone/python-ophoned"
#
# add_file "conf/distro/include/fso-autorev.inc"
# content [0c8a1a3299beccbe5038925b40819e352a7c865f]
#
# add_file "packages/freesmartphone/pygsm_git.bb"
# content [2f5aa7a70f246de80fd5d36410850bfa781ced98]
#
# add_file "packages/freesmartphone/python-ophoned_git.bb"
# content [ea7c430a6835bdc3187fcd080d1ad5d9128f77ac]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [992c2c8673ed907ddd1cfe89f10980cce30e9c02]
# to [2a8d95384edcc2c692a0ed61a1977601f9e22b15]
#
# patch "packages/freesmartphone/gsm0710muxd_git.bb"
# from [848b41b51ffadb51a05381fbc015bc38fa1fccb1]
# to [2769b8e4d4ba81fb8c126eb07a5807d19cbd5bc6]
#
# patch "packages/freesmartphone/pyneod_git.bb"
# from [e2cfd358134a04c53da8ea003424b74e390ddf66]
# to [d5ca18af8e0762dc3b30fe027a212e818816f59f]
#
# patch "packages/freesmartphone/pyneog_git.bb"
# from [4d72b89ba56a5345d16b5dd157d7972a4cbb4941]
# to [87565486228918daedce0d511d56f42c8ad11651]
#
# patch "packages/freesmartphone/python-odeviced_git.bb"
# from [30b9953c30c87828378bdcea8213290cc498ea8f]
# to [089f3674dfb9222f65b9c78075e3a9facdc80077]
#
============================================================
--- conf/distro/include/fso-autorev.inc 0c8a1a3299beccbe5038925b40819e352a7c865f
+++ conf/distro/include/fso-autorev.inc 0c8a1a3299beccbe5038925b40819e352a7c865f
@@ -0,0 +1,8 @@
+SRCREV_pn-gsm0710muxd = "${AUTOREV}"
+SRCREV_pn-pygsm = "${AUTOREV}"
+SRCREV_pn-pyneod = "${AUTOREV}"
+SRCREV_pn-pynoeg = "${AUTOREV}"
+SRCREV_pn-python-odeviced = "${AUTOREV}"
+SRCREV_pn-python-ophoned = "${AUTOREV}"
+SRCREV_pn-python-pytrc = "${AUTOREV}"
+SRCREV_pn-zhone = "${AUTOREV}"
============================================================
--- packages/freesmartphone/pygsm_git.bb 2f5aa7a70f246de80fd5d36410850bfa781ced98
+++ packages/freesmartphone/pygsm_git.bb 2f5aa7a70f246de80fd5d36410850bfa781ced98
@@ -0,0 +1,18 @@
+DESCRIPTION = "Python support library for GSM 07.07 / GSM 07.05 daemons"
+AUTHOR = "Michael Dietrich"
+SECTION = "console/network"
+DEPENDS = "python-cython-native python-pyrex-native"
+LICENSE = "GPL"
+PV = "0.0.0+gitr${SRCREV}"
+PR = "r0"
+
+inherit distutils
+
+SRC_URI = "${FREESMARTPHONE_GIT}/pygsm.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+RDEPENDS_${PN} += "\
+ python-dbus \
+ python-pygobject \
+ python-syslog \
+"
============================================================
--- packages/freesmartphone/python-ophoned_git.bb ea7c430a6835bdc3187fcd080d1ad5d9128f77ac
+++ packages/freesmartphone/python-ophoned_git.bb ea7c430a6835bdc3187fcd080d1ad5d9128f77ac
@@ -0,0 +1,34 @@
+DESCRIPTION = "The Open Phone Daemon (Python Implementation)"
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenPhoneServer"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+SECTION = "console/network"
+DEPENDS = "python-cython-native python-pyrex-native"
+LICENSE = "GPLv2"
+PV = "0.0.0+gitr${SRCREV}"
+PR = "r0"
+
+inherit distutils update-rc.d
+
+INITSCRIPT_NAME = "ophoned"
+INITSCRIPT_PARAMS = "defaults 20"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/python-ophoned.git;protocol=git;branch=master \
+ file://ophoned"
+S = "${WORKDIR}/git"
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d/
+ install -m 0755 ${WORKDIR}/ophoned ${D}${sysconfdir}/init.d/
+# install -m 0644 ${WORKDIR}/odeviced.conf ${D}${sysconfdir}
+ install -d ${D}${sysconfdir}/dbus-1/system.d/
+# mv -f ${D}${datadir}/etc/dbus-1/system.d/odeviced.conf ${D}${sysconfdir}/dbus-1/system.d/
+}
+
+RDEPENDS_${PN} += "\
+ python-dbus \
+ python-pygobject \
+ python-pyrtc \
+ python-syslog \
+"
+
+FILES_${PN} += "${sysconfdir}"
============================================================
--- conf/distro/include/sane-srcrevs.inc 992c2c8673ed907ddd1cfe89f10980cce30e9c02
+++ conf/distro/include/sane-srcrevs.inc 2a8d95384edcc2c692a0ed61a1977601f9e22b15
@@ -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 ?= "295"
+SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
@@ -152,10 +152,12 @@ SRCREV_pn-psplash ?= "249"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
SRCREV_pn-psplash ?= "249"
-SRCREV_pn-py-odeviced ?= "283"
+SRCREV_pn-python-odeviced ?= "e2ae2c252ef43be23781c2d09567a8d21ca1e965"
+SRCREV_pn-python-ophoned ?= "e657c81a6729aeef21ba4c6b75590658cbbef391"
+SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
SRCREV_pn-pylgrim ?= "20"
-SRCREV_pn-pyneod ?= "88"
-SRCREV_pn-pyneog ?= "88"
+SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
+SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
SRCREV_pn-python-formencode = "3148"
SRCREV_pn-python-gsmd = "148"
SRCREV_pn-python-lightmediascanner = "68"
@@ -173,4 +175,4 @@ SRCREV_pn-xoo ?= "1971"
SRCREV_pn-webkit-qtopia ?= "28656"
SRCREV_pn-wesnoth ?= "22021"
SRCREV_pn-xoo ?= "1971"
+SRCREV_pn-zhone ?= "a9496c35328f66ed8e4f840709721c5bacae2bb4"
-
============================================================
--- packages/freesmartphone/gsm0710muxd_svn.bb 848b41b51ffadb51a05381fbc015bc38fa1fccb1
+++ packages/freesmartphone/gsm0710muxd_git.bb 2769b8e4d4ba81fb8c126eb07a5807d19cbd5bc6
@@ -1,15 +1,15 @@ DESCRIPTION = "GSM 07.10 muxer userspace
DESCRIPTION = "GSM 07.10 muxer userspace daemon"
-HOMEPAGE = "http://www.freesmartphone.org"
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd"
AUTHOR = "M. Dietrich"
SECTION = "console/network"
DEPENDS = "dbus dbus-glib"
RDEPENDS = "dbus dbus-glib"
LICENSE = "GPL"
-PV = "0.9.1+svnr${SRCREV}"
-PR = "r1"
+PV = "0.9.1+gitr${SRCREV}"
+PR = "r0"
-SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd"
-S = "${WORKDIR}/gsm0710muxd"
+SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
inherit autotools
============================================================
--- packages/freesmartphone/pyneod_svn.bb e2cfd358134a04c53da8ea003424b74e390ddf66
+++ packages/freesmartphone/pyneod_git.bb d5ca18af8e0762dc3b30fe027a212e818816f59f
@@ -1,18 +1,19 @@
-DESCRIPTION = "FIC Neo Smartphone daemons implementing the freesmartphone.org dbus APIs"
+DESCRIPTION = "Zad - daemons"
+HOMEPAGE = "http://neo1973-germany.de/wiki/Zad"
AUTHOR = "M. Dietrich"
SECTION = "console/network"
DEPENDS = "python"
LICENSE = "GPL"
-PV = "0.0+svnr${SRCREV}"
-PR = "r3"
+PV = "0.0.0+gitr${SRCREV}"
+PR = "r0"
inherit update-rc.d
INITSCRIPT_NAME = "pyneod"
INITSCRIPT_PARAMS = "defaults 40"
-SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneod"
-S = "${WORKDIR}/pyneod"
+SRC_URI = "${FREESMARTPHONE_GIT}/pyneo.git;protocol=git;branch=master"
+S = "${WORKDIR}/git/pyneod"
export D := "${D}"
export PREFIX = "${prefix}"
============================================================
--- packages/freesmartphone/pyneog_svn.bb 4d72b89ba56a5345d16b5dd157d7972a4cbb4941
+++ packages/freesmartphone/pyneog_git.bb 87565486228918daedce0d511d56f42c8ad11651
@@ -1,12 +1,13 @@
-DESCRIPTION = "FIC Neo Smartphone UI Environment"
+DESCRIPTION = "Zad - GUI"
+HOMEPAGE = "http://neo1973-germany.de/wiki/Zad"
AUTHOR = "M. Dietrich"
SECTION = "python/ui"
LICENSE = "GPL"
-PV = "0.0+svnr${SRCREV}"
+PV = "0.0.0+gitr${SRCREV}"
PR = "r0"
-SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneog"
-S = "${WORKDIR}/pyneog"
+SRC_URI = "${FREESMARTPHONE_GIT}/pyneo.git;protocol=git;branch=master"
+S = "${WORKDIR}/git/pyneog"
do_compile() {
:
============================================================
--- packages/freesmartphone/py-odeviced_svn.bb 30b9953c30c87828378bdcea8213290cc498ea8f
+++ packages/freesmartphone/python-odeviced_git.bb 089f3674dfb9222f65b9c78075e3a9facdc80077
@@ -1,10 +1,10 @@ DESCRIPTION = "The Open Device Daemon Pr
DESCRIPTION = "The Open Device Daemon Prototype in Python"
-HOMEPAGE = "http://www.freesmartphone.org"
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenDeviceDaemon"
AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
SECTION = "console/network"
DEPENDS = "python-cython-native python-pyrex-native"
LICENSE = "GPLv2"
-PV = "0.7.9+svnr${SRCREV}"
+PV = "0.7.9+gitr${SRCREV}"
PR = "r0"
inherit distutils update-rc.d
@@ -12,10 +12,10 @@ INITSCRIPT_PARAMS = "defaults 20"
INITSCRIPT_NAME = "odeviced"
INITSCRIPT_PARAMS = "defaults 20"
-SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=py-odeviced \
+SRC_URI = "${FREESMARTPHONE_GIT}/python-odeviced.git;protocol=git;branch=master \
file://odeviced \
file://odeviced.conf"
-S = "${WORKDIR}/py-odeviced"
+S = "${WORKDIR}/git"
do_install_append() {
install -d ${D}${sysconfdir}/init.d/
More information about the Openembedded-commits
mailing list