[Pkg-fglrx-devel] r387 - in fglrx-driver/trunk/debian: . configuration

[Patrick Matthäi]

Author: pmatthaei
Date: 2010-03-21 21:15:41 +0000 (Sun, 21 Mar 2010)
New Revision: 387

Added:
   fglrx-driver/trunk/debian/configuration/
   fglrx-driver/trunk/debian/configuration/fglrx-driver.conf
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-driver.install
   fglrx-driver/trunk/debian/fglrx-driver.postrm
   fglrx-driver/trunk/debian/fglrx-driver.preinst
Log:
* Blacklist the radeon kernel module while fglrx is installed.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-03-21 21:11:35 UTC (rev 386)
+++ fglrx-driver/trunk/debian/changelog	2010-03-21 21:15:41 UTC (rev 387)
@@ -1,5 +1,6 @@
 fglrx-driver (1:10-3~prerelease-1) UNRELEASED; urgency=low
 
+  [ Michael Gilbert ]
   * New upstream pre-release (closes: #564444)
     - Upstream 8.721 pre-release tarball copied directly from Ubuntu, thanks!
     - Now supports xorg 7.5!
@@ -8,9 +9,11 @@
     keep up to date otherwise).
   * Use autogen to generate manpage build system.
     - Remove a lot of files that are automatically generated.
+
+  [ Patrick Matthäi ]
   * Blacklist the radeon kernel module while fglrx is installed.
 
- -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sun, 21 Mar 2010 14:49:38 -0400
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 21 Mar 2010 22:15:08 +0100
 
 fglrx-driver (1:10-2-2) unstable; urgency=low
 

Added: fglrx-driver/trunk/debian/configuration/fglrx-driver.conf
===================================================================
--- fglrx-driver/trunk/debian/configuration/fglrx-driver.conf	                        (rev 0)
+++ fglrx-driver/trunk/debian/configuration/fglrx-driver.conf	2010-03-21 21:15:41 UTC (rev 387)
@@ -0,0 +1,3 @@
+# fglrx conflicts with the free radeon module.
+
+blacklist radeon

Modified: fglrx-driver/trunk/debian/fglrx-driver.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install	2010-03-21 21:11:35 UTC (rev 386)
+++ fglrx-driver/trunk/debian/fglrx-driver.install	2010-03-21 21:15:41 UTC (rev 387)
@@ -5,3 +5,4 @@
 debian/acpi/*.sh etc/acpi/
 debian/acpi/events/fglrx-* etc/acpi/events/
 debian/reportbug/script usr/share/bug/fglrx-driver/
+debian/configuration/fglrx-driver.conf /etc/modprobe.d/

Modified: fglrx-driver/trunk/debian/fglrx-driver.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.postrm	2010-03-21 21:11:35 UTC (rev 386)
+++ fglrx-driver/trunk/debian/fglrx-driver.postrm	2010-03-21 21:15:41 UTC (rev 387)
@@ -25,9 +25,6 @@
     ;;
 
 	remove)
-                # remove radeon blacklist
-                rm -f /etc/modprobe.d/fglrx-driver.conf
-
 		if [ -f /usr/lib/fglrx/diversions/libdri.so ] ; then
 			dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libdri.so || true
 		fi

Modified: fglrx-driver/trunk/debian/fglrx-driver.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.preinst	2010-03-21 21:11:35 UTC (rev 386)
+++ fglrx-driver/trunk/debian/fglrx-driver.preinst	2010-03-21 21:15:41 UTC (rev 387)
@@ -27,10 +27,6 @@
 
 case "$1" in
     install|upgrade)
-
-        # blacklist radeon module
-        echo "blacklist radeon" > /etc/modprobe.d/fglrx-driver.conf
-
         if dpkg --compare-versions "$2" lt "8.30.3"; then
             prep_mv_conffile /etc/fglrxrc
             prep_mv_conffile /etc/fglrxprofiles.csv