[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#688100: unblock: fglrx-driver/1:12-6+point-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package fglrx-driver

This update fixes some small issues (e.g. tightening dependencies) and is
primarily a documentation update that adds information about the 
fglrx-legacy-driver package which can be used for models no longer
supported by fglrx-driver.
The non-documentation changes have been applied to the
nvidia-graphics-drivers* packages (where appropriate), too.

fglrx-driver (1:12-6+point-2) unstable; urgency=low

  * fglrx-driver.postrm: Do not fail if the debconf templates are not
    available (i.e. if the package is unconfigured).
  * fglrx-source: Add Built-Using attribute to the generated module packages
    to record the exact versions of linux and fglrx-driver that were used
    during the build.
  * libgl1-fglrx-glx:i386: Add Breaks: ia32-libs (<< 20120701) because that is
    still shipping /usr/lib32/libGL.so.1 which gets no longer diverted away.
    (Closes: #683853)
  * fglrx-atieventsd: Add Depends: glx-alternative-fglrx to ensure the
    triggers are processed and the glx alternative is properly setup before
    the atieventsd is started.  (See: #684000)
  * Check for "UNSIGNED" in /etc/ati/signature during package build to
    prevent reappearence of bugs like #684702.
  * Update Homepage to point to AMD.
  * Update watch file.
  * README.Debian: Add link to unofficial bugzilla for upstream bug reports.
  * fglrx-driver.NEWS, libfglrx.templates: Mention the availability of
    fglrx-legacy-driver which supports the legacy Radeon HD 2000/3000/4000.
    This package is currently only in experimental but it will be provided in
    wheezy-backports, too.

 -- Andreas Beckmann <debian@abeckmann.de>  Wed, 19 Sep 2012 12:02:40 +0200

There will be translation updates later on (a call was just sent) which
will result in another upload and a new unblock request.

A debdiff --exclude '*.po*' is attached.


Andreas


unblock fglrx-driver/1:12-6+point-2
diffstat for fglrx-driver-12-6+point fglrx-driver-12-6+point

 README.Debian              |   14 ++++++++++++++
 changelog                  |   27 ++++++++++++++++++++++++++-
 control                    |    6 ++++--
 control.models             |    2 ++
 fglrx-driver.NEWS          |   22 +++++++++++++++++-----
 fglrx-driver.templates     |    4 ++--
 libfglrx.templates         |   26 ++++++++++++++++----------
 module/control.template.in |    3 +++
 module/rules.in            |    7 ++++++-
 rules                      |    1 +
 watch                      |    2 +-
 11 files changed, 92 insertions(+), 22 deletions(-)

diff -Nru --exclude '*.po*' fglrx-driver-12-6+point/debian/README.Debian fglrx-driver-12-6+point/debian/README.Debian
--- fglrx-driver-12-6+point/debian/README.Debian	2012-07-30 18:08:46.000000000 +0200
+++ fglrx-driver-12-6+point/debian/README.Debian	2012-09-19 12:06:50.000000000 +0200
@@ -1,3 +1,16 @@
+Upstream Bug Tracker:
+=====================
+
+The recommended way to report non-packaging problems (e.g. graphics
+distortions, unsupported graphics cards, crashes, ...) directly to AMD
+is to use the Unofficial AMD Linux Bugzilla at
+
+    http://ati.cchtml.com/
+
+Please include a link to such an upstream bug report when filing the
+problem in your Linux distribution's bug tracking system.
+
+
 This driver will replace parts of your X11/Mesa system:
 =======================================================
 If you encounter problems with the proprietary fglrx driver and want to
@@ -35,6 +48,7 @@
 It is possible to patch the module so that it builds on 64/32, but it fails
 to work *at all*. This has been acknowledged by AMD.
 
+
 Screen flickering with VariBright enabled:
 ==========================================
 fglrx contains a feature called "VariBright" which tries to automatically
diff -Nru --exclude '*.po*' fglrx-driver-12-6+point/debian/changelog fglrx-driver-12-6+point/debian/changelog
--- fglrx-driver-12-6+point/debian/changelog	2012-07-30 18:08:46.000000000 +0200
+++ fglrx-driver-12-6+point/debian/changelog	2012-09-19 12:06:50.000000000 +0200
@@ -1,8 +1,33 @@
+fglrx-driver (1:12-6+point-2) unstable; urgency=low
+
+  * fglrx-driver.postrm: Do not fail if the debconf templates are not
+    available (i.e. if the package is unconfigured).
+  * fglrx-source: Add Built-Using attribute to the generated module packages
+    to record the exact versions of linux and fglrx-driver that were used
+    during the build.
+  * libgl1-fglrx-glx:i386: Add Breaks: ia32-libs (<< 20120701) because that is
+    still shipping /usr/lib32/libGL.so.1 which gets no longer diverted away.
+    (Closes: #683853)
+  * fglrx-atieventsd: Add Depends: glx-alternative-fglrx to ensure the
+    triggers are processed and the glx alternative is properly setup before
+    the atieventsd is started.  (See: #684000)
+  * Check for "UNSIGNED" in /etc/ati/signature during package build to
+    prevent reappearence of bugs like #684702.
+  * Update Homepage to point to AMD.
+  * Update watch file.
+  * README.Debian: Add link to unofficial bugzilla for upstream bug reports.
+  * fglrx-driver.NEWS, libfglrx.templates: Mention the availability of
+    fglrx-legacy-driver which supports the legacy Radeon HD 2000/3000/4000.
+    This package is currently only in experimental but it will be provided in
+    wheezy-backports, too.
+
+ -- Andreas Beckmann <debian@abeckmann.de>  Wed, 19 Sep 2012 12:02:40 +0200
+
 fglrx-driver (1:12-6+point-1) unstable; urgency=low
 
   [ Debconf translations ]
   * Italian (it): Beatrice Torracca         (Closes: #682263)
-  * Japanese (ja): Kenshi Muto				(Closes: #683134)
+  * Japanese (ja): Kenshi Muto              (Closes: #683134)
 
   [ Patrick Matthäi ]
   * New upstream point release. AMD gave us the permission, to release this
diff -Nru --exclude '*.po*' fglrx-driver-12-6+point/debian/control fglrx-driver-12-6+point/debian/control
--- fglrx-driver-12-6+point/debian/control	2012-07-30 18:08:46.000000000 +0200
+++ fglrx-driver-12-6+point/debian/control	2012-09-19 12:06:50.000000000 +0200
@@ -28,7 +28,7 @@
 Vcs-Svn: svn://svn.debian.org/svn/pkg-fglrx/fglrx-driver/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-fglrx/fglrx-driver/trunk/
 XS-Autobuild: yes
-Homepage: http://ati.amd.com/support/drivers/linux/linux-radeon.html
+Homepage: http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx
 
 Package: fglrx-driver
 Architecture: i386 amd64
@@ -188,7 +188,8 @@
 Breaks:
  fglrx-glx (<< 1:11-8-2),
  nvidia-glx (<< 275.09.07-3),
- libgl1-nvidia-glx (<< 275.09.07-3)
+ libgl1-nvidia-glx (<< 275.09.07-3),
+ ia32-libs (<< 20120701) [i386],
 Replaces:
  libgl1-fglrx-glx-virtual,
  fglrx-glx (<< 1:11-8-2),
@@ -343,6 +344,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  lsb-base,
+ glx-alternative-fglrx,
 Recommends:
  ${fglrx}-driver (= ${binary:Version}),
  acpid,
diff -Nru --exclude '*.po*' fglrx-driver-12-6+point/debian/control.models fglrx-driver-12-6+point/debian/control.models
--- fglrx-driver-12-6+point/debian/control.models	2012-07-30 18:08:46.000000000 +0200
+++ fglrx-driver-12-6+point/debian/control.models	2012-09-19 12:06:50.000000000 +0200
@@ -1,2 +1,4 @@
 This driver release supports the following graphics adapter families:
 AMD Radeon HD 7000, AMD Radeon HD 6000, and AMD Radeon HD 5000.
+
+For older models try the fglrx-legacy-driver package.
diff -Nru --exclude '*.po*' fglrx-driver-12-6+point/debian/fglrx-driver.NEWS fglrx-driver-12-6+point/debian/fglrx-driver.NEWS
--- fglrx-driver-12-6+point/debian/fglrx-driver.NEWS	2012-07-30 18:08:46.000000000 +0200
+++ fglrx-driver-12-6+point/debian/fglrx-driver.NEWS	2012-09-19 12:06:50.000000000 +0200
@@ -1,10 +1,22 @@
-fglrx-driver (1:12-6-2) unstable; urgency=low
+fglrx-driver (1:12-6+point-2) unstable; urgency=low
 
-  Starting with the Catalyst 12.6 release, support for R6XX/R7XX based GPUs
-  has been dropped by AMD/ATI.  This includes any RadeonHD older than 5xxx,
+  Starting with the Catalyst 12.6 release, AMD/ATI has moved the support for
+  R6XX/R7XX based GPUs to a legacy driver.
+  This includes any RadeonHD older than 5xxx,
   e.g.  RadeonHD 2000
         RadeonHD 3000
         RadeonHD 4000
-  Please switch to the free radeon driver (xserver-xorg-video-radeon).
+  These graphics adapters are only supported by the fglrx-legacy-driver
+  package (which is currently only available in experimental and will be
+  made available via wheezy-backports), or the free Radeon driver
+  (xserver-xorg-video-radeon).
 
- -- Andreas Beckmann <debian@abeckmann.de>  Mon, 04 Jun 2012 10:39:13 +0200
+  Before the Radeon driver can be used you must remove Fglrx configuration
+  from /etc/X11/xorg.conf (and /etc/X11/xorg.conf.d/).
+  The Radeon driver should work without needing any specific xorg.conf
+  settings, having no xorg.conf at all should be fine.
+
+  Note that switching to the free Radeon driver requires the
+  fglrx-driver package to be purged (not just removed).
+
+ -- Andreas Beckmann <debian@abeckmann.de>  Wed, 19 Sep 2012 12:02:40 +0200
diff -Nru --exclude '*.po*' fglrx-driver-12-6+point/debian/fglrx-driver.templates fglrx-driver-12-6+point/debian/fglrx-driver.templates
--- fglrx-driver-12-6+point/debian/fglrx-driver.templates	2012-07-30 18:08:46.000000000 +0200
+++ fglrx-driver-12-6+point/debian/fglrx-driver.templates	2012-09-19 12:06:50.000000000 +0200
@@ -2,7 +2,7 @@
 Type: note
 _Description: Manual configuration required to enable fglrx driver
  The fglrx driver is not yet configured.
- Please consider /usr/bin/aticonfig to create a
+ Please consider using /usr/bin/aticonfig to create a
  working xorg.conf configuration.
  .
  For example, "sudo aticonfig --initial" should
@@ -12,7 +12,7 @@
 Type: boolean
 Default: true
 Description: for internal use
- Can be preseeded.  If set to false, does not warn about fglrx still being
+ Can be preseeded. If set to false, does not warn about fglrx still being
  enabled in xorg.conf(.d/) when removing the package.
 
 Template: fglrx-driver/removed-but-enabled-in-xorg-conf
diff -Nru --exclude '*.po*' fglrx-driver-12-6+point/debian/libfglrx.templates fglrx-driver-12-6+point/debian/libfglrx.templates
--- fglrx-driver-12-6+point/debian/libfglrx.templates	2012-07-30 18:08:46.000000000 +0200
+++ fglrx-driver-12-6+point/debian/libfglrx.templates	2012-09-19 12:06:50.000000000 +0200
@@ -2,23 +2,29 @@
 Type: boolean
 Default: true
 Description: for internal use
- Can be preseeded.  If set to false, disables the check for no longer
+ Can be preseeded. If set to false, disables the check for no longer
  supported GPUs based on R6XX/R7XX.
 
 Template: fglrx-driver/install-even-if-unsupported-gpu-exists
 Type: boolean
 Default: false
 #flag:translate!:3
-_Description: Install fglrx driver despite unsupported graphics card?
- The following graphics chipset found in your system is no longer handled
- by the fglrx driver:
+_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 -
+ for instance to drive some other card - but the card with the following
+ chipset won't be usable:
  .
  ${unsupported-device}
  .
- The above card requires the free Radeon driver in the package
- xserver-xorg-video-radeon. Before the Radeon driver can be used you must
- remove fglrx configuration from xorg.conf (and xorg.conf.d/) and purge
- (not just remove) the fglrx-driver package.
+ 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).
  .
- You may wish to keep fglrx (for instance to drive some other card), but
- the above card won't be usable.
+ The fglrx-legacy-driver package will be provided in wheezy-backports.
+ .
+ Before the Radeon driver can be used you must
+ remove Fglrx configuration from xorg.conf (and xorg.conf.d/).
+ .
+ Note that switching to the free Radeon driver requires the
+ fglrx-driver package to be purged (not just removed).
diff -Nru --exclude '*.po*' fglrx-driver-12-6+point/debian/module/control.template.in fglrx-driver-12-6+point/debian/module/control.template.in
--- fglrx-driver-12-6+point/debian/module/control.template.in	2012-07-30 18:08:46.000000000 +0200
+++ fglrx-driver-12-6+point/debian/module/control.template.in	2012-09-19 12:06:50.000000000 +0200
@@ -24,6 +24,9 @@
  fglrx-module-#KVERS#,
 Replaces:
  fglrx-module-#KVERS#,
+Built-Using:
+ ${built:using:kernel},
+ ${built:using:fglrx},
 Description: FGLRX binary kernel module for Linux #KVERS#
  FGLRX / AMD Catalyst is the non-free proprietary display driver for the
  ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
diff -Nru --exclude '*.po*' fglrx-driver-12-6+point/debian/module/rules.in fglrx-driver-12-6+point/debian/module/rules.in
--- fglrx-driver-12-6+point/debian/module/rules.in	2012-07-30 18:08:46.000000000 +0200
+++ fglrx-driver-12-6+point/debian/module/rules.in	2012-09-19 12:06:50.000000000 +0200
@@ -54,6 +54,8 @@
 	dh_prep
 	$(MAKE) -C $(KSRC) SUBDIRS=$(CURDIR) modules
 
+get_built_using	?= $(filter-out (=),$(shell dpkg-query -f='$${source:Package} (=$${source:Version})' -W $1))
+
 binary_modules: build
 	dh_testdir
 	dh_testroot
@@ -69,7 +71,10 @@
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_gencontrol -- -v$(PKG_VERSION) -V'fglrx:Version=$(subst ~,-,$(upstream_version))'
+	dh_gencontrol -- -v$(PKG_VERSION) \
+		-V'fglrx:Version=$(subst ~,-,$(upstream_version))' \
+		-V'built:using:kernel=$(call get_built_using,linux-headers-$(KVERS))' \
+		-V'built:using:fglrx=$(call get_built_using,_FGLRX_-source)'
 	dh_md5sums
 ifdef KPKG_DEST_DIR
 	dh_builddeb --destdir=$(KPKG_DEST_DIR)
diff -Nru --exclude '*.po*' fglrx-driver-12-6+point/debian/rules fglrx-driver-12-6+point/debian/rules
--- fglrx-driver-12-6+point/debian/rules	2012-07-30 18:08:46.000000000 +0200
+++ fglrx-driver-12-6+point/debian/rules	2012-09-19 12:06:50.000000000 +0200
@@ -123,6 +123,7 @@
 
 override_dh_install:
 	dh_install
+	! grep UNSIGNED debian/$(fglrx)-driver/etc/ati/signature
 	chrpath -d -k debian/$(fglrx)-control/usr/bin/amdcccle
 	test ! -f debian/libgl1-$(fglrx)-glx/$(libdir)/fglrx/fglrx-libGL.so.1.2 || \
 		rpl -e	'/usr/X11R6/lib/modules/dri\0' \
diff -Nru --exclude '*.po*' fglrx-driver-12-6+point/debian/watch fglrx-driver-12-6+point/debian/watch
--- fglrx-driver-12-6+point/debian/watch	2012-07-30 18:08:46.000000000 +0200
+++ fglrx-driver-12-6+point/debian/watch	2012-09-19 12:06:50.000000000 +0200
@@ -1,2 +1,2 @@
 version=3
-http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx?type=2.4.1&product=2.4.1.3.36&lang=English .*/amd-driver-installer-(.*)-x86.x86_64.(?:run|zip)
+http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx .*/amd-driver-installer-(.*)-x86.x86_64.(?:run|zip)

Reply to: