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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-06 15:43:00 +0000 (Sat, 06 Aug 2011)
New Revision: 670

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-driver.postinst
Log:
Check for fglrx configuration in /etx/xorg.conf.d/, too, and don't print messages about missing files.

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-04 23:15:52 UTC (rev 669)
+++ fglrx-driver/trunk/debian/changelog	2011-08-06 15:43:00 UTC (rev 670)
@@ -7,6 +7,8 @@
     get-orig-source instructions.
   * Update debian/copyright from ATI_LICENSE.TXT: ATI => AMD, distribution of
     prebuilt modules is no longer permitted.
+  * Check for fglrx configuration in /etx/xorg.conf.d/, too, and don't print
+    messages about missing files.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Thu, 04 Aug 2011 23:42:27 +0200
 

Modified: fglrx-driver/trunk/debian/fglrx-driver.postinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.postinst	2011-08-04 23:15:52 UTC (rev 669)
+++ fglrx-driver/trunk/debian/fglrx-driver.postinst	2011-08-06 15:43:00 UTC (rev 670)
@@ -4,7 +4,7 @@
 
 case "$1" in
 	configure)
-		if ! grep -q fglrx /etc/X11/xorg.conf; then
+		if ! grep -q fglrx /etc/X11/xorg.conf /etc/X11/xorg.conf.d/*.conf 2>/dev/null; then
 			echo "**********************************************"
 			echo "NOTE: the fglrx driver is not yet configued."
 			echo "Please consider /usr/bin/aticonfig to create a"