org.openmoko.xora.qtopia: a9e65ce9aba8735109c611eece0a18d61321a5f8
oe at monotone.openmoko.org
oe at monotone.openmoko.org
Thu Apr 17 16:31:47 CEST 2008
revision: a9e65ce9aba8735109c611eece0a18d61321a5f8
date: 2008-04-16T07:42:02
author: xora at openembedded.org
branch: org.openmoko.xora.qtopia
changelog:
propagate from branch 'org.openmoko.zecke.april-update' (head 16aa31bb680e6274af81e5dbc7498b04be776f4b)
to branch 'org.openmoko.xora.qtopia' (head bdee510b775617ac882dd7c17e5a50a5c0e7dce1)
manifest:
format_version "1"
new_manifest [f2d031c83df9016400babb498c0371bde361a457]
old_revision [16aa31bb680e6274af81e5dbc7498b04be776f4b]
patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
from [a93597ca618095b4d174aa972afb07241bb3df6a]
to [418b4c5767e8e38f347241e85caa35bebf6c428c]
old_revision [bdee510b775617ac882dd7c17e5a50a5c0e7dce1]
delete "packages/alsa/alsa-state/om-gta01/capturehandset.state"
delete "packages/alsa/alsa-state/om-gta01/captureheadset.state"
delete "packages/alsa/alsa-state/om-gta01/gsmbluetooth.state"
delete "packages/alsa/alsa-state/om-gta01/gsmhandset.state"
delete "packages/alsa/alsa-state/om-gta01/gsmheadset.state"
delete "packages/alsa/alsa-state/om-gta01/gsmspeakerout.state"
delete "packages/alsa/alsa-state/om-gta01/stereoout.state"
delete "packages/alsa/alsa-state/om-gta01/voip-handset.state"
delete "packages/alsa/alsa-state/om-gta01/voip-headset.state"
delete "packages/alsa/alsa-state/om-gta02/gsmhandset.state"
delete "packages/alsa/alsa-state/om-gta02/stereoout.state"
patch "MAINTAINERS"
from [68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb]
to [5556c9277c3381070987310400058abdd5f4c820]
patch "conf/distro/include/sane-srcrevs.inc"
from [f33b71cab36aa10b579792376f0845d420fbaf48]
to [9c9051536a4888092ceeb6bacf2c2e8f7b05aa0a]
patch "packages/alsa/alsa-state.bb"
from [2590f4545ccf7d78835320f929293f7d773dc9f9]
to [b2b06fb42b6e17fc6566d5c3cd2dd069226a5b32]
patch "packages/openmoko-projects/enlazar_svn.bb"
from [3eebf6592022236be82998d5d51941aa8ccd89a2]
to [da06261f116197bb096f6cef1c9740f28fc8a734]
patch "packages/openmoko2/openmoko-alsa-scenarios.bb"
from [eb767fd7563c9ddc41f630dbd3dd444d81f8a950]
to [b87a3d0e6b06598563cde82c1ac271dac1ef50da]
-------------- next part --------------
#
#
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
# from [a93597ca618095b4d174aa972afb07241bb3df6a]
# to [418b4c5767e8e38f347241e85caa35bebf6c428c]
#
============================================================
--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb a93597ca618095b4d174aa972afb07241bb3df6a
+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb 418b4c5767e8e38f347241e85caa35bebf6c428c
@@ -11,9 +11,9 @@ DEPENDS = "glib-2.0 dbus freetype alsa-l
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst gst-plugins-base"
-RDEPENDS = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic \
+RDEPENDS_${PN} = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic \
tzdata-australia tzdata-europe tzdata-pacific gst-meta-audio"
-PROVIDES = "qtopia-phone"
+PROVIDES_${PN} = "qtopia-phone"
PR = "r10"
SRCREV = "${AUTOREV}"
SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
@@ -97,6 +97,13 @@ do_install() {
done
# Install good icons for the desktop files
+ install -d ${D}${datadir}/pixmaps
+ ICONS=`cat ${S}/apps-fdo/*/*.desktop | grep Icon | cut -f 2 -d "="`
+ for icon in $ICONS; do
+ if [ -f "${S}/pics/$icon.png" ] ; then
+ install -D ${S}/pics/$icon.png ${D}${datadir}/pixmaps/$icon.png
+ fi
+ done
# Make sure qpe gets launched by X
install -d ${D}/${sysconfdir}/X11/Xsession.d
@@ -110,8 +117,580 @@ do_install() {
install -m 0755 ${WORKDIR}/qtopia.sh ${D}${sysconfdir}/profile.d/
}
+python populate_packages_prepend() {
+ codec_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/codecs/', d)
+ codec_name = bb.data.expand('${PN}-codec-%s', d)
+ do_split_packages(d, codec_dir, '^lib(.*).so$', codec_name, '${PN} codec for %s', extra_depends='' )
+
+ audiohw_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/audiohardware/', d)
+ audiohw_name = bb.data.expand('${PN}-audiohw-%s', d)
+ do_split_packages(d, audiohw_dir, '^lib(.*).so$', audiohw_name, '${PN} audiohw for %s', extra_depends='' )
+
+ composer_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/composers/', d)
+ composer_name = bb.data.expand('${PN}-composer-%s', d)
+ do_split_packages(d, composer_dir, '^lib(.*).so$', composer_name, '${PN} composer for %s', extra_depends='' )
+
+ content_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/content/', d)
+ content_name = bb.data.expand('${PN}-content-%s', d)
+ do_split_packages(d, content_dir, '^lib(.*).so$', content_name, '${PN} content %s', extra_depends='' )
+
+ media_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/mediaengines/', d)
+ media_name = bb.data.expand('${PN}-media-%s', d)
+ do_split_packages(d, media_dir, '^lib(.*).so$', media_name, '${PN} mediaengine %s', extra_depends='' )
+
+ multi_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/multiplexers/', d)
+ multi_name = bb.data.expand('${PN}-multiplexer-%s', d)
+ do_split_packages(d, multi_dir, '^lib(.*).so$', multi_name, '${PN} multiplexer for %s', extra_depends='' )
+
+ viewer_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/viewers/', d)
+ viewer_name = bb.data.expand('${PN}-viewer-%s', d)
+ do_split_packages(d, viewer_dir, '^lib(.*).so$', viewer_name, '${PN} viewer for %s', extra_depends='' )
+
+ network_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/network/', d)
+ network_name = bb.data.expand('${PN}-network-%s', d)
+ do_split_packages(d, network_dir, '^lib(.*).so$', network_name, '${PN} network %s', extra_depends='' )
+
+ print_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/qtopiaprinting/', d)
+ print_name = bb.data.expand('${PN}-qtopiaprinting-%s', d)
+ do_split_packages(d, print_dir, '^lib(.*).so$', print_name, '${PN} printingg %s', extra_depends='' )
+
+ vendor_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/phonevendors/', d)
+ vendor_name = bb.data.expand('${PN}-phonevendor-%s', d)
+ do_split_packages(d, vendor_dir, '^lib(.*).so$', vendor_name, '${PN} phonevendor %s', extra_depends='' )
+}
+
+PACKAGES =+ "\
+${PN}-addressbook \
+${PN}-bluetooth \
+${PN}-calculator \
+${PN}-clock \
+${PN}-datebook \
+${PN}-helpbrowser \
+${PN}-mediaplayer \
+${PN}-mediarecorder \
+${PN}-packagemanager \
+${PN}-photoedit \
+${PN}-qtmail \
+${PN}-ringprofile \
+${PN}-serverwidgets \
+${PN}-startupflags \
+${PN}-sysinfo \
+${PN}-systemtime \
+${PN}-textedit \
+${PN}-todolist \
+\
+${PN}-appearance \
+${PN}-beaming \
+${PN}-callforwarding \
+${PN}-fifteen \
+${PN}-homescreen \
+${PN}-language \
+${PN}-light-and-power \
+${PN}-logging \
+${PN}-minesweep \
+${PN}-network \
+${PN}-phonenetworks \
+${PN}-phonesettings \
+${PN}-qdsync \
+${PN}-security \
+${PN}-sip \
+${PN}-snake \
+${PN}-speeddial \
+${PN}-words \
+${PN}-worldtime \
+\
+${PN}-libamr \
+${PN}-libdissipate2 \
+${PN}-libgsm \
+${PN}-libinputmatch \
+${PN}-libmd5 \
+${PN}-libopenobex \
+${PN}-libqmstroke \
+${PN}-libqtcore \
+${PN}-libqtdbus \
+${PN}-libqtgui \
+${PN}-libqtnetwork \
+${PN}-libqtopengl \
+${PN}-libqtopiaaudio \
+${PN}-libqtopiabase \
+${PN}-libqtopiacomm \
+${PN}-libqtopiamail \
+${PN}-libqtopiamedia \
+${PN}-libqtopiaphonemodem \
+${PN}-libqtopiaphone \
+${PN}-libqtopiapim \
+${PN}-libqtopiaprinting \
+${PN}-libqtopiasmil \
+${PN}-libqtopia \
+${PN}-libqtopia-sqlite \
+${PN}-libqtscript \
+${PN}-libqtsql \
+${PN}-libqtsvg \
+${PN}-libqtxml \
+${PN}-libtimidity \
+${PN}-libvorbisidec \
+\
+${PN}-mediaserver \
+\
+${PN}-manual \
+${PN}-qpf-fonts \
+"
+
+DEBIAN_NOAUTONAME_${PN}-libamr = "1"
+DEBIAN_NOAUTONAME_${PN}-libdissipate2 = "1"
+DEBIAN_NOAUTONAME_${PN}-libgsm = "1"
+DEBIAN_NOAUTONAME_${PN}-libinputmatch = "1"
+DEBIAN_NOAUTONAME_${PN}-libmd5 = "1"
+DEBIAN_NOAUTONAME_${PN}-libopenobex = "1"
+DEBIAN_NOAUTONAME_${PN}-libqmstroke = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtcore = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtdbus = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtgui = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtnetwork = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopengl = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiaaudio = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiabase = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiacomm = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiamail = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiamedia = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiaphonemodem = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiaphone = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiapim = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiaprinting = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiasmil = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopia = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopia-sqlite = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtscript = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtsql = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtsvg = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtxml = "1"
+DEBIAN_NOAUTONAME_${PN}-libtimidity = "1"
+DEBIAN_NOAUTONAME_${PN}-libvorbisidec = "1"
+
+# quicklaunched apps
+
+FILES_${PN}-addressbook = "\
+${OE_QT_PREFIX}/plugins/application/libaddressbook.so \
+${OE_QT_PREFIX}/bin/addressbook \
+${OE_QT_PREFIX}/services/Contacts/addressbook \
+${OE_QT_PREFIX}/services/ContactsPhone/addressbook \
+${OE_QT_PREFIX}/pics/addressbook \
+${datadir}/applications/qtopia-addressbook.desktop \
+${datadir}/pixmaps/addressbook/AddressBook.png"
+
+FILES_${PN}-bluetooth ="\
+${OE_QT_PREFIX}/bin/bluetooth \
+${OE_QT_PREFIX}/bin/btsettings \
+${OE_QT_PREFIX}/bin/bt-poweroff.sh \
+${OE_QT_PREFIX}/bin/bt-poweron.sh \
+${OE_QT_PREFIX}/plugins/application/libbluetooth.so \
+${OE_QT_PREFIX}/plugins/application/libbtsettings.so \
+${OE_QT_PREFIX}/plugins/network/libbluetooth.so \
+${OE_QT_PREFIX}/pics/bluetooth \
+${OE_QT_PREFIX}/pics/btsettings \
+${OE_QT_PREFIX}/etc/network/bluetoothDUN.conf \
+${OE_QT_PREFIX}/etc/bluetooth \
+${datadir}/applications/qtopia-bluetooth.desktop \
+${datadir}/applications/qtopia-btsettings.desktop \
+${datadir}/pixmaps/btsettings/BTSettings.png"
+
+FILES_${PN}-calculator = "\
+${OE_QT_PREFIX}/plugins/application/libcalculator.so \
+${OE_QT_PREFIX}/bin/calculator \
+${OE_QT_PREFIX}/pics/calculator \
+${datadir}/applications/qtopia-calculator.desktop \
+${datadir}/pixmaps/calculator/Calculator.png"
+
+FILES_${PN}-clock = "\
+${OE_QT_PREFIX}/plugins/application/libclock.so \
+${OE_QT_PREFIX}/bin/clock \
+${OE_QT_PREFIX}/services/Alarm/clock \
+${OE_QT_PREFIX}/services/Clock/clock \
+${OE_QT_PREFIX}/services/TimeMonitor/clock \
+${OE_QT_PREFIX}/pics/clock \
+${datadir}/applications/qtopia-clock.desktop \
+${datadir}/pixmaps/clock/Clock.png"
+
+FILES_${PN}-datebook = "\
+${OE_QT_PREFIX}/plugins/application/libdatebook.so \
+${OE_QT_PREFIX}/bin/datebook \
+${OE_QT_PREFIX}/services/Calendar/datebook \
+${OE_QT_PREFIX}/services/Receive/text/x-vcalendar-Events/datebook \
+${OE_QT_PREFIX}/services/TimeMonitor/datebook \
+${OE_QT_PREFIX}/pics/datebook \
+${datadir}/applications/qtopia-datebook.desktop \
+${datadir}/pixmaps/datebook/DateBook.png"
+
+FILES_${PN}-helpbrowser = "\
+${OE_QT_PREFIX}/plugins/application/libhelpbrowser.so \
+${OE_QT_PREFIX}/bin/helpbrowser \
+${OE_QT_PREFIX}/services/Help/helpbrowser \
+${OE_QT_PREFIX}/pics/helpbrowser \
+${datadir}/applications/qtopia-helpbrowser.desktop \
+${datadir}/pixmaps/helpbrowser/HelpBrowser.png"
+
+FILES_${PN}-mediaplayer = "\
+${OE_QT_PREFIX}/plugins/application/libmediaplayer.so \
+${OE_QT_PREFIX}/bin/mediaplayer \
+${OE_QT_PREFIX}/pics/mediaplayer \
+${datadir}/applications/qtopia-mediaplayer.desktop \
+${datadir}/pixmaps/mediaplayer/VideoPlayer.png"
+
+FILES_${PN}-mediarecorder = "\
+${OE_QT_PREFIX}/plugins/application/libmediarecorder.so \
+${OE_QT_PREFIX}/bin/mediarecorder \
+${OE_QT_PREFIX}/services/VoiceRecording/mediarecorder \
+${OE_QT_PREFIX}/pics/mediarecorder \
+${datadir}/applications/qtopia-mediarecorder.desktop \
+${datadir}/pixmaps/mediarecorder/SoundRecorder.png"
+
+FILES_${PN}-packagemanager = "\
+${OE_QT_PREFIX}/plugins/application/libpackagemanager.so \
+${OE_QT_PREFIX}/bin/packagemanager \
+${OE_QT_PREFIX}/services/PackageManager/packagemanager \
+${OE_QT_PREFIX}/pics/packagemanager \
+${datadir}/applications/qtopia-packagemanager.desktop \
+${datadir}/pixmaps/packagemanager/PackageManager.png"
+
+FILES_${PN}-photoedit = "\
+${OE_QT_PREFIX}/plugins/application/libphotoedit.so \
+${OE_QT_PREFIX}/bin/photoedit \
+${OE_QT_PREFIX}/services/PhotoEdit/photoedit \
+${OE_QT_PREFIX}/pics/photoedit \
+${datadir}/applications/qtopia-photoedit.desktop \
+${datadir}/pixmaps/ImageViewer.png"
+
+FILES_${PN}-qtmail = "\
+${OE_QT_PREFIX}/plugins/application/libqtmail.so \
+${OE_QT_PREFIX}/bin/qtmail \
+${OE_QT_PREFIX}/services/SMS/qtmail \
+${OE_QT_PREFIX}/services/Email/qtmail \
+${OE_QT_PREFIX}/services/Messages/qtmail \
+${OE_QT_PREFIX}/pics/qtmail \
+${datadir}/applications/qtopia-qtmail.desktop \
+${datadir}/pixmaps/qtmail/EMail.png"
+
+FILES_${PN}-ringprofile = "\
+${OE_QT_PREFIX}/plugins/application/libprofileedit.so \
+${OE_QT_PREFIX}/bin/profileedit \
+${OE_QT_PREFIX}/services/SettingsManager/profileedit \
+${OE_QT_PREFIX}/services/Profiles/profileedit \
+${OE_QT_PREFIX}/pics/profileedit \
+${datadir}/applications/qtopia-ringprofile.desktop \
+${datadir}/pixmaps/profileedit/Note.png"
+
+FILES_${PN}-serverwidgets = "\
+${OE_QT_PREFIX}/plugins/application/libserverwidgets.so \
+${OE_QT_PREFIX}/bin/serverwidgets \
+${OE_QT_PREFIX}/pics/serverwidgets \
+${datadir}/applications/qtopia-serverwidgets.desktop \
+${datadir}/pixmaps/serverwidgets/ServerWidgets.png"
+
+FILES_${PN}-startupflags = "\
+${OE_QT_PREFIX}/plugins/application/libstartupflags.so \
+${OE_QT_PREFIX}/bin/startupflags \
+${OE_QT_PREFIX}/bin/startupflags.sh \
+${datadir}/applications/qtopia-startupflags.desktop \
+${datadir}/pixmaps/icons/flag.png"
+
+FILES_${PN}-sysinfo = "\
+${OE_QT_PREFIX}/plugins/application/libsysinfo.so \
+${OE_QT_PREFIX}/bin/sysinfo \
+${OE_QT_PREFIX}/services/CleanupWizard/sysinfo \
+${OE_QT_PREFIX}/pics/sysinfo \
+${datadir}/applications/qtopia-sysinfo.desktop \
+${datadir}/pixmaps/sysinfo/SystemInfo.png"
+
+FILES_${PN}-systemtime = "\
+${OE_QT_PREFIX}/plugins/application/libsystemtime.so \
+${OE_QT_PREFIX}/bin/systemtime \
+${OE_QT_PREFIX}/services/Date/systemtime \
+${OE_QT_PREFIX}/services/Time/systemtime \
+${OE_QT_PREFIX}/pics/systemtime \
+${datadir}/applications/qtopia-systemtime.desktop \
+${datadir}/pixmaps/systemtime/DateTime.png"
+
+FILES_${PN}-textedit = "\
+${OE_QT_PREFIX}/plugins/application/libtextedit.so \
+${OE_QT_PREFIX}/bin/textedit \
+${OE_QT_PREFIX}/services/View/text/plain/textedit \
+${OE_QT_PREFIX}/services/Open/text/plain/textedit \
+${OE_QT_PREFIX}/pics/textedit \
+${datadir}/applications/qtopia-textedit.desktop \
+${datadir}/pixmaps/textedit/TextEditor.png"
+
+FILES_${PN}-todolist = "\
+${OE_QT_PREFIX}/plugins/application/libtodolist.so \
+${OE_QT_PREFIX}/bin/todolist \
+${OE_QT_PREFIX}/services/Tasks/todolist \
+${OE_QT_PREFIX}/services/Receive/text/x-vcalendar-Tasks/todolist \
+${OE_QT_PREFIX}/pics/todolist \
+${datadir}/applications/qtopia-todolist.desktop \
+${datadir}/pixmaps/todolist/TodoList.png"
+
+# non quicklaunched apps
+
+FILES_${PN}-appearance = "\
+${OE_QT_PREFIX}/bin/appearance \
+${OE_QT_PREFIX}/services/Settings/appearance \
+${OE_QT_PREFIX}/pics/appearance \
+${datadir}/applications/qtopia-appearance.desktop \
+${datadir}/pixmaps/appearance/Appearance.png"
+
+FILES_${PN}-beaming = "\
+${OE_QT_PREFIX}/bin/beaming \
+${OE_QT_PREFIX}/pics/beaming \
+${datadir}/applications/qtopia-beaming.desktop \
+${datadir}/pixmaps/beaming/Infrared.png"
+
+FILES_${PN}-callforwarding = "\
+${OE_QT_PREFIX}/bin/callforwarding \
+${OE_QT_PREFIX}/services/CallForwarding/callforwarding \
+${OE_QT_PREFIX}/services/Settings/callforwarding \
+${OE_QT_PREFIX}/pics/callforwarding \
+${datadir}/applications/qtopia-callforwarding.desktop \
+${datadir}/pixmaps/callforwarding/CallForwarding.png"
+
+FILES_${PN}-fifteen = "\
+${OE_QT_PREFIX}/bin/fifteen \
+${OE_QT_PREFIX}/pics/fifteen \
+${datadir}/applications/qtopia-fifteen.desktop \
+${datadir}/pixmaps/fifteen/Fifteen.png"
+
+FILES_${PN}-homescreen = "\
+${OE_QT_PREFIX}/bin/homescreen \
+${OE_QT_PREFIX}/pics/homescreen \
+${datadir}/applications/qtopia-homescreen.desktop \
+${datadir}/pixmaps/homescreen/homescreen.png"
+
+FILES_${PN}-language = "\
+${OE_QT_PREFIX}/bin/language \
+${OE_QT_PREFIX}/pics/language \
+${datadir}/applications/qtopia-language.desktop \
+${datadir}/pixmaps/language/Language.png"
+
+FILES_${PN}-light-and-power = "\
+${OE_QT_PREFIX}/bin/light-and-power \
+${OE_QT_PREFIX}/services/Settings/light-and-power \
+${OE_QT_PREFIX}/pics/light-and-power \
+${datadir}/applications/qtopia-light-and-power.desktop \
+${datadir}/pixmaps/light-and-power/Light.png"
+
+FILES_${PN}-logging = "\
+${OE_QT_PREFIX}/bin/logging \
+${OE_QT_PREFIX}/pics/logging \
+${datadir}/applications/qtopia-logging.desktop \
+${datadir}/pixmaps/logging/logging.png"
+
+FILES_${PN}-minesweep = "\
+${OE_QT_PREFIX}/bin/minesweep \
+${OE_QT_PREFIX}/pics/minesweep \
+${datadir}/applications/qtopia-minesweep.desktop \
+${datadir}/pixmaps/minesweep/MineHunt.png"
+
+FILES_${PN}-network = "\
+${OE_QT_PREFIX}/bin/netsetup \
+${OE_QT_PREFIX}/services/NetworkSetup/netsetup \
+${OE_QT_PREFIX}/pics/netsetup \
+${datadir}/applications/qtopia-network.desktop \
+${datadir}/pixmaps/netsetup/PPPConnect.png"
+
+FILES_${PN}-phonenetworks = "\
+${OE_QT_PREFIX}/bin/phonenetworks \
+${OE_QT_PREFIX}/services/CallNetworks/phonenetworks \
+${OE_QT_PREFIX}/pics/phonenetworks \
+${datadir}/applications/qtopia-phonenetworks.desktop \
+${datadir}/pixmaps/phonenetworks/PhoneNetworks.png"
+
+FILES_${PN}-phonesettings = "\
+${OE_QT_PREFIX}/bin/phonesettings \
+${OE_QT_PREFIX}/pics/phonesettings \
+${datadir}/applications/qtopia-phonesettings.desktop \
+${datadir}/pixmaps/phonesettings/PhoneSettings.png"
+
+FILES_${PN}-qdsync = "\
+${OE_QT_PREFIX}/bin/qdsync \
+${OE_QT_PREFIX}/plugins/qdsync/*.so \
+${OE_QT_PREFIX}/pics/qdsync \
+${OE_QT_PREFIX}/lib/libqdsync_common.so.*"
+
+FILES_${PN}-security = "\
+${OE_QT_PREFIX}/bin/security \
+${OE_QT_PREFIX}/pics/security \
+${datadir}/applications/qtopia-security.desktop \
+${datadir}/pixmaps/security/Security.png"
+
+FILES_${PN}-sip = "\
+${OE_QT_PREFIX}/bin/sipagent \
+${OE_QT_PREFIX}/bin/sipsettings \
+${OE_QT_PREFIX}/services/Telephony/sipagent \
+${OE_QT_PREFIX}/services/MediaSession/sipagent \
+${OE_QT_PREFIX}/pics/sipsettings \
+${datadir}/applications/qtopia-sipsettings.desktop \
+${datadir}/pixmaps/sipsettings/SIP.png"
+
+FILES_${PN}-snake = "\
+${OE_QT_PREFIX}/bin/snake \
+${OE_QT_PREFIX}/pics/snake \
+${datadir}/applications/qtopia-snake.desktop \
+${datadir}/pixmaps/snake/Snake.png"
+
+FILES_${PN}-speeddial = "\
+${OE_QT_PREFIX}/bin/speeddial \
+${OE_QT_PREFIX}/pics/speeddial \
+${OE_QT_PREFIX}/sounds/speeddial \
+${datadir}/applications/qtopia-speeddial.desktop \
+${datadir}/pixmaps/speeddial/speeddial.png"
+
+FILES+_${PN}-words = "\
+${OE_QT_PREFIX}/bin/words \
+${OE_QT_PREFIX}/pics/words \
+${OE_QT_PREFIX}/etc/dict/en_US/words.dawg \
+${datadir}/applications/qtopia-words.desktop \
+${datadir}/pixmaps/words/Words.png"
+
+FILES_${PN}-worldtime = "\
+${OE_QT_PREFIX}/bin/worldtime \
+${OE_QT_PREFIX}/pics/worldtime \
+${datadir}/applications/qtopia-worldtime.desktop \
+${datadir}/pixmaps/worldtime/CityTime.png"
+
+# libs
+
+FILES_${PN}-libamr = "\
+${OE_QT_PREFIX}/lib/libamr.so.* \
+"
+
+FILES_${PN}-libdissipate2 = "\
+${OE_QT_PREFIX}/lib/libdissipate2.so.* \
+"
+
+FILES_${PN}-libgsm = "\
+${OE_QT_PREFIX}/lib/libgsm.so.* \
+"
+
+FILES_${PN}-libinputmatch = "\
+${OE_QT_PREFIX}/lib/libinputmatch.so.* \
+"
+
+FILES_${PN}-libmd5 = "\
+${OE_QT_PREFIX}/lib/libmd5.so.* \
+"
+
+FILES_${PN}-libopenobex = "\
+${OE_QT_PREFIX}/lib/libopenobex.so.* \
+"
+
+FILES_${PN}-libqmstroke = "\
+${OE_QT_PREFIX}/lib/libqmstroke.so.* \
+"
+
+FILES_${PN}-libqtcore = "\
+${OE_QT_PREFIX}/lib/libQtCore.so.* \
+"
+
+FILES_${PN}-libqtdbus = "\
+${OE_QT_PREFIX}/lib/libQtDBus.so.* \
+"
+
+FILES_${PN}-libqtgui = "\
+${OE_QT_PREFIX}/lib/libQtGui.so.* \
+"
+
+FILES_${PN}-libqtnetwork = "\
+${OE_QT_PREFIX}/lib/libQtNetwork.so.* \
+"
+
+FILES_${PN}-libqtopengl = "\
+${OE_QT_PREFIX}/lib/libQtOpenGL.so.* \
+"
+
+FILES_${PN}-libqtopiaaudio = "\
+${OE_QT_PREFIX}/lib/libqtopiaaudio.so.* \
+"
+
+FILES_${PN}-libqtopiabase = "\
+${OE_QT_PREFIX}/lib/libqtopiabase.so.* \
+"
+
+FILES_${PN}-libqtopiacomm = "\
+${OE_QT_PREFIX}/lib/libqtopiacomm.so.* \
+"
+
+FILES_${PN}-libqtopiamail = "\
+${OE_QT_PREFIX}/lib/libqtopiamail.so.* \
+"
+
+FILES_${PN}-libqtopiamedia = "\
+${OE_QT_PREFIX}/lib/libqtopiamedia.so.* \
+"
+
+FILES_${PN}-libqtopiaphonemodem = "\
+${OE_QT_PREFIX}/lib/libqtopiaphonemodem.so.* \
+"
+
+FILES_${PN}-libqtopiaphone = "\
+${OE_QT_PREFIX}/lib/libqtopiaphone.so.* \
+"
+
+FILES_${PN}-libqtopiapim = "\
+${OE_QT_PREFIX}/lib/libqtopiapim.so.* \
+"
+
+FILES_${PN}-libqtopiaprinting = "\
+${OE_QT_PREFIX}/lib/libqtopiaprinting.so.* \
+"
+
+FILES_${PN}-libqtopiasmil = "\
+${OE_QT_PREFIX}/lib/libqtopiasmil.so.* \
+"
+
+FILES_${PN}-libqtopia = "\
+${OE_QT_PREFIX}/lib/libqtopia.so.* \
+"
+
+FILES_${PN}-libqtopia-sqlite = "\
+${OE_QT_PREFIX}/lib/libqtopia-sqlite.so.* \
+"
+
+FILES_${PN}-libqtscript = "\
+${OE_QT_PREFIX}/lib/libQtScript.so.* \
+"
+
+FILES_${PN}-libqtsql = "\
+${OE_QT_PREFIX}/lib/libQtSql.so.* \
+"
+
+FILES_${PN}-libqtsvg = "\
+${OE_QT_PREFIX}/lib/libQtSvg.so.* \
+"
+
+FILES_${PN}-libqtxml = "\
+${OE_QT_PREFIX}/lib/libQtXml.so.* \
+"
+
+FILES_${PN}-libtimidity = "\
+${OE_QT_PREFIX}/lib/libtimidity.so.* \
+${OE_QT_PREFIX}/etc/timidity \
+"
+
+FILES_${PN}-libvorbisidec = "\
+${OE_QT_PREFIX}/lib/libvorbisidec.so.* \
+"
+
+# misc stuff
+
+FILES_${PN}-mediaserver = "\
+${OE_QT_PREFIX}/bin/mediaserver \
+${OE_QT_PREFIX}/services/MediaServer/mediaserver \
+"
+
+FILES_${PN}-manual = "${OE_QT_PREFIX}/help"
+
+FILES_${PN}-qpf-fonts = "${OE_QT_PREFIX}/lib/fonts"
+
FILES_${PN} += "${OE_QT_PREFIX}/bin ${OE_QT_PREFIX}/help \
- ${OE_QT_PREFIX}/lib/*.so.* ${OE_QT_PREFIX}/plugins/*/*.so \
+ ${OE_QT_PREFIX}/lib/*.so.* \
${OE_QT_PREFIX}/qtopia_db.sqlite ${OE_QT_PREFIX}/sounds \
${OE_QT_PREFIX}/etc ${OE_QT_PREFIX}/i18n \
${OE_QT_PREFIX}/pics ${OE_QT_PREFIX}/qt_plugins/*/*.so \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080417/74df3829/attachment.htm
-------------- next part --------------
#
#
# delete "packages/alsa/alsa-state/om-gta01/capturehandset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/captureheadset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmbluetooth.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmhandset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmheadset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmspeakerout.state"
#
# delete "packages/alsa/alsa-state/om-gta01/stereoout.state"
#
# delete "packages/alsa/alsa-state/om-gta01/voip-handset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/voip-headset.state"
#
# delete "packages/alsa/alsa-state/om-gta02/gsmhandset.state"
#
# delete "packages/alsa/alsa-state/om-gta02/stereoout.state"
#
# patch "MAINTAINERS"
# from [68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb]
# to [5556c9277c3381070987310400058abdd5f4c820]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [f33b71cab36aa10b579792376f0845d420fbaf48]
# to [9c9051536a4888092ceeb6bacf2c2e8f7b05aa0a]
#
# patch "packages/alsa/alsa-state.bb"
# from [2590f4545ccf7d78835320f929293f7d773dc9f9]
# to [b2b06fb42b6e17fc6566d5c3cd2dd069226a5b32]
#
# patch "packages/openmoko-projects/enlazar_svn.bb"
# from [3eebf6592022236be82998d5d51941aa8ccd89a2]
# to [da06261f116197bb096f6cef1c9740f28fc8a734]
#
# patch "packages/openmoko2/openmoko-alsa-scenarios.bb"
# from [eb767fd7563c9ddc41f630dbd3dd444d81f8a950]
# to [b87a3d0e6b06598563cde82c1ac271dac1ef50da]
#
============================================================
--- MAINTAINERS 68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb
+++ MAINTAINERS 5556c9277c3381070987310400058abdd5f4c820
@@ -165,7 +165,7 @@ Mail: mlauer at vanille-media.de
Person: Michael 'Mickey' Lauer
Mail: mlauer at vanille-media.de
-Distros: OpenMoko, Ångström, Generic
+Distros: Openmoko, Ångström, Generic
Machines: om-gta01, om-gta02, nokia810, x86, qemuarm, qemux86
Interests: Core OE infrastructure, everything Python, EFL, E17, Qt4
Recipes: *python*, efl/*, e17*
============================================================
--- conf/distro/include/sane-srcrevs.inc f33b71cab36aa10b579792376f0845d420fbaf48
+++ conf/distro/include/sane-srcrevs.inc 9c9051536a4888092ceeb6bacf2c2e8f7b05aa0a
@@ -25,6 +25,7 @@ SRCREV_pn-eglibc-intermediate ?= "5522"
SRCREV_pn-eglibc ?= "5522"
SRCREV_pn-eglibc-initial ?= "5522"
SRCREV_pn-eglibc-intermediate ?= "5522"
+SRCREV_pn-enlazar = "37"
SRCREV_pn-ezxd ?= "2074"
SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7837"
============================================================
--- packages/alsa/alsa-state.bb 2590f4545ccf7d78835320f929293f7d773dc9f9
+++ packages/alsa/alsa-state.bb b2b06fb42b6e17fc6566d5c3cd2dd069226a5b32
@@ -7,31 +7,17 @@ RRECOMMENDS_alsa-state = "alsa-states"
DESCRIPTION = "Default ALSA configuration"
LICENSE = "GPL"
RRECOMMENDS_alsa-state = "alsa-states"
-RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios"
+RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios"
+RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios"
PV = "0.1.0"
-PR = "r14.1"
+PR = "r14.3"
SRC_URI = " \
file://asoundrc \
file://asound.state \
file://alsa-state "
-SRC_URI_append_om-gta01 = " \
- file://capturehandset.state \
- file://captureheadset.state \
- file://gsmbluetooth.state \
- file://gsmhandset.state \
- file://gsmheadset.state \
- file://gsmspeakerout.state \
- file://stereoout.state \
- file://voip-handset.state \
- file://voip-headset.state"
-SRC_URI_append_om-gta02 = "\
- file://stereoout.state \
- file://gsmhandset.state \
- "
-
inherit update-rc.d
INITSCRIPT_NAME = "alsa-state"
============================================================
--- packages/openmoko-projects/enlazar_svn.bb 3eebf6592022236be82998d5d51941aa8ccd89a2
+++ packages/openmoko-projects/enlazar_svn.bb da06261f116197bb096f6cef1c9740f28fc8a734
@@ -6,6 +6,7 @@ PR = "r3"
SRCREV = "${AUTOREV}"
PV = "0.1+svn${SRCREV}"
PR = "r3"
+PE = "1"
SRC_URI = "svn://svn.projects.openmoko.org/svnroot/enlazar;module=trunk;proto=http"
============================================================
--- packages/openmoko2/openmoko-alsa-scenarios.bb eb767fd7563c9ddc41f630dbd3dd444d81f8a950
+++ packages/openmoko2/openmoko-alsa-scenarios.bb b87a3d0e6b06598563cde82c1ac271dac1ef50da
@@ -1,4 +1,4 @@
-DESCRIPTION = "Package for the different scenarios used by OpenMoko"
+DESCRIPTION = "Package for the different scenarios used by Openmoko"
SECTION = "openmoko/base"
PV = "1.0+svnr${SRCREV}"
PR = "r1"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080417/74df3829/attachment-0001.htm
More information about the commitlog
mailing list
