diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-17 18:53:45 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-17 18:53:45 +0200 |
commit | b84f8dfdf58409163a410c241009870ecbd35952 (patch) | |
tree | 0ae6ab56ed3cbbc209f7ed0691a7fca52dc5d093 /extra/poppler | |
parent | 6feb300093e37e58027d52ca5734624565e09598 (diff) | |
parent | f675762300c4ee2717e029975bb3f94312245276 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ccrtp/PKGBUILD
community/freerdp/PKGBUILD
community/python2-pymongo/PKGBUILD
community/yaz/PKGBUILD
extra/apr/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/perl-ev/PKGBUILD
extra/poppler/PKGBUILD
extra/sqlite/PKGBUILD
extra/vim/PKGBUILD
extra/xfce4-mount-plugin/PKGBUILD
extra/xfce4-mpc-plugin/PKGBUILD
extra/xfce4-smartbookmark-plugin/PKGBUILD
multilib/lib32-atk/PKGBUILD
multilib/lib32-cairo/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-gmp/PKGBUILD
multilib/lib32-libldap/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-v4l-utils/PKGBUILD
testing/glib2/PKGBUILD
testing/openmpi/PKGBUILD
Diffstat (limited to 'extra/poppler')
-rw-r--r-- | extra/poppler/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 939f7fc4b..bac4ca39f 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153271 2012-03-12 19:10:06Z jgc $ +# $Id: PKGBUILD 158944 2012-05-13 14:56:03Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') pkgver=0.18.4 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 mips64el) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') |