aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/KeePass/KeePass.SlackBuild9
-rw-r--r--misc/KeePass/KeePass.info12
-rw-r--r--misc/KeePass/files/keepass2
3 files changed, 10 insertions, 13 deletions
diff --git a/misc/KeePass/KeePass.SlackBuild b/misc/KeePass/KeePass.SlackBuild
index cf9b917ccba0..44db2ba02fca 100644
--- a/misc/KeePass/KeePass.SlackBuild
+++ b/misc/KeePass/KeePass.SlackBuild
@@ -18,16 +18,14 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
PRGNAM=KeePass
-VERSION=${VERSION:-2.14}
+VERSION=${VERSION:-2.15}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -61,7 +59,7 @@ rm -rf $PRGNAM-$VERSION
mkdir -p $PRGNAM-$VERSION
cd $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION $PRGNAM-$VERSION-Source
+mkdir -p $PRGNAM-$VERSION-Source
unzip $CWD/$PRGNAM-$VERSION.zip -d $PRGNAM-$VERSION
unzip $CWD/$PRGNAM-$VERSION-Source.zip -d $PRGNAM-$VERSION-Source
@@ -93,11 +91,12 @@ mkdir -p $PKG/usr/lib
cp -a $PRGNAM-$VERSION $PKG/usr/lib/
mkdir -p $PKG/usr/bin
-cp $CWD/files/keepass $PKG/usr/bin/keepass
+echo -e '#!/bin/bash'"\nexec /usr/bin/mono /usr/lib/KeePass-${VERSION}/KeePass.exe" > $PKG/usr/bin/keepass
chmod 0755 $PKG/usr/bin/keepass
mkdir -p $PKG/usr/share/applications
cp $CWD/files/KeePass.desktop $PKG/usr/share/applications/
+chmod 0644 $PKG/usr/share/applications/KeePass.desktop
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/misc/KeePass/KeePass.info b/misc/KeePass/KeePass.info
index 321795c79b6f..cba2fc5dcf82 100644
--- a/misc/KeePass/KeePass.info
+++ b/misc/KeePass/KeePass.info
@@ -1,12 +1,12 @@
PRGNAM="KeePass"
-VERSION="2.14"
+VERSION="2.15"
HOMEPAGE="http://keepass.info/"
-DOWNLOAD="http://downloads.sourceforge.net/keepass/KeePass-2.14.zip \
- http://downloads.sourceforge.net/keepass/KeePass-2.14-Source.zip"
-MD5SUM="4c54f135e3ca10445a97ae02db7a527c \
- 1082033821837e0722b6eef8d0bea4a6"
+DOWNLOAD="http://downloads.sourceforge.net/keepass/KeePass-2.15.zip \
+ http://downloads.sourceforge.net/keepass/KeePass-2.15-Source.zip"
+MD5SUM="3f1f8da59e410e973a4dfb2f5a5342d1 \
+ 4cbf5a7fe26579d3886b2ebb9852dfd7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Eric B. Pratt"
EMAIL="eric.b.pratt@gmail.com"
-APPROVED="rworkman"
+APPROVED="Niels Horn"
diff --git a/misc/KeePass/files/keepass b/misc/KeePass/files/keepass
deleted file mode 100644
index fa1fb3b07307..000000000000
--- a/misc/KeePass/files/keepass
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/mono /usr/lib/KeePass-2.14/KeePass.exe