[Pkg-fglrx-devel] r1027 - fglrx-driver/branches/experimental/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-08-06 15:17:51 +0000 (Mon, 06 Aug 2012)
New Revision: 1027

Removed:
   fglrx-driver/branches/experimental/debian/fglrx-driver.modprobe
Modified:
   fglrx-driver/branches/experimental/debian/changelog
   fglrx-driver/branches/experimental/debian/control
   fglrx-driver/branches/experimental/debian/fglrx-driver.maintscript
Log:
let fglrx-alternative-fglrx handle the radeon blacklist

Modified: fglrx-driver/branches/experimental/debian/changelog
===================================================================
--- fglrx-driver/branches/experimental/debian/changelog	2012-08-06 15:06:21 UTC (rev 1026)
+++ fglrx-driver/branches/experimental/debian/changelog	2012-08-06 15:17:51 UTC (rev 1027)
@@ -1,4 +1,4 @@
-fglrx-driver (1:12-6+point-2) UNRELEASED; urgency=low
+fglrx-driver (1:12-6+point-1+exp1) UNRELEASED; urgency=low
 
   * fglrx-driver.postrm: Do not fail if the debconf templates are not
     available (i.e. if the package is unconfigured).
@@ -7,6 +7,9 @@
   * Temporarily mark templates as untranslatable and drop translations.
   * Mention the availability of fglrx-legacy-driver (most probably via
     wheezy-backports).
+  * The radeon backlisting is now handled by fglrx-alternative-fglrx.
+  * Bump fglrx-alternative-fglrx dependecy accordingly and remove
+    /etc/modprobe.d/fglrx-driver.conf.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Wed, 01 Aug 2012 20:44:03 +0200
 

Modified: fglrx-driver/branches/experimental/debian/control
===================================================================
--- fglrx-driver/branches/experimental/debian/control	2012-08-06 15:06:21 UTC (rev 1026)
+++ fglrx-driver/branches/experimental/debian/control	2012-08-06 15:17:51 UTC (rev 1027)
@@ -40,7 +40,7 @@
  lib${fglrx} (= ${binary:Version}),
  ${fglrx:XorgDepends},
  xserver-xorg-core,
- glx-alternative-fglrx (>= 0.2),
+ glx-alternative-fglrx (>= 0.2.90),
 Recommends:
  ${fglrx}-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:Version},
  libgl1-${fglrx}-glx (= ${binary:Version}),
@@ -178,7 +178,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  lib${fglrx} (= ${binary:Version}),
- glx-alternative-fglrx (>= 0.2),
+ glx-alternative-fglrx (>= 0.2.90),
 Provides:
  libgl1-fglrx-glx-virtual,
  libgl1-${fglrx}-glx-i386 [i386],

Modified: fglrx-driver/branches/experimental/debian/fglrx-driver.maintscript
===================================================================
--- fglrx-driver/branches/experimental/debian/fglrx-driver.maintscript	2012-08-06 15:06:21 UTC (rev 1026)
+++ fglrx-driver/branches/experimental/debian/fglrx-driver.maintscript	2012-08-06 15:17:51 UTC (rev 1027)
@@ -2,3 +2,4 @@
 rm_conffile /etc/acpi/events/fglrx-ac	1:12-1-2~
 rm_conffile /etc/acpi/events/fglrx-lid	1:12-1-2~
 rm_conffile /etc/default/fglrx-driver	1:12-6-3~
+rm_conffile /etc/modprobe.d/fglrx-driver.conf	1:12-6+point-1+

Deleted: fglrx-driver/branches/experimental/debian/fglrx-driver.modprobe
===================================================================
--- fglrx-driver/branches/experimental/debian/fglrx-driver.modprobe	2012-08-06 15:06:21 UTC (rev 1026)
+++ fglrx-driver/branches/experimental/debian/fglrx-driver.modprobe	2012-08-06 15:17:51 UTC (rev 1027)
@@ -1,3 +0,0 @@
-# fglrx conflicts with the free radeon module.
-
-blacklist radeon