merge of '6b8b18ee5d630cef0d9e1ebea010f36e7bdb083c'

     and 'a3ee5d88f6d1100cd285c2fead8e37018bd42a9f'

4 files changed, 116 insertions, 110 deletions

diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
index bbb62b9398..14d6336b96 100644
--- a/conf/distro/include/insane-srcrevs.inc
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -70,6 +70,8 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
+SRCREV_pn-openocd ?= "${AUTOREV}"
+SRCREV_pn-openocd-native ?= "${AUTOREV}"
 SRCREV_pn-psplash ?= "${AUTOREV}"
 SRCREV_pn-settings-daemon ?= "${AUTOREV}"
 SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 5206d26cdd..59024535f0 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -49,3 +49,5 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
+SRCREV_pn-openocd ?= "${AUTOREV}"
+SRCREV_pn-openocd-native ?= "${AUTOREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
index 7ffa788c91..0ff684ed68 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
@@ -35,99 +35,99 @@ PREFERRED_VERSION_task-xorg ?= "X11R7.3"
 PREFERRED_VERSION_appres ?= "1.0.1"
 PREFERRED_VERSION_bdftopcf ?= "1.0.1"
 PREFERRED_VERSION_beforelight ?= "1.0.2"
-PREFERRED_VERSION_bitmap ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_bitmap ?= "1.0.2"
 PREFERRED_VERSION_editres ?= "1.0.2"
 PREFERRED_VERSION_fontosfnt ?= "1.0.3"
-PREFERRED_VERSION_fslsfonts ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_fslsfonts ?= "1.0.1"
+PREFERRED_VERSION_fstobdf ?= "1.0.2"
 PREFERRED_VERSION_iceauth ?= "1.0.2"
 PREFERRED_VERSION_ico ?= "1.0.2"
-PREFERRED_VERSION_lbxproxy ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_listres ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_lbxproxy ?= "1.0.1"
+PREFERRED_VERSION_listres ?= "1.0.1"
 PREFERRED_VERSION_luit ?= "1.0.2"
 PREFERRED_VERSION_mkfontdir-native ?= "1.0.3"
 PREFERRED_VERSION_mkfontdir ?= "1.0.3"
 PREFERRED_VERSION_mkfontscale ?= "1.0.3"
-PREFERRED_VERSION_oclock ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_proxymngr ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_scripts ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_oclock ?= "1.0.1"
+PREFERRED_VERSION_proxymngr ?= "1.0.1"
+PREFERRED_VERSION_rgb ?= "1.0.1"
+PREFERRED_VERSION_rstart ?= "1.0.2"
+PREFERRED_VERSION_scripts ?= "1.0.1"
 PREFERRED_VERSION_sessreg ?= "1.0.3"
 PREFERRED_VERSION_setxkbmap ?= "1.0.4"
-PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_smproxy ?= "1.0.2"
 PREFERRED_VERSION_twm ?= "1.0.3"
-PREFERRED_VERSION_viewres ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1"
+PREFERRED_VERSION_viewres ?= "1.0.1"
+PREFERRED_VERSION_x11perf ?= "1.4.1"
 PREFERRED_VERSION_xauth ?= "1.0.2"
 PREFERRED_VERSION_xbacklight ?= "1.1"
-PREFERRED_VERSION_xbiff ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xbiff ?= "1.0.1"
 PREFERRED_VERSION_xcalc ?= "1.0.2"
-PREFERRED_VERSION_xclipboard ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xclipboard ?= "1.0.1"
 PREFERRED_VERSION_xclock ?= "1.0.3"
-PREFERRED_VERSION_xcmsdb ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcmsdb ?= "1.0.1"
 PREFERRED_VERSION_xconsole ?= "1.0.3"
 PREFERRED_VERSION_xcursorgen ?= "1.0.2"
 PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
-PREFERRED_VERSION_xditview ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xditview ?= "1.0.1"
 PREFERRED_VERSION_xdm ?= "1.1.6"
-PREFERRED_VERSION_xdpyinfo ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.1"
 PREFERRED_VERSION_xdriinfo ?= "1.0.2"
-PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xev ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xeyes ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xedit ?= "1.0.2"
+PREFERRED_VERSION_xev ?= "1.0.1"
+PREFERRED_VERSION_xeyes ?= "1.0.1"
 PREFERRED_VERSION_xxf86dga ?= "1.0.2"
-PREFERRED_VERSION_xfd ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfindproxy ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfontsel ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfd ?= "1.0.1"
+PREFERRED_VERSION_xfindproxy ?= "1.0.1"
+PREFERRED_VERSION_xfontsel ?= "1.0.1"
 PREFERRED_VERSION_xfs ?= "1.0.4"
-PREFERRED_VERSION_xfsinfo ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xfwp ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfsinfo ?= "1.0.1"
+PREFERRED_VERSION_xfwp ?= "1.0.1"
 PREFERRED_VERSION_xgamma ?= "1.0.2"
-PREFERRED_VERSION_xgc ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xgc ?= "1.0.1"
 PREFERRED_VERSION_xhost ?= "1.0.2"
 PREFERRED_VERSION_xinit ?= "1.0.5"
 PREFERRED_VERSION_xkbcomp ?= "1.0.3"
-PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xkbprint ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xkbutils ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xkill ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbevd ?= "1.0.2"
+PREFERRED_VERSION_xkbprint ?= "1.0.1"
+PREFERRED_VERSION_xkbutils ?= "1.0.1"
+PREFERRED_VERSION_xkill ?= "1.0.1"
 PREFERRED_VERSION_xload ?= "1.0.2"
-PREFERRED_VERSION_xlogo ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xlsatoms ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xlsclients ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xlsfonts ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlogo ?= "1.0.1"
+PREFERRED_VERSION_xlsatoms ?= "1.0.1"
+PREFERRED_VERSION_xlsclients ?= "1.0.1"
+PREFERRED_VERSION_xlsfonts ?= "1.0.1"
 PREFERRED_VERSION_xmag ?= "1.0.2"
 PREFERRED_VERSION_xman ?= "1.0.3"
 PREFERRED_VERSION_xmessage ?= "1.0.2"
-PREFERRED_VERSION_xmh ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xmh ?= "1.0.1"
 PREFERRED_VERSION_xmodmap ?= "1.0.3"
-PREFERRED_VERSION_xmore ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xphelloworld ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xplsprinters ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xpr ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xprehashprinterlist ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xmore ?= "1.0.1"
+PREFERRED_VERSION_xphelloworld ?= "1.0.1"
+PREFERRED_VERSION_xplsprinters ?= "1.0.1"
+PREFERRED_VERSION_xpr ?= "1.0.1"
+PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
 PREFERRED_VERSION_xprop ?= "1.0.3"
 PREFERRED_VERSION_xrandr ?= "1.2.2"
 PREFERRED_VERSION_xrdb ?= "1.0.4"
-PREFERRED_VERSION_xrefresh ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xrx ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xrefresh ?= "1.0.2"
+PREFERRED_VERSION_xrx ?= "1.0.1"
 PREFERRED_VERSION_xset ?= "1.0.3"
-PREFERRED_VERSION_xsetmode ?= "X11R7.0-1.0.0"
-PREFERRED_VERSION_xsetpointer ?= "X11R7.0-1.0.0"
+PREFERRED_VERSION_xsetmode ?= "1.0.0"
+PREFERRED_VERSION_xsetpointer ?= "1.0.0"
 PREFERRED_VERSION_xsetroot ?= "1.0.2"
-PREFERRED_VERSION_xsm ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xstdcmap ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xtrap ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_xvidtune ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xsm ?= "1.0.1"
+PREFERRED_VERSION_xstdcmap ?= "1.0.1"
+PREFERRED_VERSION_xtrap ?= "1.0.2"
+PREFERRED_VERSION_xvidtune ?= "1.0.1"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
-PREFERRED_VERSION_xwd ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xwd ?= "1.0.1"
 PREFERRED_VERSION_xwininfo ?= "1.0.3"
-PREFERRED_VERSION_xwud ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xwud ?= "1.0.1"
 
 #data
-PREFERRED_VERSION_xbitmaps ?= "X11R7.0-1.0.1"
-PREFERRED_VERSION_xcursor-themes ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xbitmaps ?= "1.0.1"
+PREFERRED_VERSION_xcursor-themes ?= "1.0.1"
 
 # doc
 PREFERRED_VERSION_xorg-docs ?= "1.4"
@@ -135,76 +135,76 @@ PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
 
 # driver
 PREFERRED_VERSION_xf86-input-acecad ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-aiptek ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_xf86-input-calcomp ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-citron ?= "X11R7.1-2.2.0"
-PREFERRED_VERSION_xf86-input-digitaledge ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-dmc ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-dynapro ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-elo2300 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-elographics ?= "X11R7.0-1.0.0.5"
-PREFERRED_VERSION_xf86-input-evdev ?= "X11R7.1-1.1.2"
-PREFERRED_VERSION_xf86-input-fpit ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-hyperpen ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-jamstudio ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-aiptek ?= "1.0.1"
+PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-citron ?= "2.2.0"
+PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-dmc ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-elographics ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-evdev ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-fpit ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-hyperpen ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-jamstudio ?= "1.1.0"
 PREFERRED_VERSION_xf86-input-joystick ?= "1.2.3"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-magellan ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-magictouch ?= "X11R7.1-1.0.0.5"
-PREFERRED_VERSION_xf86-input-microtouch ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-magellan ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-mutouch ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-palmax ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-palmax ?= "1.1.0"
 PREFERRED_VERSION_xf86-input-penmount ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-spaceorb ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-summa ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-tek4957 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-input-ur98 ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-summa ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-tek4957 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
 PREFERRED_VERSION_xf86-input-vmmouse ?= "12.4.1"
-PREFERRED_VERSION_xf86-input-void ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-apm ?= "X11R7.1-1.1.1"
-PREFERRED_VERSION_xf86-video-ark ?= "X11R7.1-0.6.0"
-PREFERRED_VERSION_xf86-video-ast ?= "X11R7.1-0.81.0"
+PREFERRED_VERSION_xf86-input-void ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-apm ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-ark ?= "0.6.0"
+PREFERRED_VERSION_xf86-video-ast ?= "0.81.0"
 PREFERRED_VERSION_xf86-video-ati ?= "6.6.193"
-PREFERRED_VERSION_xf86-video-chips ?= "X11R7.1-1.1.1"
-PREFERRED_VERSION_xf86-video-cirrus ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-cyrix ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-dummy ?= "X11R7.1-0.2.0"
+PREFERRED_VERSION_xf86-video-chips ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-cirrus ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-dummy ?= "0.2.0"
 PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1"
 PREFERRED_VERSION_xf86-video-glide ?= "1.0.0"
-PREFERRED_VERSION_xf86-video-glint ?= "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-glint ?= "1.1.1"
 PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6"
-PREFERRED_VERSION_xf86-video-i740 ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-i740 ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
-PREFERRED_VERSION_xf86-video-imstt ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-intel ?= "2.1.1"
 PREFERRED_VERSION_xf86-video-mga ?= "1.4.6.1"
-PREFERRED_VERSION_xf86-video-neomagic ?= "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-neomagic ?= "1.1.1"
 PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
 PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
 PREFERRED_VERSION_xf86-video-nv ?= "2.1.3"
 PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3"
 PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0"
-PREFERRED_VERSION_xf86-video-s3virge ?= "X11R7.1-1.9.1"
+PREFERRED_VERSION_xf86-video-s3virge ?= "1.9.1"
 PREFERRED_VERSION_xf86-video-savage ?= "2.1.3"
 PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2"
 PREFERRED_VERSION_xf86-video-sis ?= "0.9.3"
-PREFERRED_VERSION_xf86-video-sisusb ?= "X11R7.1-0.8.1"
-PREFERRED_VERSION_xf86-video-sunbw2 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-suncg14 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-suncg3 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-suncg6 ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-sunffb ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-sunleo ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_xf86-video-suntcx ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-sisusb ?= "0.8.1"
+PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-tga ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-tga ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-trident ?= "1.2.3"
 PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-v4l ?= "X11R7.1-0.1.1"
