6 files changed, 35 insertions, 26 deletions
diff --git a/network/dropbox/README b/network/dropbox/README
index 6b7f46740f..0ae3357fe8 100644
--- a/network/dropbox/README
+++ b/network/dropbox/README
@@ -1,8 +1,9 @@
-Dropbox (store, sync, and share files online)
+Dropbox (store, sync and share files online)
 
-Dropbox is an extension that integrates the Dropbox web service with 
-your desktop.  It consists of two major components: dropboxd - a per
-user closed-source daemon process that makes sure your $HOME/Dropbox 
-directory is properly synchronized with the web Dropbox server/service,
-and dropbox-client, which connects to your dropboxd and presents a GUI 
-based on the information dropboxd provides.
+Dropbox is an extension that integrates the Dropbox web service
+with your desktop. It consists of two major components: dropboxd
+- a per-user closed-source daemon process that makes sure your
+$HOME/Dropbox directory is properly synchronized with the web
+Dropbox server/service, and dropbox-client, which connects to
+your dropboxd and presents a GUI based on the information
+dropboxd provides.
diff --git a/network/dropbox/doinst.sh b/network/dropbox/doinst.sh
index 4e8ba7071d..3878e61921 100644
--- a/network/dropbox/doinst.sh
+++ b/network/dropbox/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/pixmaps >/dev/null 2>&1
+  fi
+fi
diff --git a/network/dropbox/dropbox.SlackBuild b/network/dropbox/dropbox.SlackBuild
index fa5a7779e8..2fa2b5ba28 100644
--- a/network/dropbox/dropbox.SlackBuild
+++ b/network/dropbox/dropbox.SlackBuild
@@ -24,7 +24,8 @@
 
 
 PRGNAM=dropbox
-VERSION=${VERSION:-0.7.110}
+PACKNAM=dropbox-lnx
+VERSION=${VERSION:-1.0.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}	
 
@@ -47,7 +48,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf .$PRGNAM-dist
-tar xvf $CWD/$PRGNAM-lnx.$ARCH-$VERSION.tar.gz
+tar xvf $CWD/$PACKNAM.$ARCH-$VERSION.tar.gz
 cd .$PRGNAM-dist
 chown -R root:root .
 find . \
@@ -56,18 +57,20 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-mkdir -p $PKG/opt $PKG/usr/bin
-cp -a ../.$PRGNAM-dist $PKG/opt/dropbox
-rm -f $PKG/opt/dropbox/libstdc++.so.6
-( cd $PKG/usr/bin ; ln -s ../../opt/dropbox/dropboxd . )
-
+mkdir $PKG/opt
+mkdir -p $PKG/usr/bin
+cp -R ../.$PRGNAM-dist $PKG/opt/dropbox
+rm $PKG/opt/dropbox/libstdc++.so.6
+ln -s $PKG/opt/dropbox/dropboxd $PKG/usr/bin/dropboxd
 install -D -m 644 $CWD/dropbox.desktop $PKG/usr/share/applications/dropbox.desktop
 install -D -m 644 $CWD/dropbox.png $PKG/usr/share/pixmaps/dropbox.png
 
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/terms.html > $PKG/usr/doc/$PRGNAM-$VERSION/terms.html
+cp -a \
+  $CWD/terms.html \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -s ../../../opt/dropbox/ACKNOWLEDGEMENTS . )
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/dropbox/dropbox.desktop b/network/dropbox/dropbox.desktop
index ecefb1b323..b1a1115fd9 100644
--- a/network/dropbox/dropbox.desktop
+++ b/network/dropbox/dropbox.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Dropbox
 GenericName=Network Storage
-Comment=Secure backup, sync, and sharing made easy
+Comment=Secure backup, sync and sharing made easy
 Exec=/opt/dropbox/dropboxd
-Icon=dropbox
+Icon=/usr/share/pixmaps/dropbox.png
 Terminal=false
 Type=Application
 Categories=Network;
diff --git a/network/dropbox/dropbox.info b/network/dropbox/dropbox.info
index 4da45dc301..5c64a1d8a0 100644
--- a/network/dropbox/dropbox.info
+++ b/network/dropbox/dropbox.info
@@ -1,10 +1,10 @@
 PRGNAM="dropbox"
-VERSION="0.7.110"
-HOMEPAGE="http://www.dropbox.com"
-DOWNLOAD="http://dl-web.getdropbox.com/u/17/dropbox-lnx.x86-0.7.110.tar.gz"
-MD5SUM="e6cb1751ba33542a82b794cea7dc8dbd"
-DOWNLOAD_x86_64="http://dl-web.getdropbox.com/u/17/dropbox-lnx.x86_64-0.7.110.tar.gz"
-MD5SUM_x86_64="434fb3451d1f638bddde2f5691beb426"
+VERSION="1.0.10"
+HOMEPAGE="www.dropbox.com"
+DOWNLOAD="http://dl-web.dropbox.com/u/17/dropbox-lnx.x86-1.0.10.tar.gz"
+MD5SUM="7c3119dda88d36750f9f3d444643d765"
+DOWNLOAD_x86_64="http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-1.0.10.tar.gz"
+MD5SUM_x86_64="c9acd0561c983585c8e9f9a3d7a6d8cb"
 MAINTAINER="Murat D. Kadirov"
 EMAIL="banderols@gmail.com"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"
diff --git a/network/dropbox/slack-desc b/network/dropbox/slack-desc
index f9eacf8322..379603f282 100644
--- a/network/dropbox/slack-desc
+++ b/network/dropbox/slack-desc
@@ -3,7 +3,7 @@
 # up the first '|' above the ':' following the base package name, and the '|'
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
 dropbox: dropbox (store, sync and share files online)