diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-10 10:00:34 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-10 10:00:34 +0100 |
| commit | fbe815aa83090984779a8b380cbfc1247353d98b (patch) | |
| tree | 2eb92ffe4f5cb6c6c13f065f3122d9f18264b6c6 /core/glibc | |
| parent | d638a96c43b3c4fb9b517e8a66a4e8b1fa999833 (diff) | |
| parent | d22b68a6758c4f29a8e50a7be467374a53c68415 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/qtfm/PKGBUILD
core/binutils/PKGBUILD
core/fakeroot/PKGBUILD
core/gcc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/audacious/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/llvm/PKGBUILD
extra/maxima/PKGBUILD
extra/sbcl/PKGBUILD
extra/vigra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-libgcrypt/PKGBUILD
multilib/lib32-libgpg-error/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
multilib/lib32-tdb/PKGBUILD
multilib/lib32-xcb-util/PKGBUILD
Diffstat (limited to 'core/glibc')
| -rw-r--r-- | core/glibc/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 6af3811e8..d3462cb2e 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141374 2011-10-30 06:48:27Z allan $ +# $Id: PKGBUILD 144848 2011-12-08 12:17:04Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.14.1 -pkgrel=1 +pkgrel=2 _glibcdate=20111025 _glibcportsver=2.14 _glibcportsdate=20110908 @@ -15,7 +15,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=3.0' 'tzdata') +depends=('linux-api-headers>=3.1' 'tzdata') makedepends=('gcc>=4.6') backup=(etc/gai.conf etc/locale.gen |