+PREFERRED_VERSION_xf86-video-v4l ?= "0.1.1"
 PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0"
 PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-vga ?= "X11R7.1-4.1.0"
+PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
 PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
 PREFERRED_VERSION_xf86-video-vmware ?= "10.14.1"
 PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1"
@@ -212,15 +212,15 @@ PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1"
 # font
 PREFERRED_VERSION_encodings ?= "1.0.2"
 PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1"
-PREFERRED_VERSION_font-util-native ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_font-util ?= "X11R7.1-1.0.1"
+PREFERRED_VERSION_font-util-native ?= "1.0.1"
+PREFERRED_VERSION_font-util ?= "1.0.1"
 
 # lib
 PREFERRED_VERSION_diet-x11 ?= "1.1.3"
-PREFERRED_VERSION_libdmx ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_libdmx ?= "1.0.2"
 PREFERRED_VERSION_libfontenc ?= "1.0.4"
 PREFERRED_VERSION_libice ?= "1.0.4"
-PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1"
+PREFERRED_VERSION_liblbxutil ?= "1.0.1"
 PREFERRED_VERSION_libsm ?= "1.0.3"
 PREFERRED_VERSION_libx11 ?= "1.1.3"
 PREFERRED_VERSION_libx11-native ?= "1.1.1"
@@ -239,7 +239,7 @@ PREFERRED_VERSION_libxfontcache ?= "1.0.4"
 PREFERRED_VERSION_libxi ?= "1.1.3"
 PREFERRED_VERSION_libxinerama ?= "1.0.2"
 PREFERRED_VERSION_libxkbfile ?= "1.0.4"
-PREFERRED_VERSION_libxkbui ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxkbui ?= "1.0.2"
 PREFERRED_VERSION_libxmu ?= "1.0.3"
 PREFERRED_VERSION_libxpm ?= "3.5.7"
 PREFERRED_VERSION_libxrandr ?= "1.2.2"
@@ -250,8 +250,8 @@ PREFERRED_VERSION_libxt ?= "1.0.4"
 PREFERRED_VERSION_libxtst ?= "1.0.3"
 PREFERRED_VERSION_libxvmc ?= "1.0.4"
 PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
-PREFERRED_VERSION_libxxf86misc ?= "X11R7.1-1.0.1"
-PREFERRED_VERSION_libxxf86vm ?= "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
 PREFERRED_VERSION_xtrans ?= "1.0.4"
 
 # proto
@@ -263,18 +263,18 @@ PREFERRED_VERSION_inputproto ?= "1.4.2.1"
 PREFERRED_VERSION_kbproto ?= "1.0.3"
 PREFERRED_VERSION_randrproto ?= "1.2.1"
 PREFERRED_VERSION_renderproto ?= "0.9.3"
-PREFERRED_VERSION_scrnsaverproto ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
 PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
 PREFERRED_VERSION_xproto-native ?= "7.0.10"
 PREFERRED_VERSION_xproto ?= "7.0.10"
 
 # util
-PREFERRED_VERSION_gccmakedep ?= "X11R7.1-1.0.2"
-PREFERRED_VERSION_imake ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_gccmakedep ?= "1.0.2"
+PREFERRED_VERSION_imake ?= "1.0.2"
 PREFERRED_VERSION_makedepend ?= "1.0.1"
 PREFERRED_VERSION_util-macros-native ?= "1.1.5"
 PREFERRED_VERSION_util-macros ?= "1.1.5"
-PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 
 # xserver
 PREFERRED_VERSION_xserver-kdrive ?= "1.4.0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 8eec5cad7c..a4d04886c7 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -80,9 +80,11 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964"
 SRCREV_pn-openmoko-today ?= "2556"
 SRCREV_pn-openmoko-today2 ?= "2955"
 SRCREV_pn-openmoko-today2-folders ?= "2680"
+SRCREV_pn-openocd ?= "206"
+SRCREV_pn-openocd-native ?= "206"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-settings-daemon ?= "1615"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "44"
-SRCREV_pn-webkit-gtk ?= "25507"
+SRCREV_pn-webkit-gtk ?= "25582-r25571"
 SRCREV_pn-xoo ?= "1623"