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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-07-08 21:11:31 +0000 (Sun, 08 Jul 2012)
New Revision: 968

Added:
   fglrx-driver/trunk/debian/control.models
Modified:
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/control.info
   fglrx-driver/trunk/debian/rules
Log:
separate fglrx:Info and fglrx:Models substvars, add empty paragraphs as workaround for #680871

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2012-07-08 13:47:25 UTC (rev 967)
+++ fglrx-driver/trunk/debian/control	2012-07-08 21:11:31 UTC (rev 968)
@@ -68,6 +68,9 @@
 Description: non-free ATI/AMD RadeonHD display driver
  ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  This package provides display drivers and hardware accelerated OpenGL
  for X.Org. For 3D acceleration to work, you will need to
  compile the fglrx kernel module for your kernel: see the fglrx-modules-dkms
@@ -103,6 +106,9 @@
 Description: non-free ATI/AMD RadeonHD display driver (runtime libraries)
  ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  This package contains the runtime libraries.
  The proprietary libGL library is shipped in the libgl1-fglrx-glx package.
 
@@ -183,6 +189,9 @@
 Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver
  ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  This package provides the proprietary libGL shipped by ATI/AMD.
 
 Package: fglrx-glx
@@ -210,6 +219,9 @@
 Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver (32-bit)
  ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  This package provides the proprietary 32-bit libGL shipped by ATI/AMD for
  emulated userspace on amd64.
 
@@ -228,6 +240,9 @@
 Description: non-free ATI/AMD RadeonHD display driver (32-bit runtime libraries)
  ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  This package contains the 32-bit runtime libraries.
  The proprietary libGL library is shipped in the fglrx-glx-ia32 package.
 
@@ -251,6 +266,9 @@
 Description: dkms module source for the non-free ATI/AMD RadeonHD display driver
  ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  This package provides the kernel build environment and the fglrx modules,
  which are necessary to have accelerated 3D support within the ATI/AMD
  proprietary display driver.
@@ -277,6 +295,9 @@
 Description: kernel module source for the non-free ATI/AMD RadeonHD display driver
  ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  This package provides the kernel build environment and the fglrx modules,
  which are necessary to have accelerated 3D support within the ATI/AMD
  proprietary display driver.
@@ -300,6 +321,11 @@
 Replaces:
  fglrx-control-virtual,
 Description: control panel for the non-free ATI/AMD RadeonHD display driver
+ ${fglrx:Info}
+ .
+ .
+ ${fglrx:Models}
+ .
  Control panel for the ATI/AMD RadeonHD and FireGL graphics cards.
  .
  The control panel shows detailed information on your display adapter
@@ -329,6 +355,9 @@
 Description: external events daemon for the non-free ATI/AMD RadeonHD display driver
  ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  The ATI External Events Daemon atieventsd is a user-level application
  that monitors various system events such as ACPI or hotplug, then
  notifies the driver via the X extensions interface that the event has
@@ -361,9 +390,12 @@
  general-purpose parallel programming of heterogeneous systems that include
  CPUs, GPUs and other processors.
  .
+ .
  This package provides the AMD installable client driver (ICD) for OpenCL
  which supports AMD GPUs (requires the fglrx driver) as well as CPUs (from
  any vendor, no driver required).
+ .
+ ${fglrx:Models}
 
 Package: amd-libopencl1
 Architecture: i386 amd64

Modified: fglrx-driver/trunk/debian/control.info
===================================================================
--- fglrx-driver/trunk/debian/control.info	2012-07-08 13:47:25 UTC (rev 967)
+++ fglrx-driver/trunk/debian/control.info	2012-07-08 21:11:31 UTC (rev 968)
@@ -1,6 +1,3 @@
 FGLRX / AMD Catalyst is the non-free proprietary display driver for the
 ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
 the newest free driver xserver-xorg-video-radeon.
-${Newline}
-This driver release supports the following graphics adapter families:
-AMD Radeon HD 7000, AMD Radeon HD 6000, and AMD Radeon HD 5000.

Added: fglrx-driver/trunk/debian/control.models
===================================================================
--- fglrx-driver/trunk/debian/control.models	                        (rev 0)
+++ fglrx-driver/trunk/debian/control.models	2012-07-08 21:11:31 UTC (rev 968)
@@ -0,0 +1,2 @@
+This driver release supports the following graphics adapter families:
+AMD Radeon HD 7000, AMD Radeon HD 6000, and AMD Radeon HD 5000.

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2012-07-08 13:47:25 UTC (rev 967)
+++ fglrx-driver/trunk/debian/rules	2012-07-08 21:11:31 UTC (rev 968)
@@ -155,7 +155,8 @@
 
 override_dh_gencontrol:
 	dh_gencontrol -- -V'fglrx:version=$(subst ~,-,$(upstream_version))' \
-		-Vfglrx:Info="`cat debian/control.info`"
+		-Vfglrx:Info="`cat debian/control.info`" \
+		-Vfglrx:Models="`cat debian/control.models`"
 
 ############################################################################