3 files changed, 20 insertions, 15 deletions
diff --git a/development/squirrel-sql/slack-desc b/development/squirrel-sql/slack-desc
index 06daecb3cd..6e830a1b1b 100644
--- a/development/squirrel-sql/slack-desc
+++ b/development/squirrel-sql/slack-desc
@@ -11,9 +11,9 @@ squirrel-sql:
 squirrel-sql: SQuirreL SQL Client is a graphical Java program that will
 squirrel-sql: allow you to view the structure of a JDBC compliant database,
 squirrel-sql: browse the data in tables and issue SQL commands.
-squirrel-sql: 
-squirrel-sql: 
-squirrel-sql: 
-squirrel-sql: 
-squirrel-sql: 
+squirrel-sql:
+squirrel-sql:
+squirrel-sql:
+squirrel-sql:
+squirrel-sql:
 squirrel-sql:
diff --git a/development/squirrel-sql/squirrel-sql.SlackBuild b/development/squirrel-sql/squirrel-sql.SlackBuild
index b6e9965b62..3616f9093a 100644
--- a/development/squirrel-sql/squirrel-sql.SlackBuild
+++ b/development/squirrel-sql/squirrel-sql.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Dario Nicodemi dario.sbo@gmail.com
 
 PRGNAM=squirrel-sql
-VERSION=${VERSION:-3.1}
+VERSION=${VERSION:-3.2.1}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -15,13 +15,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION-optional
 tar xvf $CWD/$PRGNAM-$VERSION-optional.tar.gz
+mv $PRGNAM-$VERSION-optional $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -32,7 +33,7 @@ find . \
 
 mkdir -p $PKG/opt/$PRGNAM
 cp -r . $PKG/opt/$PRGNAM
-rm -rf $PKG/opt/$PRGNAM/{Uninstaller,update,addpath.bat}
+rm -rf $PKG/opt/$PRGNAM/{Uninstaller,update,addpath.bat,squirrel-sql.bat}
 mkdir -p $PKG/usr/bin
 cat <<EOF > $PKG/usr/bin/squirrel-sql
 #!/bin/sh
@@ -45,8 +46,12 @@ mkdir -p $PKG/usr/share/{applications,pixmaps}
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 cat $CWD/$PRGNAM.png     > $PKG/usr/share/pixmaps/$PRGNAM.png
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+# Move doc to standard location + create symlink
+mkdir -p $PKG/usr/doc
+mv $PKG/opt/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION
+cd $PKG/opt/$PRGNAM
+  ln -s ../../usr/doc/$PRGNAM-$VERSION doc
+cd -
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/squirrel-sql/squirrel-sql.info b/development/squirrel-sql/squirrel-sql.info
index 3024b52558..cd8a376faa 100644
--- a/development/squirrel-sql/squirrel-sql.info
+++ b/development/squirrel-sql/squirrel-sql.info
@@ -1,10 +1,10 @@
 PRGNAM="squirrel-sql"
-VERSION="3.1"
+VERSION="3.2.1"
 HOMEPAGE="http://squirrel-sql.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/squirrel-sql/squirrel-sql-3.1-optional.tar.gz"
-MD5SUM="4957ae80a7887942bbc085c41bfdfb50"
+DOWNLOAD="http://downloads.sourceforge.net/squirrel-sql/squirrel-sql-3.2.1-optional.tar.gz"
+MD5SUM="0be3077619c87bc272c8c779507bda9b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Dario Nicodemi"
 EMAIL="dario.sbo@gmail.com"
-APPROVED="rworkman"
+APPROVED="Niels Horn"