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

Conflicts:
	community/camlp5-transitional/PKGBUILD
	community/camlp5/PKGBUILD
	community/compizconfig-backend-kconfig/PKGBUILD
	community/libtrash/PKGBUILD
	community/mediastreamer/PKGBUILD
	community/python-pycurl/PKGBUILD
	extra/alpine/PKGBUILD
	extra/anjuta-extras/PKGBUILD
	extra/aufs2-util/PKGBUILD
	extra/bitlbee/PKGBUILD
	extra/cups/PKGBUILD
	extra/dotconf/PKGBUILD
	extra/fbida/PKGBUILD
	extra/fvwm-devel/PKGBUILD
	extra/libdmtx/PKGBUILD
	extra/libindi/PKGBUILD
	extra/mousepad/PKGBUILD
	extra/pysmbc/PKGBUILD
	extra/rcs/PKGBUILD
	extra/xfprint/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/lib32-llvm/PKGBUILD
	multilib/lib32-llvm/cindexer-clang-path.patch
	multilib/lib32-llvm/clang-plugin-loader-registry.patch
	multilib/lib32-llvm/clang-pure64.patch
	multilib/lib32-llvm/clang-toolchains-gcc-versions.patch
	multilib/lib32-llvm/enable-lto.patch
	multilib/lib32-mesa/PKGBUILD
	testing/mesa/PKGBUILD
	testing/perl/ChangeLog
	testing/perl/PKGBUILD

1 files changed, 22 insertions, 22 deletions

diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index d6c9ea126..1e1d98fce 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 117485 2011-04-04 07:01:13Z andrea $
+# $Id: PKGBUILD 127705 2011-06-17 18:04:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=system-config-printer
 pkgname=('system-config-printer-common'
 	'system-config-printer-gnome')
-pkgver=1.3.2
+pkgver=1.3.3
 pkgrel=1
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
@@ -12,10 +12,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
 source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('34a0ce9a11be5695b3b4065e4f17b009')
+md5sums=('658516848c6ced2b1acc6d3525d27204')
 
 build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
+  cd "${srcdir}"/${pkgbase}-${pkgver}
   
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
@@ -39,8 +39,8 @@ package_system-config-printer-common() {
   provides=("system-config-printer=${pkgver}")
   conflicts=('system-config-printer')
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  install -d ${pkgdir}/usr/share/${pkgbase}
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  install -d "${pkgdir}"/usr/share/${pkgbase}
   install -m644 config.py \
     debug.py \
     installpackage.py \
@@ -52,27 +52,27 @@ package_system-config-printer-common() {
     smburi.py \
     statereason.py \
     XmlHelper.py \
-    ${pkgdir}/usr/share/${pkgbase}/
+    "${pkgdir}"/usr/share/${pkgbase}/
 
   install -m755 pysmb.py \
-    ${pkgdir}/usr/share/${pkgbase}/
+    "${pkgdir}"/usr/share/${pkgbase}/
 
-  install -d ${pkgdir}/etc/dbus-1/system.d/
+  install -d "${pkgdir}"/etc/dbus-1/system.d/
   install -m644 dbus/com.redhat.NewPrinterNotification.conf \
     dbus/com.redhat.PrinterDriversInstaller.conf \
-    ${pkgdir}/etc/dbus-1/system.d/
-  install -d ${pkgdir}/etc/cupshelpers/
-  install -m644 xml/preferreddrivers.xml ${pkgdir}/etc/cupshelpers/
+    "${pkgdir}"/etc/dbus-1/system.d/
+  install -d "${pkgdir}"/etc/cupshelpers/
+  install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
 
-  install -d ${pkgdir}/lib/udev/rules.d
+  install -d "${pkgdir}"/lib/udev/rules.d
   install -m755 udev/{udev-add-printer,udev-configure-printer} \
-    ${pkgdir}/lib/udev/
+    "${pkgdir}"/lib/udev/
   install -m644 udev/70-printers.rules \
-    ${pkgdir}/lib/udev/rules.d
+    "${pkgdir}"/lib/udev/rules.d
 
   for file in build/lib/cupshelpers/*.py; do
     install -Dm644 $file \
-      ${pkgdir}/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
+      "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
   done
 }
 
@@ -81,11 +81,11 @@ package_system-config-printer-gnome() {
   depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify')
   optdependence=('gnome-keyring: password management')
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
+  cd "${srcdir}"/${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   # files provided by system-config-printer-common
-  cd ${pkgdir}/usr/share/${pkgbase}
+  cd "${pkgdir}"/usr/share/${pkgbase}
   rm config.py \
     debug.py \
     installpackage.py \
@@ -98,8 +98,8 @@ package_system-config-printer-gnome() {
     statereason.py \
     XmlHelper.py \
     pysmb.py
-  rm -r ${pkgdir}/etc/dbus-1/
-  rm -r ${pkgdir}/etc/cupshelpers/
-  rm -r ${pkgdir}/etc/udev/
-  rm -r ${pkgdir}/usr/lib/
+  rm -r "${pkgdir}"/etc/dbus-1/
+  rm -r "${pkgdir}"/etc/cupshelpers/
+  rm -r "${pkgdir}"/etc/udev/
+  rm -r "${pkgdir}"/usr/lib/
 }