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

[Michael Gilbert]

Author: gilbert-guest
Date: 2011-08-04 06:01:41 +0000 (Thu, 04 Aug 2011)
New Revision: 650

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/rules
Log:
support multiple xorg abi's

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-04 06:01:35 UTC (rev 649)
+++ fglrx-driver/trunk/debian/changelog	2011-08-04 06:01:41 UTC (rev 650)
@@ -7,6 +7,8 @@
     to install it in all packages.
   * Redirect shlibs dependency of libGL.so.1 from fglrx-glx and fglrx-glx-ia32
     to libgl1-mesa-glx | libgl1 and ia32-libs.
+  * This driver works with multiple Xorg versions, therefore depend on
+    xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0.
 
   [ Michael Gilbert ]
   * Handle generated files more robustly.

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2011-08-04 06:01:35 UTC (rev 649)
+++ fglrx-driver/trunk/debian/control	2011-08-04 06:01:41 UTC (rev 650)
@@ -8,7 +8,6 @@
  debhelper (>= 8),
  bzip2,
  ia32-libs [amd64],
- xserver-xorg-dev,
  libxrandr2,
  libxext6,
  libgl1-mesa-glx,
@@ -31,7 +30,7 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- ${xviddriver:Depends},
+ xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0,
  glx-alternative-fglrx (>= 0.1.2)
 Recommends:
  fglrx-modules-dkms (= ${binary:Version}),

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-08-04 06:01:35 UTC (rev 649)
+++ fglrx-driver/trunk/debian/rules	2011-08-04 06:01:41 UTC (rev 650)
@@ -21,7 +21,6 @@
 endif
 
 generated=$(shell ls debian/*.in | sed s/\.in$$//g)
-xviddriver=$(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
 
 %: %.in
 	sed -e s/_VERSION_/$(upstream_version)/g -e s/_ARCH_/$(arch)/g -e s/_XPIC_/$(xpic)/g -e s/_LIB_/$(lib)/g < $< > $@
@@ -60,7 +59,6 @@
 	    debian/fglrx-glx/usr/lib/fglrx/libGL.so.1.2
 	test $(arch) != x86_64 || mv debian/fglrx-glx-ia32/usr/lib32/fglrx-libGL.so.1.2 \
 	    debian/fglrx-glx-ia32/usr/lib32/libGL.so.1.2
-	echo "xviddriver:Depends=$(xviddriver)" >> debian/fglrx-driver.substvars
 	dh_installdeb
 
 get-orig-source-checks: