add: installation nearby, and not in lieu of standart keepass

7 files changed, 28 insertions, 94 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc54000966ab..406063aef655 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,25 @@
 pkgbase = keepass-wine
-	pkgdesc = A easy-to-use password manager for Windows, Linux, Mac OS X and mobile devices.
+	pkgdesc = A easy-to-use password manager for Windows, Linux, Mac OS X and mobile devices. (Wine version)
 	pkgver = 2.34
-	pkgrel = 1
+	pkgrel = 4
 	url = http://keepass.info/
-	install = keepass-wine.install
 	arch = any
 	license = GPL
 	makedepends = icoutils
 	depends = wine
 	depends = desktop-file-utils
 	depends = xdg-utils
-	depends = shared-mime-info
 	depends = gtk-update-icon-cache
-	optdepends = xdotool: if you want to use auto-type
-	optdepends = xsel: clipboard operations
-	provides = keepass
-	conflicts = keepass
 	source = http://downloads.sourceforge.net/keepass/KeePass-2.34.zip
 	source = http://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe
-	source = keepass
-	source = keepass.1
-	source = keepass.desktop
-	source = keepass.xml
+	source = keepass-wine
+	source = keepass-wine.desktop
 	source = KeePass.ico
 	validpgpkeys = D95044283EE948D911E8B606A4F762DC58C6F98E
 	sha256sums = 52dd5a8526cc935b0e240d5ab6402b0b4a3f5f09ad1a6919875878d7f36c697f
 	sha256sums = 46693d9b74d12454d117cc61ff2e9481cabb100b4d74eb5367d3cf88b89a0e71
-	sha256sums = 666911c06fbe3a8670b5cd841ced50e6c8a7724938280c0ce7ac92262d9406b6
-	sha256sums = a5fff678466443c0c8256c4771128c86103da47b6a2c49351d9941191b65dd6f
-	sha256sums = 1d5420e8babce5f4bbb3c68bdffe3bc0d3c3be25ad689138cd02fa14edd89140
-	sha256sums = 3d017c17a8788166c644e2460ba3596fd503f300342561921201fe5f69e5d194
+	sha256sums = 52900369a4c6d058e44637a24f2d772e225b83d2fadbab540363d9d7a3d20a10
+	sha256sums = 685fa3a4e7c9dfcd04bd2be7000bcbbd353c5a1a60f1697c7469e35dd361432d
 	sha256sums = d08ebdd9b0a99f6dc4f62bb20d7bb9ce6ab3139fcb31c8830954e16ebbd3d058
 
 pkgname = keepass-wine
diff --git a/PKGBUILD b/PKGBUILD
index 8214f8250c28..bd84c5925676 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,32 +3,23 @@
 
 pkgname=keepass-wine
 pkgver=2.34
-pkgrel=1
-pkgdesc='A easy-to-use password manager for Windows, Linux, Mac OS X and mobile devices.'
+pkgrel=4
+pkgdesc='A easy-to-use password manager for Windows, Linux, Mac OS X and mobile devices. (Wine version)'
 arch=('any')
 url='http://keepass.info/'
 license=('GPL')
-depends=('wine' 'desktop-file-utils' 'xdg-utils' 'shared-mime-info' 'gtk-update-icon-cache')
-provides=('keepass')
-conflicts=('keepass')
+depends=('wine' 'desktop-file-utils' 'xdg-utils' 'gtk-update-icon-cache')
 makedepends=('icoutils')
-optdepends=('xdotool: if you want to use auto-type'
-            'xsel: clipboard operations')
-install="$pkgname.install"
 source=("http://downloads.sourceforge.net/keepass/KeePass-$pkgver.zip"
         "http://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe"
-        'keepass'
-        'keepass.1'
-        'keepass.desktop'
-        'keepass.xml'
+        'keepass-wine'
+        'keepass-wine.desktop'
         'KeePass.ico')
 
 sha256sums=('52dd5a8526cc935b0e240d5ab6402b0b4a3f5f09ad1a6919875878d7f36c697f'
             '46693d9b74d12454d117cc61ff2e9481cabb100b4d74eb5367d3cf88b89a0e71'
-            '666911c06fbe3a8670b5cd841ced50e6c8a7724938280c0ce7ac92262d9406b6'
-            'a5fff678466443c0c8256c4771128c86103da47b6a2c49351d9941191b65dd6f'
-            '1d5420e8babce5f4bbb3c68bdffe3bc0d3c3be25ad689138cd02fa14edd89140'
-            '3d017c17a8788166c644e2460ba3596fd503f300342561921201fe5f69e5d194'
+            '52900369a4c6d058e44637a24f2d772e225b83d2fadbab540363d9d7a3d20a10'
+            '685fa3a4e7c9dfcd04bd2be7000bcbbd353c5a1a60f1697c7469e35dd361432d'
             'd08ebdd9b0a99f6dc4f62bb20d7bb9ce6ab3139fcb31c8830954e16ebbd3d058')
 
 validpgpkeys=('D95044283EE948D911E8B606A4F762DC58C6F98E')
@@ -40,25 +31,21 @@ prepare() {
 
 package() {
   install -dm755 "$pkgdir"/usr/bin
-  install -dm755 "$pkgdir"/usr/share/keepass/XSL
+  install -dm755 "$pkgdir"/usr/share/keepass-wine/XSL
 
-  install -Dm755 keepass "$pkgdir"/usr/bin/keepass
-  install -Dm755 dotnetfx.exe "$pkgdir"/usr/share/keepass/dotnetfx.exe
-  install -Dm755 KeePass.exe "$pkgdir"/usr/share/keepass/KeePass.exe
-  install -Dm755 KeePass.exe.config "$pkgdir"/usr/share/keepass/KeePass.exe.config
-  install -m644 XSL/* "$pkgdir"/usr/share/keepass/XSL
-  install -Dm644 keepass.1 "$pkgdir"/usr/share/man/man1/keepass.1
+  install -Dm755 keepass-wine "$pkgdir"/usr/bin/keepass-wine
+  install -Dm755 dotnetfx.exe "$pkgdir"/usr/share/keepass-wine/dotnetfx.exe
+  install -Dm755 KeePass.exe "$pkgdir"/usr/share/keepass-wine/KeePass.exe
+  install -Dm755 KeePass.exe.config "$pkgdir"/usr/share/keepass-wine/KeePass.exe.config
+  install -m644 XSL/* "$pkgdir"/usr/share/keepass-wine/XSL
 
   # Proper installation of .desktop file
-  desktop-file-install -m 644 --dir "$pkgdir"/usr/share/applications/ keepass.desktop
+  desktop-file-install -m 644 --dir "$pkgdir"/usr/share/applications/ keepass-wine.desktop
 
   # Install icons
   for size in 16 32 48 256; do
     install -Dm644 \
     KeePass_*_${size}x${size}x32.png \
-    "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/keepass.png
+    "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/keepass-wine.png
   done
-
-  # Needed for postinst with xdg-utils
-  install -Dm644 keepass.xml "$pkgdir"/usr/share/mime/packages/keepass.xml
 }
diff --git a/keepass b/keepass-wine
index 8e36ae97a211..8e220911b8a6 100755
--- a/keepass
+++ b/keepass-wine
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-export WINEPREFIX="$HOME/.keepass/wine"
+export WINEPREFIX="$HOME/.keepass-wine"
 export WINEARCH=win32
-export WINEDEBUG=-all
+export WINEDEBUG=-fixme
+export WINEDLLOVERRIDES="mscoree,mshtml="
 
 function setpath(){
     # PathExt
@@ -21,9 +22,9 @@ function setpath(){
 if [ ! -d "$WINEPREFIX" ] ; then
     mkdir -p `dirname $WINEPREFIX`
     # Install dotnetfx
-    wine "/usr/share/keepass/dotnetfx.exe" /c:"install.exe /q"
+    wine "/usr/share/keepass-wine/dotnetfx.exe" /c:"install.exe /q"
     setpath
 fi
 
 # Start Keepass
-wine "/usr/share/keepass/KeePass.exe" "`winepath -w "$@"`"
+wine "/usr/share/keepass-wine/KeePass.exe" "`winepath -w "$@"`"
diff --git a/keepass.desktop b/keepass-wine.desktop
index 2ba721579296..3d89976cb1a7 100644
--- a/keepass.desktop
+++ b/keepass-wine.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
-Name=KeePass Password Safe
+Name=KeePass Password Safe (wine)
 GenericName=Cross-platform password manager
 Comment=The free, open source, light-weight and easy-to-use password manager
-Exec=keepass
+Exec=keepass-wine
 Icon=keepass
 MimeType=application/x-keepass2;
 Terminal=false
diff --git a/keepass-wine.install b/keepass-wine.install
deleted file mode 100644
index 8a562e60f49d..000000000000
--- a/keepass-wine.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_remove() {
-  rm -f usr/share/keepass/KeePass.exe.so
-  rmdir --ignore-fail-on-non-empty usr/share/keepass/Plugins usr/share/keepass &> /dev/null
-}
-
-post_install() {
-  post_remove
-  mono --aot -O=all usr/share/keepass/KeePass.exe &> /dev/null
-  mkdir -p usr/share/keepass/Plugins
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/keepass.1 b/keepass.1
deleted file mode 100644
index 7f4cb01672ac..000000000000
--- a/keepass.1
+++ /dev/null
@@ -1,23 +0,0 @@
-.TH KEEPASS 1 "Mar 19, 2011"
-.SH NAME
-keepass \- password manager
-.SH SYNOPSIS
-.B keepass
-.SH DESCRIPTION
-\fBKeePass\fP is a free/open-source password manager or safe which helps you to manage your passwords in a secure way. You can put all your passwords in one database, which is locked with one master key or a key file. So you only have to remember one single master password to unlock the whole database. The databases are encrypted using AES-256.
-.SH OPTIONS
-.TP
-\fB\-\-auto-type\fP
-invokes global auto-type
-.TP
-\fB\-\-lock-all\fP
-lock databases of all KeePass instances
-.TP
-\fB\-\-unlock-all\fP
-unlock databases of all KeePass instances
-.TP
-\fB\-\-exit-all\fP
-exit all KeePass instances
-.SH AUTHOR
-This manual page was written by Julian Taylor <jtaylor.debian@googlemail.com>,
-for the Debian project (but may be used by others).
diff --git a/keepass.xml b/keepass.xml
deleted file mode 100644
index 9282115a6652..000000000000
--- a/keepass.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-keepass2">
-     <comment>KeePass database</comment>
-     <glob pattern="*.kdbx"/>
-  </mime-type>
-</mime-info>