summaryrefslogtreecommitdiff
path: root/extra/xorg-server/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-04-19 12:40:04 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-04-19 12:40:04 +0200
commitd186e96728bff4cc4873c59d48d01fe6eefe6131 (patch)
tree1eefcef8058414b07b2750f52d9746f5323472ff /extra/xorg-server/PKGBUILD
parent84c217e2d9acc64713978324761816e2468b5292 (diff)
parent1fedf1f5d5351aefd88268cba7353c79adac9b8a (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/collectd/PKGBUILD community/drivel/PKGBUILD community/fcitx-mozc/PKGBUILD community/gnomesu/PKGBUILD community/gnuchess/PKGBUILD community/gphpedit/PKGBUILD community/gsql/PKGBUILD community/libmatchbox/PKGBUILD community/lockfile-progs/PKGBUILD community/opencc/PKGBUILD community/roxterm/PKGBUILD community/uriparser/PKGBUILD community/xcircuit/PKGBUILD core/bison/PKGBUILD core/curl/PKGBUILD core/expat/PKGBUILD core/gcc/PKGBUILD core/gpm/PKGBUILD core/m4/PKGBUILD core/systemd/PKGBUILD core/tar/PKGBUILD extra/alsa-lib/PKGBUILD extra/alsa-utils/PKGBUILD extra/bitlbee/PKGBUILD extra/chkrootkit/PKGBUILD extra/fakechroot/PKGBUILD extra/farstream/PKGBUILD extra/freeglut/PKGBUILD extra/gob2/PKGBUILD extra/libcdio-paranoia/PKGBUILD extra/liblqr/PKGBUILD extra/libnl1/PKGBUILD extra/libpst/PKGBUILD extra/libwpd/PKGBUILD extra/xorg-server/PKGBUILD
Diffstat (limited to 'extra/xorg-server/PKGBUILD')
-rw-r--r--extra/xorg-server/PKGBUILD8
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 409ee567c..398e39971 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180178 2013-03-18 16:08:50Z andyrtr $
+# $Id: PKGBUILD 183085 2013-04-17 12:51:32Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.14.0
-pkgrel=2
+pkgver=1.14.1
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -24,7 +24,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
10-quirks.conf
loongson.patch
git-fixes.patch)
-sha256sums=('1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630'
+sha256sums=('a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa'
'66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'