4 files changed, 10 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 1f2961f3a1..896e5e613c 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -252,8 +252,6 @@ DISTRO_EXTRA_RDEPENDS += "\
     angstrom-version \
     ipkg ipkg-collateral \
     util-linux-mount util-linux-umount \
-    avahi-daemon \
-    avahi-autoipd \
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \
     "
@@ -262,4 +260,7 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     kernel-module-vfat \
     kernel-module-ext2 \
     kernel-module-af-packet \
+    avahi-daemon \
+    avahi-autoipd \
+    openssh-sftp-server \
     "
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
index 3a32ab406b..21fd80facb 100644
--- a/conf/distro/include/insane-srcrevs.inc
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -1,3 +1,4 @@
+SRCREV_pn-aircrack-ng ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
 SRCREV_pn-eglibc ?= "${AUTOREV}"
@@ -9,6 +10,7 @@ SRCREV_pn-fstests ?= "${AUTOREV}"
 SRCREV_pn-gnuradio ?= "${AUTOREV}"
 SRCREV_pn-hildon-1 ?= "${AUTOREV}"
 SRCREV_pn-libgsmd ?= "${AUTOREV}"
+SRCREV_pn-libjana ?= "${AUTOREV}"
 SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
 SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
 SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index d557c77e9a..aeb0a2afbc 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -1,4 +1,5 @@
 SRCREV_pn-libgsmd ?= "${AUTOREV}"
+SRCREV_pn-libjana ?= "${AUTOREV}"
 SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
 SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
 SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index dabce9cade..007b445234 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -7,6 +7,7 @@
 
 # this is alphabetical!
 
+SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-dfu-util ?= "2866"
 SRCREV_pn-dfu-util-native ?= "2866"
@@ -23,7 +24,7 @@ SRCREV_pn-gypsy ?= "56"
 SRCREV_pn-hildon-1 ?= "14173"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libgsmd ?= "3074"
-SRCREV_pn-libjana ?= "652"
+SRCREV_pn-libjana ?= "657"
 SRCREV_pn-libmokogsmd2 ?= "2950"
 SRCREV_pn-libmokojournal2 ?= "3217"
 SRCREV_pn-libmokopanelui2 ?= "3226"
@@ -58,7 +59,7 @@ SRCREV_pn-openmoko-common2 ?= "2679"
 SRCREV_pn-openmoko-contacts ?= "2298"
 SRCREV_pn-openmoko-contacts2 ?= "358"
 SRCREV_pn-openmoko-dates ?= "467"
-SRCREV_pn-openmoko-dates2 ?= "652"
+SRCREV_pn-openmoko-dates2 ?= "658"
 SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dialer2 ?= "3182"
 SRCREV_pn-openmoko-feedreader2 ?= "3080"
@@ -70,7 +71,7 @@ SRCREV_pn-openmoko-icon-theme-standard2 ?= "3225"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3225"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3232"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3261"
 SRCREV_pn-openmoko-messages ?= "2276"
 SRCREV_pn-openmoko-panel-battery ?= "2897"
 SRCREV_pn-openmoko-panel-bt ?= "2896"