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

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

Author: anbe-guest
Date: Thu Jun 24 13:00:05 2010
New Revision: 1145

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1145
Log:
* Introduce virtual package nvidia-glx, add Provides/Conflicts: nvidia-glx
  to nvidia-glx, so that the legacy packages can do the same and we can stop
  listing each variant we have in Conflicts and Recommends lists.
  Same for nvidia-libgl1 and nvidia-glx-ia32.

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=1145&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Thu Jun 24 13:00:05 2010
@@ -9,6 +9,10 @@
   * Split the nvidia-glx package, move the runtime libraries to nvidia-libgl1.
     (Closes: #369316)
   * Let nvidia-libgl1 provide libgl1.  (Closes: #389971)
+  * Introduce virtual package nvidia-glx, add Provides/Conflicts: nvidia-glx
+    to nvidia-glx, so that the legacy packages can do the same and we can stop
+    listing each variant we have in Conflicts and Recommends lists.
+    Same for nvidia-libgl1 and nvidia-glx-ia32.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Wed, 23 Jun 2010 08:33:44 +0200
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=1145&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Thu Jun 24 13:00:05 2010
@@ -16,7 +16,8 @@
 Package: nvidia-glx
 Architecture: i386 amd64
 Pre-Depends: dpkg (>= 1.15.7.2)
-Depends: nvidia-libgl1${nvidia:Legacy},
+Depends:
+ nvidia-libgl1${nvidia:Legacy} (= ${binary:Version}),
  nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
  ${shlibs:Depends}, ${misc:Depends}
 Recommends: nvidia-vdpau-driver (>= ${nvidia:Version})
@@ -24,8 +25,11 @@
  nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
  | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Breaks: xserver-xorg-core (<< 2:1.6)
-Provides: xserver-xorg-video-6
+Provides:
+ xserver-xorg-video-6,
+ nvidia-glx,
 Conflicts:
+ nvidia-glx,
  nvidia-glx-legacy,
  nvidia-glx-legacy-71xx,
  nvidia-glx-legacy-96xx,
@@ -57,7 +61,10 @@
 Suggests: nvidia-settings,
  nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
  | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
+Provides:
+ nvidia-glx-ia32,
 Conflicts:
+ nvidia-glx-ia32,
  nvidia-glx-legacy-ia32,
  nvidia-glx-legacy-71xx-ia32,
  nvidia-glx-legacy-96xx-ia32,
@@ -98,19 +105,20 @@
 
 Package: nvidia-libgl1
 Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
+Depends:
+ ${shlibs:Depends}, ${misc:Depends}
+Recommends:
+ nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
 Suggests:
  nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
  | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
-Provides: libgl1
+Provides:
+ libgl1,
+ nvidia-libgl1,
 Conflicts:
- nvidia-glx-legacy,
- nvidia-glx-legacy-71xx,
- nvidia-glx-legacy-96xx,
- nvidia-glx-legacy-173xx,
+ nvidia-libgl1,
  fglrx-glx,
-Replaces: nvidia-glx (<< 195.36.31)
+Replaces: nvidia-glx${nvidia:Legacy} (<< 195.36.31)
 Description: NVIDIA binary OpenGL libraries${nvidia:LegacyDesc}
  These binary drivers provide optimized hardware acceleration of
  OpenGL applications via a direct-rendering X Server.