diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-19 10:15:11 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-19 10:15:11 -0300 |
| commit | 4255b0aec5bcee0728d312531df99cc9a6e5ba08 (patch) | |
| tree | 9cc60e9b2dce5800b57651ea5b5989381530c9de /extra/calligra | |
| parent | 9e30cea6b8a2e90fd8958ca1f773e3a382179763 (diff) | |
| parent | 705d29694fd61c47a57ccec531e73d87a2960021 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/lxsession/PKGBUILD
community/uzbl/PKGBUILD
extra/boost/PKGBUILD
extra/calligra/PKGBUILD
extra/gnutls/PKGBUILD
extra/lapack/PKGBUILD
extra/libcap-ng/PKGBUILD
extra/php/PKGBUILD
extra/plotutils/PKGBUILD
extra/qt/PKGBUILD
extra/webkitgtk/PKGBUILD
Diffstat (limited to 'extra/calligra')
| -rw-r--r-- | extra/calligra/PKGBUILD | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 37cd1b22f..649e5d2f7 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169740 2012-10-27 23:41:30Z eric $ +# $Id: PKGBUILD 171513 2012-11-18 10:27:43Z andyrtr $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -18,7 +18,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.5.3 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -57,12 +57,10 @@ package_calligra-libs() { depends=('kdepimlibs' 'lcms2') conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics' 'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces' - 'calligra-libs' 'calligra-pics' 'calligra-servicetypes' - 'calligra-templates') + 'calligra-pics' 'calligra-servicetypes' 'calligra-templates') replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics' 'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces' - 'calligra-libs' 'calligra-pics' 'calligra-servicetypes' - 'calligra-templates') + 'calligra-pics' 'calligra-servicetypes' 'calligra-templates') for d in interfaces libs pics servicetypes templates; do cd "${srcdir}"/build/${d} |