Merged upstream, mesa needs revision

Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/gigi/PKGBUILD
	community-staging/lxdm/PKGBUILD
	community-staging/lxdm/lxdm-pam
	community-staging/lxdm/lxdm.install
	community-staging/lxdm/service
	community-testing/gigi/PKGBUILD
	community/calf/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnash/PKGBUILD
	community/prboom/PKGBUILD
	community/scorched3d/PKGBUILD
	community/tmux/PKGBUILD
	community/torcs/PKGBUILD
	core/curl/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/akonadi/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/ftgl/PKGBUILD
	extra/gcin/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/mesa/PKGBUILD
	extra/python-telepathy/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/ruby/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-xkb-plugin/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/baobab/PKGBUILD
	gnome-unstable/epiphany/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-games/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/libpeas/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/networkmanager/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-sqlite/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	staging/calligra/PKGBUILD
	staging/inkscape/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase-workspace/kde-np.pam
	staging/kdebase-workspace/kde.pam
	staging/kdebase-workspace/kdm.service
	staging/libreoffice/PKGBUILD
	staging/libreoffice/libreoffice-common.csh
	staging/libreoffice/libreoffice-common.sh
	staging/poppler/PKGBUILD
	testing/dbus-python/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iproute2/PKGBUILD
	testing/iptables/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase-workspace/kde-np.pam
	testing/kdebase-workspace/kde.pam
	testing/kdebindings-python/PKGBUILD
	testing/lvm2/PKGBUILD
	testing/lvm2/lvm-on-crypt.service
	testing/lvm2/lvm.service
	testing/miro/PKGBUILD
	testing/postgresql/PKGBUILD
	testing/postgresql/postgresql.install
	testing/postgresql/postgresql.service
	testing/ppp/PKGBUILD
	testing/ppp/ip-down
	testing/pyqt/PKGBUILD
	testing/qscintilla/PKGBUILD
	testing/sip/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install
	testing/util-linux/PKGBUILD
	testing/wpa_supplicant/PKGBUILD
	testing/wpa_supplicant/config
	testing/xf86-video-intel/PKGBUILD

1 files changed, 9 insertions, 11 deletions

diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index f37607f79..3d9fe9505 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 75950 2012-09-06 20:00:35Z jlichtblau $
+# $Id: PKGBUILD 77658 2012-10-13 11:44:51Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Matthias Maennich <arch@maennich.net>
 # Contributor: <boenki@gmx.de>
 
 pkgname=qlandkartegt
 pkgver=1.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Use your GPS with Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qlandkarte.org/"
 license=('GPL')
-depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs'
+depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'glu' 'postgresql-libs'
          'qt' 'shared-mime-info' 'qtwebkit')
-makedepends=('cmake' 'garmindev')
+makedepends=('cmake' 'garmindev' 'mesa')
 optdepends=('garmindev: to connect garmin devices')
 install=$pkgname.install
 changelog=$pkgname.changelog
@@ -22,9 +22,7 @@ sha256sums=('095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd'
             'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
 
@@ -35,10 +33,10 @@ build() {
 }
 
 package(){
-  cd ${srcdir}/build
+  cd "${srcdir}/build"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 
-  install -D -m644 ${srcdir}/$pkgname-mimetypes.xml \
-    ${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml
+  install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \
+    "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml"
 }