[Pkg-kde-commits] rev 1140 - branches/kde-3.4.0/packages/kdebase/debian

[Pierre Habouzit]

Author: madcoder-guest
Date: 2005-05-25 16:41:14 +0000 (Wed, 25 May 2005)
New Revision: 1140

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/control
Log:
build conflicts against nvidia-glx

Modified: branches/kde-3.4.0/packages/kdebase/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/control	2005-05-25 16:27:19 UTC (rev 1139)
+++ branches/kde-3.4.0/packages/kdebase/debian/control	2005-05-25 16:41:14 UTC (rev 1140)
@@ -5,6 +5,7 @@
 Uploaders: Isaac Clerencia <isaac@debian.org>, Pierre Habouzit <madcoder@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>, Adeodato Simó <asp16@alu.ua.es>, Riku Voipio <riku.voipio@iki.fi>
 Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.1), dbus-qt-1-dev, libldap2-dev, libhal-dev, libhal-storage-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, xutils, xlibs-static-pic, sharutils, texinfo
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
+Build-Conflicts: nvidia-glx
 Standards-Version: 3.6.1
 
 Package: kdebase