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

Mon Jul 9 14:03:39 UTC 2012

Author: anbe-guest
Date: 2012-07-09 14:03:39 +0000 (Mon, 09 Jul 2012)
New Revision: 974

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/fglrx-driver.install.in
   fglrx-driver/trunk/debian/rules
Log:
use 'variant' instead of 'legacy' to be more generic

Modified: fglrx-driver/trunk/debian/changelog
===================================================================

--- fglrx-driver/trunk/debian/changelog	2012-07-09 13:25:59 UTC (rev 973)
+++ fglrx-driver/trunk/debian/changelog	2012-07-09 14:03:39 UTC (rev 974)
@@ -2,14 +2,14 @@
 
   [ Andreas Beckmann ]
   * Fix encoding of cs.po from 2xUTF8 to UTF8.
-  * Prepare for co-existence of fglrx-legacy-driver:
+  * Prepare for co-existence with fglrx-{legacy,firepro}-driver variants:
     - Add more Provides/Conflicts/Replaces on new virtual packages.
     - Add support for variant specific settings in debian/rules.defs.
-    - Add support for on-the-fly renaming of debian/*{fglrx => fglrx-legacy}*.
+    - Add support for on-the-fly renaming of debian/*{fglrx => fglrx-$FOO}*.
     - Add information about supported models to the long descriptions.
-    - Add support for adding a legacy note to the short descriptions.
-    - Add ${fglrx} and ${fglrx:Legacy} substvars to simplify replacing the
-      'fglrx' part of package names with 'fglrx-legacy'.
+    - Add support for adding a variant note to the short descriptions.
+    - Add ${fglrx} and ${fglrx:Variant} substvars to simplify replacing the
+      'fglrx' part of package names with 'fglrx-$FOO'.
   * debian/rules get-orig-source:
     - Add support for zipped installers.
     - Add support for using the internal version as upstream version.

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2012-07-09 13:25:59 UTC (rev 973)
+++ fglrx-driver/trunk/debian/control	2012-07-09 14:03:39 UTC (rev 974)
@@ -51,7 +51,7 @@
 Suggests:
  ${fglrx}-control,
  xvba-va-driver,
- amd-opencl-icd${fglrx:Legacy},
+ amd-opencl-icd${fglrx:Variant},
 Provides:
  xorg-driver-video,
  xserver-xorg-video-fglrx,
@@ -65,7 +65,7 @@
 Replaces:
  xserver-xorg-video-fglrx,
  fglrx-glx (<< 1:11-7-4),
-Description: non-free ATI/AMD RadeonHD display driver${fglrx:LegacyDesc}
+Description: non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
  ${fglrx:Info}
  .
  .
@@ -104,7 +104,7 @@
 Replaces:
  libfglrx-virtual,
  fglrx-driver (<< 1:11-8-2),
-Description: non-free ATI/AMD RadeonHD display driver (runtime libraries)${fglrx:LegacyDesc}
+Description: non-free ATI/AMD RadeonHD display driver (runtime libraries)${fglrx:VariantDescSuffix}
  ${fglrx:Info}
  .
  .
@@ -130,7 +130,7 @@
 Replaces:
  fglrx-driver (<< 1:11-8-3~),
  libfglrx (<< 1:11-8-3~),
-Description: AMD XvBA (X-Video Bitstream Acceleration) runtime libraries${fglrx:LegacyDesc}
+Description: AMD XvBA (X-Video Bitstream Acceleration) runtime libraries${fglrx:VariantDescSuffix}
  X-Video Bitstream Acceleration (XvBA), designed by AMD for its (ATI) Radeon GPU
  and Fusion APU, is an arbitrary extension of the X video extension (Xv) for the
  X Window System on Linux operating-systems. XvBA API allows video programs to
@@ -152,7 +152,7 @@
  fglrx-driver (<< 1:11-8-2),
 Replaces:
  fglrx-driver (<< 1:11-8-2),
-Description: AMD XvBA (X-Video Bitstream Acceleration) development files${fglrx:LegacyDesc}
+Description: AMD XvBA (X-Video Bitstream Acceleration) development files${fglrx:VariantDescSuffix}
  X-Video Bitstream Acceleration (XvBA), designed by AMD for its (ATI) Radeon GPU
  and Fusion APU, is an arbitrary extension of the X video extension (Xv) for the
  X Window System on Linux operating-systems. XvBA API allows video programs to
@@ -188,7 +188,7 @@
 Replaces:
  libgl1-fglrx-glx-virtual,
  fglrx-glx (<< 1:11-8-2),
-Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver${fglrx:LegacyDesc}
+Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
  ${fglrx:Info}
  .
  .
@@ -218,7 +218,7 @@
 Conflicts:
  nvidia-glx-ia32,
  ia32-fglrx-glx,
-Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver (32-bit)${fglrx:LegacyDesc}
+Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver (32-bit)${fglrx:VariantDescSuffix}
  ${fglrx:Info}
  .
  .
@@ -239,7 +239,7 @@
  fglrx-glx-ia32 (<< 1:11-8-2),
 Replaces:
  fglrx-glx-ia32 (<< 1:11-8-2),
-Description: non-free ATI/AMD RadeonHD display driver (32-bit runtime libraries)${fglrx:LegacyDesc}
+Description: non-free ATI/AMD RadeonHD display driver (32-bit runtime libraries)${fglrx:VariantDescSuffix}
  ${fglrx:Info}
  .
  .
@@ -266,7 +266,7 @@
  make (= 3.82-1),
 Replaces:
  fglrx-kernel-dkms,
-Description: dkms module source for the non-free ATI/AMD RadeonHD display driver${fglrx:LegacyDesc}
+Description: dkms module source for the non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
  ${fglrx:Info}
  .
  .
@@ -295,7 +295,7 @@
  fglrx-kernel-src,
 Breaks:
  make (= 3.82-1),
-Description: kernel module source for the non-free ATI/AMD RadeonHD display driver${fglrx:LegacyDesc}
+Description: kernel module source for the non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
  ${fglrx:Info}
  .
  .
@@ -323,7 +323,7 @@
  fglrx-amdcccle,
 Replaces:
  fglrx-control-virtual,
-Description: control panel for the non-free ATI/AMD RadeonHD display driver${fglrx:LegacyDesc}
+Description: control panel for the non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
  ${fglrx:Info}
  .
  .
@@ -355,7 +355,7 @@
 Replaces:
  fglrx-atieventsd-virtual,
  fglrx-driver (<< 1:8-4-2),
-Description: external events daemon for the non-free ATI/AMD RadeonHD display driver${fglrx:LegacyDesc}
+Description: external events daemon for the non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
  ${fglrx:Info}
  .
  .
@@ -388,7 +388,7 @@
 Replaces:
  amd-opencl-icd-virtual,
 Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
-Description: AMD OpenCL ICD${fglrx:LegacyDesc}
+Description: AMD OpenCL ICD${fglrx:VariantDescSuffix}
  OpenCL (Open Computing Language) is a multivendor open standard for
  general-purpose parallel programming of heterogeneous systems that include
  CPUs, GPUs and other processors.

Modified: fglrx-driver/trunk/debian/fglrx-driver.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install.in	2012-07-09 13:25:59 UTC (rev 973)
+++ fglrx-driver/trunk/debian/fglrx-driver.install.in	2012-07-09 14:03:39 UTC (rev 974)
@@ -1,7 +1,7 @@
 common/etc/ati/signature					etc/ati/
 common/etc/ati/control						etc/ati/
 common/etc/ati/atiogl.xml					etc/ati/
-common/etc/ati/amdpcsdb.default				etc/ati/
+common/etc/ati/amdpcsdb.default					etc/ati/
 common/etc/ati/atiapfxx.blb					etc/ati/
 arch/_ARCH_/usr/X11R6/bin/aticonfig				usr/bin/
 arch/_ARCH_/usr/X11R6/bin/atiodcli				usr/bin/
@@ -12,6 +12,6 @@
 _XPIC_/usr/X11R6/_LIB_/modules/drivers/fglrx_drv.so		usr/lib/fglrx/
 _XPIC_/usr/X11R6/_LIB_/modules/extensions/fglrx/fglrx-libglx.so	usr/lib/fglrx/
 _XPIC_/usr/X11R6/_LIB_/modules/linux/*.so			usr/lib/xorg/modules/linux/
-_FGLRX_.ids						usr/share/fglrx/
+_FGLRX_.ids							usr/share/fglrx/
 debian/switchlibGL						usr/lib/fglrx/
 debian/switchlibglx						usr/lib/fglrx/

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2012-07-09 13:25:59 UTC (rev 973)
+++ fglrx-driver/trunk/debian/rules	2012-07-09 14:03:39 UTC (rev 974)
@@ -10,8 +10,9 @@
 
 include debian/rules.defs
 MULTIARCH		?=
-legacy		?=
-legacy_description	?=
+variant			?=
+variant_desc_suffix	?=
+fglrx			?= fglrx$(variant)
 
 ifeq ($(DEB_HOST_ARCH),amd64)
 arch=x86_64
@@ -25,17 +26,16 @@
 cap=AMDXvBAx86.cap
 endif
 
-fglrx		 = fglrx$(legacy)
 libdir		 = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
 
 CONTROL_PREFIXES = fglrx libfglrx libgl1-fglrx amd-opencl-icd
 ALL_CONTROL	:= $(wildcard $(patsubst %,debian/%*,$(CONTROL_PREFIXES)))
-LEGACY_CONTROL	:= $(wildcard $(patsubst %,debian/%$(legacy)*,$(CONTROL_PREFIXES)))
-RENAME_CONTROL	 = $(filter-out $(LEGACY_CONTROL),$(ALL_CONTROL))
+VARIANT_CONTROL	:= $(wildcard $(patsubst %,debian/%$(variant)*,$(CONTROL_PREFIXES)))
+RENAME_CONTROL	 = $(filter-out $(VARIANT_CONTROL),$(ALL_CONTROL))
 RENAMED_CONTROL	 = $(patsubst debian/fglrx%,debian/$(fglrx)%,\
 			$(patsubst debian/libfglrx%,debian/lib$(fglrx)%,\
 			$(patsubst debian/libgl1-fglrx%,debian/libgl1-$(fglrx)%,\
-			$(patsubst debian/amd-opencl-icd%,debian/amd-opencl-icd$(legacy)%,\
+			$(patsubst debian/amd-opencl-icd%,debian/amd-opencl-icd$(variant)%,\
 				$(RENAME_CONTROL)))))
 export DH_ALWAYS_EXCLUDE=.in
 TEMPLATES	:= $(wildcard debian/*.in debian/module/*.in)
@@ -49,7 +49,7 @@
 %: %.in debian/rules debian/rules.defs
 	sed -r -e 's%_VERSION_%$(upstream_version)%g' \
 	       -e 's%_FGLRX_%$(fglrx)%g' \
-	       -e 's%_LEGACY_%$(legacy)%g' \
+	       -e 's%_VARIANT_%$(variant)%g' \
 	       -e 's%_ARCH_%$(arch)%g' \
 	       -e 's%_XPIC_%$(xpic)%g' \
 	       -e 's%_LIB_%$(lib)%g' \
@@ -87,12 +87,12 @@
 debian/switchlibglx: debian/switchlibGL
 	ln $< $@
 
-# Renaming control files for legacy packaging
+# Renaming control files for packaging driver variants
 define rename-template
-$1$$(legacy)%: $1%
+$1$$(variant)%: $1%
 	cp -a $$< $$@
 endef
-ifneq (,$(legacy))
+ifneq (,$(variant))
 $(foreach p,$(CONTROL_PREFIXES),$(eval $(call rename-template,$p)))
 endif
 
@@ -133,8 +133,8 @@
 	rpl -e	'/usr/lib64/fglrx' \
 		'/usr/lib///fglrx' \
 		$(badlib64files)
-	test ! -f debian/libxvbaw$(legacy)1/$(libdir)/libAMDXvBA.so.1.0 || \
-		rpl -e 'libAMDXvBA.cap' '$(cap)' debian/libxvbaw$(legacy)1/$(libdir)/libAMDXvBA.so.1.0
+	test ! -f debian/libxvbaw1/$(libdir)/libAMDXvBA.so.1.0 || \
+		rpl -e 'libAMDXvBA.cap' '$(cap)' debian/libxvbaw1/$(libdir)/libAMDXvBA.so.1.0
 	chmod a+x debian/$(fglrx)-source/usr/src/modules/$(fglrx)/debian/rules
 	tar cfj debian/$(fglrx)-source/usr/src/$(fglrx).tar.bz2 \
 		--owner=root --group=src --remove-files \
@@ -165,8 +165,8 @@
 	dh_gencontrol -- \
 		-V'fglrx=$(fglrx)' \
 		-V'fglrx:Version=$(subst ~,-,$(upstream_version))' \
-		-V'fglrx:Legacy=$(legacy)' \
-		-V'fglrx:LegacyDesc=$(legacy_description)' \
+		-V'fglrx:Variant=$(variant)' \
+		-V'fglrx:VariantDescSuffix=$(variant_desc_suffix)' \
 		-Vfglrx:Info="`cat debian/control.info`" \
 		-Vfglrx:Models="`cat debian/control.models`"
 


