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

[Andreas Beckmann]

Author: anbe
Date: 2014-10-21 12:09:44 +0000 (Tue, 21 Oct 2014)
New Revision: 1439

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/libfglrx.preinst
   fglrx-driver/trunk/debian/libfglrx.templates
Log:
use more debconf substitution variables

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2014-10-13 10:06:00 UTC (rev 1438)
+++ fglrx-driver/trunk/debian/changelog	2014-10-21 12:09:44 UTC (rev 1439)
@@ -3,6 +3,9 @@
   * amd-libopencl1: Fix symbols file.  (Closes: #763636)
   * amd-libopencl1: Remove obsolete shlibs file that prevented proper
     dependency generation for amd-clinfo.
+  * d/libfglrx.{preinst,templates}: Use more debconf substitution variables to
+    allow sharing the translations with nvidia-driver and easy switching to
+    different legacy drivers.
 
  -- Andreas Beckmann <anbe at debian.org>  Mon, 13 Oct 2014 02:18:50 +0200
 

Modified: fglrx-driver/trunk/debian/libfglrx.preinst
===================================================================
--- fglrx-driver/trunk/debian/libfglrx.preinst	2014-10-13 10:06:00 UTC (rev 1438)
+++ fglrx-driver/trunk/debian/libfglrx.preinst	2014-10-21 12:09:44 UTC (rev 1439)
@@ -3,7 +3,8 @@
 
 . /usr/share/debconf/confmodule
 
-UNSUPPORTED_PCIIDS="
+LEGACY_DRIVER="fglrx-legacy-driver"
+LEGACY_PCIIDS="
 10029400
 10029401
 10029402
@@ -149,7 +150,7 @@
 		| tr '[:lower:]' '[:upper:]' \
 		| while read dev id
 		do
-			for x in $UNSUPPORTED_PCIIDS
+			for x in $LEGACY_PCIIDS
 			do
 				if [ "$x" = "$id" ]; then
 					echo "$dev"
@@ -173,6 +174,11 @@
 
 	UNSUPPORTED="$(for dev in $UNSUPPORTED_DEVICES ; do lspci -nn -s "$dev" ; done)"
 
+	db_subst fglrx-driver/install-even-if-unsupported-gpu-exists vendor "Fglrx"
+	db_subst fglrx-driver/install-even-if-unsupported-gpu-exists driver "fglrx-driver"
+	db_subst fglrx-driver/install-even-if-unsupported-gpu-exists legacy_driver "$LEGACY_DRIVER"
+	db_subst fglrx-driver/install-even-if-unsupported-gpu-exists free_name "Radeon"
+	db_subst fglrx-driver/install-even-if-unsupported-gpu-exists free_driver "xserver-xorg-video-radeon"
 	db_subst fglrx-driver/install-even-if-unsupported-gpu-exists unsupported-device "$UNSUPPORTED"
 
 	# ensure the question is asked again unless it was accepted previously

Modified: fglrx-driver/trunk/debian/libfglrx.templates
===================================================================
--- fglrx-driver/trunk/debian/libfglrx.templates	2014-10-13 10:06:00 UTC (rev 1438)
+++ fglrx-driver/trunk/debian/libfglrx.templates	2014-10-21 12:09:44 UTC (rev 1439)
@@ -9,17 +9,22 @@
 Type: boolean
 Default: false
 #flag:translate!:3
-_Description: Install Fglrx driver despite unsupported graphics card?
- This system has a graphics card which is no longer handled by the Fglrx
- driver (package fglrx-driver). You may wish to keep the package installed -
+#flag:comment:1
+# Translators, do not translate the ${substitution} ${variables}.
+# ${vendor} will be substituted with 'NVIDIA' or 'Fglrx' (without quotes, of
+# course), ${free_name} will become 'Nouveau' or 'Radeon' (no quotes, again)
+# and the ${*driver} variables will be replaced with package names.
+_Description: Install ${vendor} driver despite unsupported graphics card?
+ This system has a graphics card which is no longer handled by the ${vendor}
+ driver (package ${driver}). You may wish to keep the package installed -
  for instance to drive some other card - but the card with the following
  chipset won't be usable:
  .
  ${unsupported-device}
  .
- The above card requires either the non-free legacy Fglrx driver
- (package fglrx-legacy-driver) or the free Radeon driver
- (package xserver-xorg-video-radeon).
+ The above card requires either the non-free legacy ${vendor} driver
+ (package ${legacy_driver}) or the free ${free_name} driver
+ (package ${free_driver}).
  .
- Before the Radeon driver can be used you must
- remove Fglrx configuration from xorg.conf (and xorg.conf.d/).
+ Before the ${free_name} driver can be used you must
+ remove ${vendor} configuration from xorg.conf (and xorg.conf.d/).