diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-07 15:10:29 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-07 15:10:29 +0100 |
| commit | 4c4400925b792b694511bbbf2f645fb34495d5cf (patch) | |
| tree | 86a3b3c62e75fdf9c536306d195bbbcbc7ac974c /core | |
| parent | 08adec2ac14efea1ef452e79ff86f024b9becaf3 (diff) | |
| parent | 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bwbar/PKGBUILD
community/directfb/PKGBUILD
community/extremetuxracer/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gnash/PKGBUILD
community/guake/PKGBUILD
community/pidgin-libnotify/PKGBUILD
community/png2ico/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/torcs/PKGBUILD
community/virtualbox/PKGBUILD
extra/abiword/PKGBUILD
extra/alsaplayer/PKGBUILD
extra/automoc4/PKGBUILD
extra/cagibi/PKGBUILD
extra/fltk/PKGBUILD
extra/gnome-desktop2/PKGBUILD
extra/gnome-python/PKGBUILD
extra/gnome-sharp/PKGBUILD
extra/gnugo/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/gtk2/PKGBUILD
extra/gtkmm/PKGBUILD
extra/imlib2/PKGBUILD
extra/koffice/PKGBUILD
extra/lcms/PKGBUILD
extra/libao/PKGBUILD
extra/libcue/PKGBUILD
extra/libdaemon/PKGBUILD
extra/libgnome-media-profiles/PKGBUILD
extra/libotf/PKGBUILD
extra/libotr/PKGBUILD
extra/libots/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libtiff/PKGBUILD
extra/libwebkit/PKGBUILD
extra/libwmf/PKGBUILD
extra/libxfcegui4/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/netpbm/PKGBUILD
extra/php/PKGBUILD
extra/plotutils/PKGBUILD
extra/poppler/PKGBUILD
extra/qrencode/PKGBUILD
extra/qt/PKGBUILD
extra/qtiplot/PKGBUILD
extra/rssh/PKGBUILD
extra/scim-chewing/PKGBUILD
extra/scim-m17n/PKGBUILD
extra/scim-pinyin/PKGBUILD
extra/scim-tables/PKGBUILD
extra/scim-uim/PKGBUILD
extra/tsocks/PKGBUILD
extra/vigra/PKGBUILD
extra/w3m/PKGBUILD
extra/wv/PKGBUILD
extra/xclip/PKGBUILD
extra/xfce4-datetime-plugin/PKGBUILD
extra/xfce4-notes-plugin/PKGBUILD
extra/xfce4-quicklauncher-plugin/PKGBUILD
extra/xfce4-sensors-plugin/PKGBUILD
extra/xorg-font-util/PKGBUILD
extra/xorg-setxkbmap/PKGBUILD
extra/xorg-xev/PKGBUILD
extra/xsane/PKGBUILD
extra/yakuake/PKGBUILD
extra/zvbi/PKGBUILD
multilib/lib32-cairo/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-libcanberra/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-libglade/PKGBUILD
multilib/lib32-libpng/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/wine/PKGBUILD
testing/vlc/PKGBUILD
testing/xulrunner/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/gnupg/PKGBUILD | 8 | ||||
| -rw-r--r-- | core/links/PKGBUILD | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index f678f304e..b6419c832 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146739 2012-01-16 22:52:44Z dreisner $ +# $Id: PKGBUILD 148992 2012-02-05 12:21:23Z andyrtr $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=gnupg -pkgver=1.4.11 -pkgrel=3 +pkgver=1.4.12 +pkgrel=1 pkgdesc="GNU Privacy Guard - a PGP replacement tool" arch=('i686' 'x86_64') license=('GPL3') @@ -11,7 +11,7 @@ depends=('zlib' 'bzip2' 'libldap>=2.4.18' 'libusb-compat' 'curl>=7.16.2' 'readli source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2) install=gnupg.install url="http://www.gnupg.org/" -md5sums=('411744e1ef8ce90b87938c4203f001f1') +md5sums=('ce3742e5c7912559cab7894ad8ba7f6b') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD index dd21b968a..c658dfa9e 100644 --- a/core/links/PKGBUILD +++ b/core/links/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 143535 2011-11-26 00:22:27Z eric $ +# $Id: PKGBUILD 148998 2012-02-05 12:58:31Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=links -pkgver=2.4 +pkgver=2.5 pkgrel=1 pkgdesc="A text WWW browser, similar to Lynx" arch=('i686' 'x86_64' 'mips64el') url="http://links.twibright.com/" license=('GPL') -depends=('bzip2' 'zlib' 'openssl' 'gpm') +depends=('bzip2' 'xz' 'zlib' 'openssl' 'gpm') makedepends=('libtiff' 'libpng' 'libxt') optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks') provides=('links-g') conflicts=('links-g') replaces=('links-g') source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop) -sha1sums=('c09fcb03874b1d0586f582f73833bb2f4c9ed7ac' +sha1sums=('fe4bc37be8aebd9196c35ffef724435cea94349c' 'f600e27c2a71184444f7dd07a10230aa44463a02') build() { |