[arch-commits] Commit in dbus/repos (testing-i686 testing-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, October 12, 2008 @ 06:19:55
  Author: jgc
Revision: 15024

Merged revisions 15023 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/dbus/trunk

........
  r15023 | jgc | 2008-10-12 12:19:38 +0200 (Sun, 12 Oct 2008) | 2 lines
  
  upgpkg: dbus 1.2.3-3
      Fix file conflict
........

Modified:
  dbus/repos/testing-i686/	(properties)
  dbus/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Property changes on: dbus/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /dbus/trunk:1-15008
   + /dbus/trunk:1-15023

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-10-12 10:19:38 UTC (rev 15023)
+++ testing-i686/PKGBUILD	2008-10-12 10:19:55 UTC (rev 15024)
@@ -4,7 +4,7 @@
 #
 pkgname=dbus
 pkgver=1.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
@@ -32,6 +32,6 @@
   install -m755 -d ${pkgdir}/etc/X11/xinit/xinitrc.d
   install -m755 ${srcdir}/30-dbus ${pkgdir}/etc/X11/xinit/xinitrc.d/ || return 1
 
-  install -d -m755 ${startdir}/pkg/usr/share/licenses || return 1
-  ln -sf dbus-core ${pkgdir}/usr/share/licenses/dbus || return 1
+  install -d -m755 ${startdir}/pkg/usr/share/licenses/dbus
+  install -m644 ../COPYING ${pkgdir}/usr/share/licenses/dbus/ || return 1
 }