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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-07-09 21:16:57 +0000 (Mon, 09 Jul 2012)
New Revision: 975

Modified:
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/rules
   fglrx-driver/trunk/debian/rules.defs
Log:
set supported xorg-video-abi-* in rules.defs

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2012-07-09 14:03:39 UTC (rev 974)
+++ fglrx-driver/trunk/debian/control	2012-07-09 21:16:57 UTC (rev 975)
@@ -39,7 +39,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  lib${fglrx} (= ${binary:Version}),
- xorg-video-abi-12 | xorg-video-abi-11 | xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0,
+ ${fglrx:XorgDepends},
  xserver-xorg-core,
  glx-alternative-fglrx (>= 0.2),
 Recommends:

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2012-07-09 14:03:39 UTC (rev 974)
+++ fglrx-driver/trunk/debian/rules	2012-07-09 21:16:57 UTC (rev 975)
@@ -13,6 +13,7 @@
 variant			?=
 variant_desc_suffix	?=
 fglrx			?= fglrx$(variant)
+XORG_ABI_LIST		?=
 
 ifeq ($(DEB_HOST_ARCH),amd64)
 arch=x86_64
@@ -27,6 +28,7 @@
 endif
 
 libdir		 = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
+xorg_depends	 = $(foreach abi, $(XORG_ABI_LIST), xorg-video-abi-$(abi) |)
 
 CONTROL_PREFIXES = fglrx libfglrx libgl1-fglrx amd-opencl-icd
 ALL_CONTROL	:= $(wildcard $(patsubst %,debian/%*,$(CONTROL_PREFIXES)))
@@ -164,6 +166,7 @@
 override_dh_gencontrol:
 	dh_gencontrol -- \
 		-V'fglrx=$(fglrx)' \
+		-V'fglrx:XorgDepends=$(xorg_depends)' \
 		-V'fglrx:Version=$(subst ~,-,$(upstream_version))' \
 		-V'fglrx:Variant=$(variant)' \
 		-V'fglrx:VariantDescSuffix=$(variant_desc_suffix)' \

Modified: fglrx-driver/trunk/debian/rules.defs
===================================================================
--- fglrx-driver/trunk/debian/rules.defs	2012-07-09 14:03:39 UTC (rev 974)
+++ fglrx-driver/trunk/debian/rules.defs	2012-07-09 21:16:57 UTC (rev 975)
@@ -1 +1,2 @@
 MULTIARCH		 = yes
+XORG_ABI_LIST		 = 12 11 10 8 6.0