diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-15 00:31:49 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-15 00:31:49 -0300 |
commit | 93db7f2fb23cba78cde4343b506a676e376ca4a8 (patch) | |
tree | 3fec56215a344b1e01e49a27198f919ac981320b /extra/calligra | |
parent | c162e34d12c6cf76532a7f6b3d538d493a8bf17a (diff) | |
parent | 39e9111d76d232d65ca0c43285dea5bd5d58d28e (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/avant-window-navigator/PKGBUILD
community/awn-extras-applets/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/gnome-menus2/PKGBUILD
community/gnome-panel/PKGBUILD
community/gpsim/PKGBUILD
community/kgraphviewer/PKGBUILD
community/kpovmodeler/PKGBUILD
community/libdesktop-agnostic/PKGBUILD
community/python-basemap/PKGBUILD
community/python-mpi4py/PKGBUILD
community/python-psutil/PKGBUILD
community/qgo/PKGBUILD
community/ude/PKGBUILD
community/virtkey/PKGBUILD
extra/alsaplayer/PKGBUILD
extra/aterm/PKGBUILD
extra/cups-pdf/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdeplasma-applets-networkmanagement/PKGBUILD
extra/libffado/PKGBUILD
extra/libtar/PKGBUILD
extra/maxima/PKGBUILD
extra/php-xcache/PKGBUILD
extra/postgresql/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xorg-xauth/PKGBUILD
Diffstat (limited to 'extra/calligra')
-rw-r--r-- | extra/calligra/PKGBUILD | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 8c5c4f89e..7af7bc8e7 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193497 2013-08-21 11:58:14Z andrea $ +# $Id: PKGBUILD 196349 2013-10-12 06:13:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> @@ -17,7 +17,7 @@ pkgname=('calligra-braindump' 'calligra-sheets' 'calligra-stage' 'calligra-words') -pkgver=2.7.2 +pkgver=2.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' @@ -29,7 +29,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' [ "$CARCH" != "mips64el" ] && makedepends+=('vc') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz") -md5sums=('645886d0fff6b1dd865850f3187004a6') +md5sums=('35165d00f38eba5de575662cafe3bf0f') prepare() { mkdir build @@ -91,7 +91,7 @@ package_calligra-karbon() { pkgdesc="Create scalable vector drawings" depends=('calligra-libs' 'kdebase-runtime' 'pstoedit') optdepends=('calligra-filters: import/export filters' - 'calligra-tools: extra calligra tools') + 'calligra-extras: extra calligra tools') conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') install=calligra-karbon.install @@ -163,7 +163,7 @@ package_calligra-sheets() { depends=('calligra-libs' 'gsl' 'kdebase-runtime') optdepends=('calligra-filters: import/export filters' 'calligra-plugins: extra calligra plugins' - 'calligra-tools: extra calligra tools') + 'calligra-extras: extra calligra tools') conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') install=calligra-sheets.install @@ -177,7 +177,7 @@ package_calligra-sheets() { package_calligra-words() { pkgdesc="Word Processor" depends=('calligra-plugins' 'kdegraphics-okular') - optdepends=('calligra-tools: extra calligra tools') + optdepends=('calligra-extras: extra calligra tools') conflicts=('koffice-kword') replaces=('koffice-kword') install=calligra-words.install |