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

[Antonio Rojas]

    Date: Tuesday, January 3, 2017 @ 20:37:32
  Author: arojas
Revision: 285259

Conflict with obsolete packages for smooth upgrade

Modified:
  calligra/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-03 20:03:48 UTC (rev 285258)
+++ PKGBUILD	2017-01-03 20:37:32 UTC (rev 285259)
@@ -7,7 +7,7 @@
 pkgname=calligra
 pkgdesc="A set of applications for productivity and creative usage"
 pkgver=3.0.0.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
@@ -25,9 +25,10 @@
             'openjpeg: PDF to SVG filer'
             'cauchy: formula shape')
 conflicts=('calligra-devtools' 'calligra-extras' 'calligra-filters' 'calligra-karbon' 'karbon' 'calligra-libs' 'calligra-plan'
-         'calligra-plugins' 'calligra-sheets' 'calligra-stage' 'calligra-words' 'calligra-l10n' 'calligra-meta')
+          'calligra-plugins' 'calligra-sheets' 'calligra-stage' 'calligra-words' 'calligra-l10n' 'calligra-meta'
+          'calligra-flow' 'calligra-braindump' 'calligra-gemini')
 replaces=('calligra-devtools' 'calligra-extras' 'calligra-filters' 'calligra-karbon' 'karbon' 'calligra-libs' 'calligra-plan'
-         'calligra-plugins' 'calligra-sheets' 'calligra-stage' 'calligra-words' 'calligra-l10n' 'calligra-meta')
+          'calligra-plugins' 'calligra-sheets' 'calligra-stage' 'calligra-words' 'calligra-l10n' 'calligra-meta')
 for _lang in bs ca ca at valencia cs da de el en_gb es et fi fr gl hu it ja kk nb nl \
              pl pt pt_br ru sk sv uk zh_cn zh_tw; do
   conflicts+=(calligra-l10n-$_lang)