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

[Jan de Groot]

    Date: Saturday, October 11, 2008 @ 17:50:59
  Author: jgc
Revision: 14996

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

........
  r14995 | jgc | 2008-10-11 23:50:39 +0200 (Sat, 11 Oct 2008) | 2 lines
  
  upgpkg: dbus-core 1.2.3-1
      Add conflict to old dbus package
........

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

----------+
 PKGBUILD |    1 +
 1 file changed, 1 insertion(+)


Property changes on: dbus-core/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /dbus-core/trunk:1-14992
   + /dbus-core/trunk:1-14995

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-10-11 21:50:39 UTC (rev 14995)
+++ testing-i686/PKGBUILD	2008-10-11 21:50:59 UTC (rev 14996)
@@ -10,6 +10,7 @@
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 depends=('expat>=2.0')
+conflicts=('dbus<1.2.3-2')
 options=(!libtool)
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz