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

[Michael Gilbert]

Author: gilbert-guest
Date: 2011-08-04 06:00:47 +0000 (Thu, 04 Aug 2011)
New Revision: 643

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/rules
Log:
populate xorg dependency via substvars

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-04 06:00:39 UTC (rev 642)
+++ fglrx-driver/trunk/debian/changelog	2011-08-04 06:00:47 UTC (rev 643)
@@ -2,6 +2,8 @@
 
   * Further simplify build process simplifications.
   * Drop unneeded shlibs:Depends in fglrx-atieventsd.
+  * Use xorg substvar info to populate xserver dependency (this makes backports
+    a bit easier).
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sun, 31 Jul 2011 00:24:30 -0400
 

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2011-08-04 06:00:39 UTC (rev 642)
+++ fglrx-driver/trunk/debian/control	2011-08-04 06:00:47 UTC (rev 643)
@@ -37,7 +37,7 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- xorg-video-abi-10,
+ ${xviddriver:Depends},
  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:00:39 UTC (rev 642)
+++ fglrx-driver/trunk/debian/rules	2011-08-04 06:00:47 UTC (rev 643)
@@ -26,6 +26,7 @@
       debian/fglrx-control.install \
       debian/fglrx-modules-dkms.install \
       debian/fglrx-modules-dkms.lintian-overrides
+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 < $< > $@
@@ -51,6 +52,7 @@
 	    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::