merge of '7d22e72b69f8f66fb6c9a1517dd341b70559cfc7'

     and 'c82c3d791987b7feb095d7b6b0c12a52eef72fb0'

5 files changed, 11 insertions, 208 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index da0aabee38..33349fcde1 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -26,6 +26,7 @@ INHERIT += "packaged-staging"
 require conf/distro/include/sane-srcdates.inc
 require conf/distro/include/sane-srcrevs.inc
 require conf/distro/include/angstrom-2008-preferred-versions.inc
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
 
 #Images built can have to modes:
 # 'debug': empty rootpassword, strace included
diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc
index bb7bc45fbd..81ffed71f8 100644
--- a/conf/distro/include/angstromoabi.inc
+++ b/conf/distro/include/angstromoabi.inc
@@ -1,4 +1,4 @@
 require conf/distro/include/angstrom.inc
 
 PACKAGE_ARCH     = "arm-oabi"
-
+BASE_PACKAGE_ARCH = "arm-oabi"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4.inc
index 10d0833c6c..cc5dbd53b9 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.4.inc
@@ -1,12 +1,9 @@
 #
 # Default versions
 QTE_VERSION ?= "2.3.10"
+OPIE_VERSION ?= "1.2.4"
 PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 
-OPIE_SRCDATE ?= "20080914"
-OPIE_VERSION ?= "1.2.3+cvs${OPIE_SRCDATE}"
-OPIE_CVS_PV ?= "1.2.3+cvs${OPIE_SRCDATE}"
-
 #
 #
 # Opie libraries
@@ -15,21 +12,12 @@ PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHRE
 PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
 PREFERRED_VERSION_qte-mt = "${QTE_VERSION}"
 PREFERRED_VERSION_qte = "${QTE_VERSION}"
-
 PREFERRED_VERSION_libopie2 ?= "${OPIE_VERSION}"
 PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}"
 PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}"
 PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
 PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
 PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}"
-
-SRCDATE_libopie2 ?= "${OPIE_SRCDATE}"
-SRCDATE_libopieobex0 = "${OPIE_SRCDATE}"
-SRCDATE_libopietooth1 = "${OPIE_SRCDATE}"
-SRCDATE_libqpe-opie = "${OPIE_SRCDATE}"
-SRCDATE_libqtaux2 = "${OPIE_SRCDATE}"
-SRCDATE_libmailwrapper = "${OPIE_SRCDATE}"
-
 #
 # Opie applications
 #
@@ -141,7 +129,6 @@ PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pcmciaapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
@@ -220,195 +207,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
-
 PREFERRED_VERSION_konqueror-embedded = "20070316"
-
-
-SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-addressbook = "${OPIE_SRCDATE}"
-SRCDATE_opie-advancedfm = "${OPIE_SRCDATE}"
-SRCDATE_opie-alarm = "${OPIE_SRCDATE}"
-SRCDATE_opie-appearance = "${OPIE_SRCDATE}"
-SRCDATE_opie-aqpkg = "${OPIE_SRCDATE}"
-SRCDATE_opie-autorotateapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-backgammon = "${OPIE_SRCDATE}"
-SRCDATE_opie-backup = "${OPIE_SRCDATE}"
-SRCDATE_opie-bartender = "${OPIE_SRCDATE}"
-SRCDATE_opie-batteryapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-bluepin ?= "${OPIE_SRCDATE}"
-SRCDATE_opie-bluetoothapplet ?= "${OPIE_SRCDATE}"
-SRCDATE_opie-bluetoothmanager ?= "${OPIE_SRCDATE}"
-SRCDATE_opie-bounce = "${OPIE_SRCDATE}"
-SRCDATE_opie-brightnessapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-button-settings = "${OPIE_SRCDATE}"
-SRCDATE_opie-buzzword = "${OPIE_SRCDATE}"
-SRCDATE_opie-calculator = "${OPIE_SRCDATE}"
-SRCDATE_opie-calibrate = "${OPIE_SRCDATE}"
-SRCDATE_opie-camera = "${OPIE_SRCDATE}"
-SRCDATE_opie-cardmon = "${OPIE_SRCDATE}"
-SRCDATE_opie-checkbook = "${OPIE_SRCDATE}"
-SRCDATE_opie-citytime = "${OPIE_SRCDATE}"
-SRCDATE_opie-clipboardapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-clockapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-clock = "${OPIE_SRCDATE}"
-SRCDATE_opie-confeditor = "${OPIE_SRCDATE}"
-SRCDATE_opie-console = "${OPIE_SRCDATE}"
-SRCDATE_opie-dagger = "${OPIE_SRCDATE}"
-SRCDATE_opie-dasher = "${OPIE_SRCDATE}"
-SRCDATE_opie-datebook = "${OPIE_SRCDATE}"
-SRCDATE_opie-datebook-chrisholidayplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-datebook-nationalholidayplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-datebook-birthdayplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-deco-flat = "${OPIE_SRCDATE}"
-SRCDATE_opie-deco-liquid = "${OPIE_SRCDATE}"
-SRCDATE_opie-deco-polished = "${OPIE_SRCDATE}"
-SRCDATE_opie-doctab = "${OPIE_SRCDATE}"
-SRCDATE_opie-drawpad = "${OPIE_SRCDATE}"
-SRCDATE_opie-dvorak = "${OPIE_SRCDATE}"
-SRCDATE_opie-embeddedkonsole = "${OPIE_SRCDATE}"
-SRCDATE_opie-euroconv = "${OPIE_SRCDATE}"
-SRCDATE_opie-examples-python = "${OPIE_SRCDATE}"
-SRCDATE_opie-examples = "${OPIE_SRCDATE}"
-SRCDATE_opie-eye = "${OPIE_SRCDATE}"
-SRCDATE_opie-fifteen = "${OPIE_SRCDATE}"
-SRCDATE_opie-formatter = "${OPIE_SRCDATE}"
-SRCDATE_opie-freetype = "${OPIE_SRCDATE}"
-SRCDATE_opie-ftplib = "${OPIE_SRCDATE}"
-SRCDATE_opie-ftp = "${OPIE_SRCDATE}"
-SRCDATE_opie-go = "${OPIE_SRCDATE}"
-SRCDATE_opie-gutenbrowser = "${OPIE_SRCDATE}"
-SRCDATE_opie-handwriting = "${OPIE_SRCDATE}"
-SRCDATE_opie-helpbrowser = "${OPIE_SRCDATE}"
-SRCDATE_opie-help-en = "${OPIE_SRCDATE}"
-SRCDATE_opie-homeapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-i18n = "${OPIE_SRCDATE}"
-SRCDATE_opie-lrelease-native = "${OPIE_SRCDATE}"
-SRCDATE_opie-lupdate-native = "${OPIE_SRCDATE}"
-SRCDATE_opie-icon-reload = "${OPIE_SRCDATE}"
-SRCDATE_opie-irc = "${OPIE_SRCDATE}"
-SRCDATE_opie-irdaapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-jumpx = "${OPIE_SRCDATE}"
-SRCDATE_opie-kbill = "${OPIE_SRCDATE}"
-SRCDATE_opie-kcheckers = "${OPIE_SRCDATE}"
-SRCDATE_opie-keyboard = "${OPIE_SRCDATE}"
-SRCDATE_opie-keypebble = "${OPIE_SRCDATE}"
-SRCDATE_opie-keytabs = "${OPIE_SRCDATE}"
-SRCDATE_opie-keyview = "${OPIE_SRCDATE}"
-SRCDATE_opie-kjumpx = "${OPIE_SRCDATE}"
-SRCDATE_opie-kpacman = "${OPIE_SRCDATE}"
-SRCDATE_opie-language = "${OPIE_SRCDATE}"
-SRCDATE_opie-launcher-settings = "${OPIE_SRCDATE}"
-SRCDATE_opie-libqrsync = "${OPIE_SRCDATE}"
-SRCDATE_opie-light-and-power = "${OPIE_SRCDATE}"
-SRCDATE_opie-lockapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-login = "${OPIE_SRCDATE}"
-SRCDATE_opie-logoutapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-mailapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-mail = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-libmadplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-libmodplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-libtremorplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-libwavplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-core = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1 = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2 = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2-skin-default = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2-skin-default-landscape = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2-skin-pod = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2-skin-techno = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediummount = "${OPIE_SRCDATE}"
-SRCDATE_opie-memoryapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-mindbreaker = "${OPIE_SRCDATE}"
-SRCDATE_opie-minesweep = "${OPIE_SRCDATE}"
-SRCDATE_opie-mobilemsg = "${OPIE_SRCDATE}"
-SRCDATE_opie-multikeyapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-multikey = "${OPIE_SRCDATE}"
-SRCDATE_opie-networkapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-networksettings = "${OPIE_SRCDATE}"
-SRCDATE_opie-notesapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-odict = "${OPIE_SRCDATE}"
-SRCDATE_opie-osearch = "${OPIE_SRCDATE}"
-SRCDATE_opie-oxygen = "${OPIE_SRCDATE}"
-SRCDATE_opie-oyatzee = "${OPIE_SRCDATE}"
-SRCDATE_opie-packagemanager = "${OPIE_SRCDATE}"
-SRCDATE_opie-parashoot = "${OPIE_SRCDATE}"
-SRCDATE_opie-pcmciaapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-performance = "${OPIE_SRCDATE}"
-SRCDATE_opie-pickboard = "${OPIE_SRCDATE}"
-SRCDATE_opie-pics = "${OPIE_SRCDATE}"
-SRCDATE_opie-pimconverter = "${OPIE_SRCDATE}"
-SRCDATE_opie-powerchord = "${OPIE_SRCDATE}"
-SRCDATE_opie-pyquicklaunchapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-qasteroids = "${OPIE_SRCDATE}"
-SRCDATE_opie-qcop = "${OPIE_SRCDATE}"
-SRCDATE_opie-quicklauncher = "${OPIE_SRCDATE}"
-SRCDATE_opie-qss = "${OPIE_SRCDATE}"
-SRCDATE_opie-rdesktop = "${OPIE_SRCDATE}"
-SRCDATE_opie-reader = "${OPIE_SRCDATE}"
-SRCDATE_opie-recorder = "${OPIE_SRCDATE}"
-SRCDATE_opie-remote = "${OPIE_SRCDATE}"
-SRCDATE_opie-restartapplet2 = "${OPIE_SRCDATE}"
-SRCDATE_opie-restartapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-restartapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-rotateapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-screenshotapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-search = "${OPIE_SRCDATE}"
-SRCDATE_opie-security = "${OPIE_SRCDATE}"
-SRCDATE_opie-securityplugin-blueping = "${OPIE_SRCDATE}"
-SRCDATE_opie-securityplugin-dummy = "${OPIE_SRCDATE}"
-SRCDATE_opie-securityplugin-notice = "${OPIE_SRCDATE}"
-SRCDATE_opie-securityplugin-pin = "${OPIE_SRCDATE}"
-SRCDATE_opie-sfcave = "${OPIE_SRCDATE}"
-SRCDATE_opie-sheet = "${OPIE_SRCDATE}"
-SRCDATE_opie-sh = "${OPIE_SRCDATE}"
-SRCDATE_opie-showimg = "${OPIE_SRCDATE}"
-SRCDATE_opie-snake = "${OPIE_SRCDATE}"
-SRCDATE_opie-solitaire = "${OPIE_SRCDATE}"
-SRCDATE_opie-sshkeys = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-flat = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-fresh = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-liquid = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-metal = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-phase = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-web = "${OPIE_SRCDATE}"
-SRCDATE_opie-sounds = "${OPIE_SRCDATE}"
-SRCDATE_opie-suspendapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-symlinker = "${OPIE_SRCDATE}"
-SRCDATE_opie-sysinfo = "${OPIE_SRCDATE}"
-SRCDATE_opie-systemtime = "${OPIE_SRCDATE}"
-SRCDATE_opie-tableviewer = "${OPIE_SRCDATE}"
-SRCDATE_opie-tabmanager = "${OPIE_SRCDATE}"
-SRCDATE_opie-taskbar = "${OPIE_SRCDATE}"
-SRCDATE_opie-taskbar-images = "${OPIE_SRCDATE}"
-SRCDATE_opie-tetrix = "${OPIE_SRCDATE}"
-SRCDATE_opie-textedit = "${OPIE_SRCDATE}"
-SRCDATE_opie-theme = "${OPIE_SRCDATE}"
-SRCDATE_opie-tictac = "${OPIE_SRCDATE}"
-SRCDATE_opie-tinykate = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-addressbookplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-datebookplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-fortuneplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-mailplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-stocktickerplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-todolistplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-weatherplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-todo = "${OPIE_SRCDATE}"
-SRCDATE_opie-tonleiter = "${OPIE_SRCDATE}"
-SRCDATE_opie-unikeyboard = "${OPIE_SRCDATE}"
-SRCDATE_opie-usermanager = "${OPIE_SRCDATE}"
-SRCDATE_opie-vmemo = "${OPIE_SRCDATE}"
-SRCDATE_opie-vmemo-settings = "${OPIE_SRCDATE}"
-SRCDATE_opie-volumeapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-vtapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-wellenreiter = "${OPIE_SRCDATE}"
-SRCDATE_opie-wirelessapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-wordgame = "${OPIE_SRCDATE}"
-SRCDATE_opie-write = "${OPIE_SRCDATE}"
-SRCDATE_opie-zkbapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-zlines = "${OPIE_SRCDATE}"
-SRCDATE_opie-zsafe = "${OPIE_SRCDATE}"
-SRCDATE_opie-zsame = "${OPIE_SRCDATE}"
-SRCDATE_opie-sh-snes = "${OPIE_SRCDATE}"
-SRCDATE_opie-stumbler = "${OPIE_SRCDATE}"
-
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 56249594f8..16753863b5 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -44,11 +44,11 @@ SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-frameworkd ?= "86a660108f988f5611cc796d33911cca8836004e"
-SRCREV_pn-fso-gpsd ?= "daf0729351631f93f9f2f22af33d46658c6f5d68"
+SRCREV_pn-fso-gpsd ?= "fd1cd578d6ba9fa13aadceb59a9b46345108583b"
 SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
-SRCREV_pn-gnuradio ?= "6377"
+SRCREV_pn-gnuradio ?= "9721"
 SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gsm0710muxd ?= "3ff86b129640b647ccba3d86eb243d864671b039"
 SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
@@ -167,6 +167,7 @@ SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-python-gsmd = "148"
 SRCREV_pn-python-lightmediascanner = "68"
 SRCREV_pn-python-pyrtc = "d1f32060474767582dd4248d5e5c2adc63931d5a"
+SRCREV_pn-python-pyyaml = "294"
 SRCREV_pn-remoko = "115"
 SRCREV_pn-remoko-server = "115"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 4df461910c..71d5fd7b3c 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -152,6 +152,11 @@ IGNORE_STRIP_ERRORS = ""
 
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
 
+# New pango and older glib-2.0 versions don't mix,
+# so specify exactly what we would like to build.
+PREFERRED_VERSION_pango    ?= 1.20.5
+PREFERRED_VERSION_glib-2.0 ?= 2.16.1
+
 # we don't ship gtk-directfb by default
 PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  ?= "gtk+"