[arch-commits] Commit in galculator/trunk (PKGBUILD)

[Martin Wimpress]

    Date: Thursday, March 20, 2014 @ 13:53:43
  Author: flexiondotorg
Revision: 107986

upgpkg: galculator 2.1.3-3 - Correct conflicts.

Modified:
  galculator/trunk/PKGBUILD

----------+
 PKGBUILD |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-20 12:50:25 UTC (rev 107985)
+++ PKGBUILD	2014-03-20 12:53:43 UTC (rev 107986)
@@ -8,7 +8,7 @@
 pkgbase=galculator
 pkgname=(galculator galculator-gtk2)
 pkgver=2.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc='GTK+ based scientific calculator'
 arch=('i686' 'x86_64')
 url='http://galculator.sourceforge.net/'
@@ -40,7 +40,7 @@
 
 package_galculator() {
   depends=('gtk3')
-  
+
   cd "${pkgbase}-${pkgver}/gtk3"
   make DESTDIR="$pkgdir" install
 }
@@ -50,7 +50,8 @@
   depends=('gtk2')
   groups=('mate-extra')
   replaces=('mate-calc')
-  conflicts=('galculator' 'mate-calc')
+  provides=('mate-calc')
+  conflicts=('galculator')
 
   cd "${pkgbase}-${pkgver}/gtk2"
   make DESTDIR="$pkgdir" install