summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Lau2017-09-11 10:33:23 +0200
committerSebastian Lau2017-09-11 10:33:23 +0200
commitef3677736382bcec19f829399c8b5ebb4ccf2284 (patch)
tree3856d2b2bb5c45cdaccf859786ef87a6e4323db1
parent53759239e293b52c2a8dc87956fb374e5f70bca4 (diff)
downloadaur-ef3677736382bcec19f829399c8b5ebb4ccf2284.tar.gz
kdiff3 does not seem to work anymore
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD5
-rw-r--r--nemo-compare.install10
3 files changed, 12 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ac909f55e5f..53d0e9a102a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon May 8 19:09:38 UTC 2017
+# Mon Sep 11 08:32:21 UTC 2017
pkgbase = nemo-compare
pkgdesc = Context menu comparison extension for Nemo file manager
pkgver = 3.4.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/linuxmint/nemo-extensions
install = nemo-compare.install
arch = any
@@ -13,7 +13,6 @@ pkgbase = nemo-compare
depends = nemo-python>=1.0
depends = python2-xdg
depends = pygtk
- optdepends = kdiff3: Additional comparison options (preferred diff, three-way, multi-compare)
optdepends = diffuse: Additional comparison options (preferred diff, three-way, multi-compare)
optdepends = kompare: Additional comparison options (preferred diff, three-way, multi-compare)
optdepends = fldiff: Additional comparison options (preferred diff, three-way, multi-compare)
diff --git a/PKGBUILD b/PKGBUILD
index 96a6139927a0..67303f348e3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,14 @@
pkgname=nemo-compare
pkgver=3.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="Context menu comparison extension for Nemo file manager"
arch=("any")
url="https://github.com/linuxmint/nemo-extensions"
license=('GPL3')
depends=('nemo>=3.2' 'nemo-python>=1.0' 'python2-xdg' 'pygtk')
groups=('nemo-extensions')
-optdepends=('kdiff3: Additional comparison options (preferred diff, three-way, multi-compare)'
- 'diffuse: Additional comparison options (preferred diff, three-way, multi-compare)'
+optdepends=('diffuse: Additional comparison options (preferred diff, three-way, multi-compare)'
'kompare: Additional comparison options (preferred diff, three-way, multi-compare)'
'fldiff: Additional comparison options (preferred diff, three-way, multi-compare)')
install=${pkgname}.install
diff --git a/nemo-compare.install b/nemo-compare.install
index 6637d507a575..cda584c063ea 100644
--- a/nemo-compare.install
+++ b/nemo-compare.install
@@ -1,7 +1,9 @@
post_install() {
cat <<-EndOfMessage
-==> Restart nemo with 'nemo -q'
+==> Restart nemo
+==>
+==> You can specify the diff extension with nemo-compare-preferences
EndOfMessage
}
@@ -11,5 +13,9 @@ post_upgrade() {
}
post_remove() {
- post_install $1
+ cat <<-EndOfMessage
+
+==> Restart nemo
+
+EndOfMessage
}