[pkg-nvidia-devel] r954 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog control

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Sat May 29 15:28:44 2010
New Revision: 954

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=954
Log:
add Conflicts: ccache (<< 3.0~) (closes: #582748)

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=954&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sat May 29 15:28:44 2010
@@ -13,6 +13,7 @@
   * debian/rules: use DEB_HOST_ARCH instead of DEB_BUILD_ARCH
   * bump nvidia-kernel-common versioned dependency to 20100522
   * debian/changelog: update packaging copyright, use gpl2+
+  * debian/control: add Conflicts: ccache (<< 3.0~) (closes: #582748)
 
  -- Russ Allbery <rra at debian.org>  Wed, 26 May 2010 07:19:43 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=954&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Sat May 29 15:28:44 2010
@@ -91,6 +91,7 @@
  nvidia-kernel-legacy-96xx-dkms,
  nvidia-kernel-legacy-173xx-dkms,
  binutils-gold (>> 2.20.51),
+ ccache (<< 3.0~),
 Description: NVIDIA binary kernel module DKMS source
  This package builds the NVIDIA Xorg binary kernel module needed by
  nvidia-glx, using DKMS.  Provided that you have the kernel header
@@ -115,6 +116,7 @@
  nvidia-glx (>= ${nvidia:Version}), nvidia-kernel-common
 Conflicts:
  binutils-gold (>> 2.20.51),
+ ccache (<< 3.0~),
 Description: NVIDIA binary kernel module source
  This package provides the source for the NVIDIA Xorg binary kernel module
  needed by nvidia-glx in a form suitable for use by module-assistant or