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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-08 16:36:18 +0000 (Mon, 08 Aug 2011)
New Revision: 693

Added:
   fglrx-driver/trunk/debian/fglrx-driver.modprobe
Removed:
   fglrx-driver/trunk/debian/configuration/
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-driver.install.in
Log:
Let dh_installmodules handle the modprobe blacklist config.

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-08 16:12:32 UTC (rev 692)
+++ fglrx-driver/trunk/debian/changelog	2011-08-08 16:36:18 UTC (rev 693)
@@ -2,6 +2,7 @@
 
   [ Andreas Beckmann ]
   * Add more copyright statements and licenses to debian/copyright.
+  * Let dh_installmodules handle the modprobe blacklist config.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Mon, 08 Aug 2011 17:54:32 +0200
 

Modified: fglrx-driver/trunk/debian/fglrx-driver.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install.in	2011-08-08 16:12:32 UTC (rev 692)
+++ fglrx-driver/trunk/debian/fglrx-driver.install.in	2011-08-08 16:36:18 UTC (rev 693)
@@ -4,7 +4,6 @@
 common/etc/ati/amdpcsdb.default etc/ati/
 debian/acpi/*.sh etc/acpi/
 debian/acpi/events/fglrx-* etc/acpi/events/
-debian/configuration/fglrx-driver.conf etc/modprobe.d/
 debian/import/amdxvba.h usr/include/
 arch/_ARCH_/usr/X11R6/bin/aticonfig usr/bin
 arch/_ARCH_/usr/X11R6/bin/atiodcli usr/bin

Copied: fglrx-driver/trunk/debian/fglrx-driver.modprobe (from rev 692, fglrx-driver/trunk/debian/configuration/fglrx-driver.conf)
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.modprobe	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-driver.modprobe	2011-08-08 16:36:18 UTC (rev 693)
@@ -0,0 +1,3 @@
+# fglrx conflicts with the free radeon module.
+
+blacklist radeon