diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 20:05:58 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 20:05:58 -0300 |
commit | 1872d2123d241e0a3ef01a50fcdc4596b056bcf4 (patch) | |
tree | a9ba894779ea4dc5df5f6d5a9bceae99f4c44e06 /extra/kdiff3 | |
parent | 5a05be089c68617c86c9c555e63f2b0314451ebf (diff) | |
parent | 005a14f92ef5d35e4c47d970cb7e69367a835958 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/balsa/PKGBUILD
community/bitcoin/PKGBUILD
community/jack2/PKGBUILD
community/kadu/PKGBUILD
community/oss/PKGBUILD
core/sudo/PKGBUILD
extra/djvulibre/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
multilib/jack2-multilib/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-sdl/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/dnsutils/PKGBUILD
testing/man-db/PKGBUILD
testing/postgresql/PKGBUILD
testing/postgresql/postgresql.install
testing/postgresql/postgresql.service
testing/procps-ng/PKGBUILD
testing/procps-ng/sysctl.conf
testing/sudo/PKGBUILD
testing/xf86-video-nouveau/PKGBUILD
testing/xf86-video-nouveau/xf86-video-nouveau.install
Diffstat (limited to 'extra/kdiff3')
-rw-r--r-- | extra/kdiff3/PKGBUILD | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD index feb20a0f2..ba375e623 100644 --- a/extra/kdiff3/PKGBUILD +++ b/extra/kdiff3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136960 2011-09-03 21:15:57Z eric $ +# $Id: PKGBUILD 166597 2012-09-12 20:12:20Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=kdiff3 -pkgver=0.9.96 +pkgver=0.9.97 pkgrel=1 pkgdesc="A KDE file comparator/merge tool" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,7 @@ makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml') optdepends=('kdebase-lib: for the plugin') install=kdiff3.install source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz) -md5sums=('46b96befddf3448a3cb673f018c6f6f9') -sha1sums=('d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5') +sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547') build() { cd "${srcdir}/${pkgname}-${pkgver}" |