[Pkg-fglrx-devel] r963 - fglrx-driver/trunk/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-07-08 09:40:46 +0000 (Sun, 08 Jul 2012)
New Revision: 963

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
Log:
add more Provides/Conflicts/Replaces on new virtual packages

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-07-07 16:52:39 UTC (rev 962)
+++ fglrx-driver/trunk/debian/changelog	2012-07-08 09:40:46 UTC (rev 963)
@@ -2,6 +2,8 @@
 
   [ Andreas Beckmann ]
   * Fix encoding of cs.po from 2xUTF8 to UTF8.
+  * Prepare for co-existence of fglrx-legacy-driver:
+   - Add more Provides/Conflicts/Replaces on new virtual packages.
 
   [ Patrick Matthäi ]
   * Use again the signature file from fglrx itself. The imported one is only

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2012-07-07 16:52:39 UTC (rev 962)
+++ fglrx-driver/trunk/debian/control	2012-07-08 09:40:46 UTC (rev 963)
@@ -56,12 +56,14 @@
  xorg-driver-video,
  xserver-xorg-video-fglrx,
 Conflicts:
+ xserver-xorg-video-fglrx,
  ia32-fglrx-driver,
 Breaks:
  libgl1-fglrx-glx (<< ${binary:Version}),
  libgl1-fglrx-glx (>> ${binary:Version}),
  nvidia-glx (<< 275.09.07-3),
 Replaces:
+ xserver-xorg-video-fglrx,
  fglrx-glx (<< 1:11-7-4),
 Description: non-free ATI/AMD RadeonHD display driver
  FGLRX / AMD Catalyst is the non-free proprietary display driver for the
@@ -90,11 +92,15 @@
  ${misc:Depends},
 Recommends:
  libxvbaw1 (= ${binary:Version}),
+Provides:
+ libfglrx-virtual,
 Conflicts:
+ libfglrx-virtual,
  libfglrx-ia32 [i386],
 Breaks:
  fglrx-driver (<< 1:11-8-2),
 Replaces:
+ libfglrx-virtual,
  fglrx-driver (<< 1:11-8-2),
 Description: non-free ATI/AMD RadeonHD display driver (runtime libraries)
  FGLRX / AMD Catalyst is the non-free proprietary display driver for the
@@ -165,16 +171,19 @@
  ${shlibs:Depends},
  libfglrx (= ${binary:Version}),
  glx-alternative-fglrx (>= 0.2),
+Provides:
+ libgl1-fglrx-glx-virtual,
+ libgl1-fglrx-glx-i386 [i386],
 Conflicts:
+ libgl1-fglrx-glx-virtual,
  fglrx-glx-ia32 [i386],
 Breaks:
  fglrx-glx (<< 1:11-8-2),
  nvidia-glx (<< 275.09.07-3),
  libgl1-nvidia-glx (<< 275.09.07-3)
 Replaces:
+ libgl1-fglrx-glx-virtual,
  fglrx-glx (<< 1:11-8-2),
-Provides:
- libgl1-fglrx-glx-i386 [i386],
 Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver
  FGLRX / AMD Catalyst is the non-free proprietary display driver for the
  ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
@@ -241,9 +250,14 @@
 Suggests:
  fglrx-driver,
 Provides:
+ fglrx-kernel-dkms,
  fglrx-kernel-${fglrx:version},
+Conflicts:
+ fglrx-kernel-dkms,
 Breaks:
  make (= 3.82-1),
+Replaces:
+ fglrx-kernel-dkms,
 Description: dkms module source for the non-free ATI/AMD RadeonHD display driver
  FGLRX / AMD Catalyst is the non-free proprietary display driver for the
  ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
@@ -291,13 +305,14 @@
  ${shlibs:Depends},
  fglrx-driver,
 Provides:
- fglrx-control-qt3,
-Replaces:
- fglrx-control-qt3,
- fglrx-amdcccle,
+ fglrx-control-virtual,
 Conflicts:
+ fglrx-control-virtual,
  fglrx-control-qt3,
  fglrx-control-qt2,
+ fglrx-amdcccle,
+Replaces:
+ fglrx-control-virtual,
 Description: control panel for the non-free ATI/AMD RadeonHD display driver
  Control panel for the ATI/AMD RadeonHD and FireGL graphics cards.
  .
@@ -316,9 +331,14 @@
 Recommends:
  fglrx-driver (= ${binary:Version}),
  acpid,
+Provides:
+ fglrx-atieventsd-virtual,
+Conflicts:
+ fglrx-atieventsd-virtual,
 Breaks:
  fglrx-driver (<< 1:8-4-2),
 Replaces:
+ fglrx-atieventsd-virtual,
  fglrx-driver (<< 1:8-4-2),
 Description: external events daemon for the non-free ATI/AMD RadeonHD display driver
  FGLRX / AMD Catalyst is the non-free proprietary display driver for the
@@ -344,9 +364,13 @@
 Enhances:
  libopencl1,
 Provides:
+ amd-opencl-icd-virtual,
  opencl-icd,
 Conflicts:
+ amd-opencl-icd-virtual,
  amd-app,
+Replaces:
+ amd-opencl-icd-virtual,
 Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
 Description: AMD OpenCL ICD
  OpenCL (Open Computing Language) is a multivendor open standard for