8 files changed, 16 insertions, 22 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index defab162f3..3a129b7924 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2170,6 +2170,10 @@ sha256=1b4a5b5e48ad5e61a21586b7b59d5c0a88691a981e73e2c6dc5868197461791b
 md5=b12426fd72bedf00c389a7fb458275a8
 sha256=5a4a5b82dd8f485b4fef941cc216eb052184cf138f72b512eb62d836b460acdb
 
+[http://downloads.sourceforge.net/bftpd/bftpd-2.3.tar.gz]
+md5=4ab1eb33135fa5eaaf050e6d3dd0b319
+sha256=0af27ca6c49f696c64bcfb3e50452cad240997993e0b7afb65624898d3d95ff2
+
 [http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_480p_surround-fix.avi]
 md5=ed7ed01e9aefba8ddd77c13332cec120
 sha256=40d1cf5bc8e1b0e55dac7bb2e3fbc2aea05b6679444864781299b24db044634f
@@ -15322,6 +15326,10 @@ sha256=c1454fdf5d3658f492253106c12bbf89a3bcc5789c36851a5f2f345d61a4ac0c
 md5=115dc5380ffdb03ec2e71ff9d6d97e72
 sha256=50bfab6d4b1b9af37ca6832b979f5c891f2dd9259a68700b37214d7897927c17
 
+[http://www.mumpot.org/download/mumpot-0.4.tar.gz]
+md5=52d1e64c63d70604f13985f1f326a802
+sha256=302bea9f0903fecf13ee0e9c24ed090203f2c77f7164a2a0f68c35fc8e1b9f10
+
 [http://www.dotaster.com/~shuu/linux/murasaki/0.8/8/murasaki-0.8.8.tar.gz]
 md5=ea7afa7e0bd9cfa0df7c04a9b270df88
 sha256=2033168723ffd612336acb8a64b33fcd91f7dedeaf78949d3dfce231cb962ce9
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index 94b8cb6d1a..d624000d17 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -144,6 +144,8 @@ for i in ../* ; do
 echo " DONE"
 cd ${BPWD}
 
+( cd ~/website/repo-updater ; php update.php ; rm ../repo/feeds.db* ; cp feeds.db* ../repo )
+
 echo -n "Stripping source lines from Package files"
 for i in `find . -name Packages` ; do grep -v ^Source: $i|gzip -c9>$i.gz ;gunzip -c $i.gz>$i ; touch $i.sig ; done
 echo " DONE"
@@ -162,4 +164,3 @@ if [ "$1" != "--skip-sorted-list" ]; then
     for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted
 fi
 
-( cd ~/website/repo-updater ; php update.php ; rm ../repo/feeds.db* ; cp feeds.db* ../repo )
diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh
index 4d3362b6d2..1ae7086cab 100644
--- a/contrib/angstrom/upload-packages.sh
+++ b/contrib/angstrom/upload-packages.sh
@@ -31,6 +31,9 @@ echo "Checking for duplicates"
 cat files-remote files-local | sort | uniq -u >files-uniq
 cat files-uniq files-local | sort | uniq -d > files-trans
 
+# Remove SGX files
+rm -f upload-queue/*3.00.*
+
 # Copy over non-duplicate files
 echo "Starting rsync..."
 rsync -vz --copy-links --progress --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/
diff --git a/packages/mumpot/files/mumpot-cyclemap.desktop b/packages/mumpot/files/mumpot-cyclemap.desktop
index e761d0f3f1..495e712bac 100644
--- a/packages/mumpot/files/mumpot-cyclemap.desktop
+++ b/packages/mumpot/files/mumpot-cyclemap.desktop
@@ -4,5 +4,5 @@ Comment=Mumpot cyclemap
 Exec=mumpot-cyclemap
 Terminal=0
 Type=Application
-Categories=Application;PIM;GTK
+Categories=X-PIM;GTK;Education;Science;Geography;
 StartupNotify=True
diff --git a/packages/mumpot/files/mumpot-mapnik.desktop b/packages/mumpot/files/mumpot-mapnik.desktop
index b02b077de1..9d852d2577 100644
--- a/packages/mumpot/files/mumpot-mapnik.desktop
+++ b/packages/mumpot/files/mumpot-mapnik.desktop
@@ -4,5 +4,5 @@ Comment=Mumpot Mapnuk
 Exec=mumpot-mapnik
 Terminal=0
 Type=Application
-Categories=Application;PIM;GTK
+Categories=X-PIM;GTK;Education;Science;Geography;
 StartupNotify=True
diff --git a/packages/mumpot/files/mumpot-tah.desktop b/packages/mumpot/files/mumpot-tah.desktop
index bcdba40b0a..805c1d42d9 100644
--- a/packages/mumpot/files/mumpot-tah.desktop
+++ b/packages/mumpot/files/mumpot-tah.desktop
@@ -4,5 +4,5 @@ Comment=Mumpot t@h
 Exec=mumpot-tah
 Terminal=0
 Type=Application
-Categories=Application;PIM;GTK
+Categories=X-PIM;GTK;Education;Science;Geography;
 StartupNotify=True
diff --git a/packages/mumpot/mumpot_0.3.1.bb b/packages/mumpot/mumpot_0.3.1.bb
deleted file mode 100644
index c5b9091bdb..0000000000
--- a/packages/mumpot/mumpot_0.3.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "A map-viewer, simple editor and routing application for OSM maps"
-HOMEPAGE = "http://wiki.openstreetmap.org/index.php/Mumpot"
-AUTHOR = "Andreas Kemnade"
-SECTION = "x11/applications"
-LICENSE = "GPLv2"
-DEPENDS = "gtk+ bluez-libs bzip2 libxml2 libpng jpeg"
-
-SRC_URI = "http://osm.andi.de1.cc/mumpot-${PV}.tar.gz \
-	file://mumpot-tah.desktop \
-	file://mumpot-mapnik.desktop"
-
-inherit autotools pkgconfig
-
-do_install_append() {
-	install -d ${D}${datadir}/applications
-	install -m 0644 ${WORKDIR}/mumpot-tah.desktop ${D}${datadir}/applications/mumpot-tah.desktop
-	install -m 0644 ${WORKDIR}/mumpot-mapnik.desktop ${D}${datadir}/applications/mumpot-mapnik.desktop
-}
diff --git a/packages/mumpot/mumpot_0.3.2.bb b/packages/mumpot/mumpot_0.4.bb
index ab9d876902..ab9d876902 100644
--- a/packages/mumpot/mumpot_0.3.2.bb
+++ b/packages/mumpot/mumpot_0.4.bb