[arch-commits] Commit in dbus/trunk (30-dbus PKGBUILD)

[Jan de Groot]

    Date: Tuesday, February 17, 2015 @ 10:15:02
  Author: jgc
Revision: 231647

upgpkg: dbus 1.8.16-2

Fix errors with strict shell options, rename 30-dbus to 30-dbus.sh (FS#41472)

Modified:
  dbus/trunk/30-dbus
  dbus/trunk/PKGBUILD

----------+
 30-dbus  |    2 +-
 PKGBUILD |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: 30-dbus
===================================================================
--- 30-dbus	2015-02-17 09:02:54 UTC (rev 231646)
+++ 30-dbus	2015-02-17 09:15:02 UTC (rev 231647)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 # launches a session dbus instance
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && type dbus-launch >/dev/null; then
+if [ -z "${DBUS_SESSION_BUS_ADDRESS-}" ] && type dbus-launch >/dev/null; then
   eval $(dbus-launch --sh-syntax --exit-with-session)
 fi

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-17 09:02:54 UTC (rev 231646)
+++ PKGBUILD	2015-02-17 09:15:02 UTC (rev 231647)
@@ -6,7 +6,7 @@
 pkgbase=dbus
 pkgname=('dbus' 'libdbus')
 pkgver=1.8.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@
         30-dbus)
 md5sums=('020824a38850501e7d6ba8307a7c5ac3'
          'SKIP'
-         '3314d727fa57fc443fce25b5cbeebbcc')
+         '6683a05bd749929ef9442816c22c3268')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie at collabora.co.uk>
 
 build() {
@@ -51,7 +51,7 @@
   rm -rf "${pkgdir}/var/run"
   rm -rf "${pkgdir}/usr/lib/pkgconfig"
 
-  install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus"
+  install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus.sh"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }