[Pkg-fglrx-devel] r757 - fglrx-driver/branches/multiarch/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-31 21:45:09 +0000 (Wed, 31 Aug 2011)
New Revision: 757

Modified:
   fglrx-driver/branches/multiarch/debian/control
   fglrx-driver/branches/multiarch/debian/rules
Log:
hardcode the multiarch breaks/replaces to (<< 1:11-8-2)

Modified: fglrx-driver/branches/multiarch/debian/control
===================================================================
--- fglrx-driver/branches/multiarch/debian/control	2011-08-31 21:42:14 UTC (rev 756)
+++ fglrx-driver/branches/multiarch/debian/control	2011-08-31 21:45:09 UTC (rev 757)
@@ -79,9 +79,9 @@
 Conflicts:
  libfglrx-ia32 [i386],
 Breaks:
- fglrx-driver (<< ${fglrx:multiarch}),
+ fglrx-driver (<< 1:11-8-2),
 Replaces:
- fglrx-driver (<< ${fglrx:multiarch}),
+ fglrx-driver (<< 1:11-8-2),
 Description: non-free ATI/AMD RadeonHD display driver (runtime libraries)
  Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
  .
@@ -97,9 +97,9 @@
  libfglrx (= ${binary:Version}),
  ${misc:Depends},
 Breaks:
- fglrx-driver (<< ${fglrx:multiarch}),
+ fglrx-driver (<< 1:11-8-2),
 Replaces:
- fglrx-driver (<< ${fglrx:multiarch}),
+ fglrx-driver (<< 1:11-8-2),
 Description: AMD XvBA (X-Video Bitstream Acceleration) development files
  X-Video Bitstream Acceleration (XvBA) is an arbitrary extension of the
  X video extension (Xv) for the X Window System on Linux
@@ -121,11 +121,11 @@
 Conflicts:
  fglrx-glx-ia32 [i386],
 Breaks:
- fglrx-glx (<< ${fglrx:multiarch}),
+ fglrx-glx (<< 1:11-8-2),
  nvidia-glx (<< 275.09.07-3),
  libgl1-nvidia-glx (<< 275.09.07-3)
 Replaces:
- fglrx-glx (<< ${fglrx:multiarch}),
+ fglrx-glx (<< 1:11-8-2),
 Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver
  Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
  .
@@ -173,9 +173,9 @@
  ${shlibs:Depends},
  ${misc:Depends},
 Breaks:
- fglrx-glx-ia32 (<< ${fglrx:multiarch}),
+ fglrx-glx-ia32 (<< 1:11-8-2),
 Replaces:
- fglrx-glx-ia32 (<< ${fglrx:multiarch}),
+ fglrx-glx-ia32 (<< 1:11-8-2),
 Description: non-free ATI/AMD RadeonHD display driver (32-bit runtime libraries)
  Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
  .

Modified: fglrx-driver/branches/multiarch/debian/rules
===================================================================
--- fglrx-driver/branches/multiarch/debian/rules	2011-08-31 21:42:14 UTC (rev 756)
+++ fglrx-driver/branches/multiarch/debian/rules	2011-08-31 21:45:09 UTC (rev 757)
@@ -80,10 +80,6 @@
 	    sed -i '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' \
 	    debian/fglrx-glx-ia32/DEBIAN/shlibs
 
-# temporary, hardcode the version in debian/control once this branch gets merged into trunk
-override_dh_gencontrol:
-	dh_gencontrol -- -V'fglrx:multiarch=1:11-8-2'
-
 ############################################################################
 
 prepare-squeeze-backport: