merge of '211b2bf7086145ba83e7b54cebded9bb3025b075'

     and 'cb58be96e7128aa032b10e0b9d369ca6f59af487'

5 files changed, 36 insertions, 1 deletions

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index c5d343205f..d5354b2735 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -47,7 +47,7 @@ do
                        task-proper-tools mc screen findutils \
 	               mono perl python ruby \
 		       gtk+ qt-x11-free qt4-x11-free \
-		       gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \
+		       gpe-mini-browser gpe-mini-browser2 netsurf midori minimo openmoko-browser2 webkit-gtklauncher \
 		       samba meta-nas-server \
 		       apache2 boa cherokee lighttpd thttpd \
 		       gpe-gallery gpe-scap notecase \
diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh
new file mode 100644
index 0000000000..1b457a5fc9
--- /dev/null
+++ b/contrib/angstrom/upload-packages.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# MIT Licensed
+# Initial version by Graeme 'XorA' Gregory, Further changes by Koen Kooi
+
+# Run this from inside ${DEPLOY_DIR} e.g. tmp/deploy/glibc/
+
+# Angstrom webserver
+REMOTEM=angstrom@linuxtogo.org
+
+# Feed dir we want to upload to
+REMOTED=website/feeds/2008/ipk/$(basename $PWD)
+
+# create upload dir
+mkdir -p upload-queue || true
+
+# Find and delete morgue dirs, we don't need them
+find ipk/ -name "morgue" -exec rm -rf \{\} \;
+
+# Copy all packages to an upload queue
+find ipk/ -name "*.ipk" -exec cp \{\} upload-queue/ \;
+
+# Find file already present on webserver
+ssh $REMOTEM "find $REMOTED/ -name "*.ipk" -exec basename \{\} \;" > files-remote
+ls upload-queue/ | grep -v morgue > files-local
+
+# Check for files already present on webserver
+cat files-remote files-local | sort | uniq -u >files-uniq
+cat files-uniq files-local | sort | uniq -d > files-trans
+
+# Copy over non-duplicate files
+rsync -vz --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/
+
+# Clean up temporary files
+rm -rf files-remote files-local files-uniq files-trans upload-queue	
+
diff --git a/contrib/artwork/.mtn2git_empty b/contrib/artwork/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/contrib/artwork/.mtn2git_empty
diff --git a/contrib/oe.svg b/contrib/artwork/oe.svg
index 8f3dd17041..8f3dd17041 100644
--- a/contrib/oe.svg
+++ b/contrib/artwork/oe.svg
diff --git a/contrib/powered-by-oe.svg b/contrib/artwork/powered-by-oe.svg
index 7e1c382f57..7e1c382f57 100644
--- a/contrib/powered-by-oe.svg
+++ b/contrib/artwork/powered-by-oe.svg