[Pkg-fglrx-devel] r1050 - in fglrx-legacy-driver/trunk/debian: . module

Mon Sep 10 13:34:29 UTC 2012

Author: anbe-guest
Date: 2012-09-10 13:34:29 +0000 (Mon, 10 Sep 2012)
New Revision: 1050

Modified:
   fglrx-legacy-driver/trunk/debian/README.Debian
   fglrx-legacy-driver/trunk/debian/changelog
   fglrx-legacy-driver/trunk/debian/control
   fglrx-legacy-driver/trunk/debian/module/control.template.in
   fglrx-legacy-driver/trunk/debian/module/rules.in
   fglrx-legacy-driver/trunk/debian/rules
Log:
merge fglrx-driver/trunk up to r1049

Modified: fglrx-legacy-driver/trunk/debian/README.Debian
===================================================================

--- fglrx-legacy-driver/trunk/debian/README.Debian	2012-09-10 13:28:07 UTC (rev 1049)
+++ fglrx-legacy-driver/trunk/debian/README.Debian	2012-09-10 13:34:29 UTC (rev 1050)
@@ -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

Modified: fglrx-legacy-driver/trunk/debian/changelog
===================================================================
--- fglrx-legacy-driver/trunk/debian/changelog	2012-09-10 13:28:07 UTC (rev 1049)
+++ fglrx-legacy-driver/trunk/debian/changelog	2012-09-10 13:34:29 UTC (rev 1050)
@@ -39,6 +39,22 @@
 
   * 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.
+  * README.Debian: Add link to unofficial bugzilla for upstream bug reports.
+  * fglrx-driver.NEWS: Mention the availability of fglrx-legacy-driver which
+    supports the legacy Radeon HD 2000/3000/4000 (currently only in
+    experimental but will be provided in wheezy-backports, too).
 
  -- Andreas Beckmann <debian at abeckmann.de>  Wed, 01 Aug 2012 20:44:03 +0200
 

Modified: fglrx-legacy-driver/trunk/debian/control
===================================================================
--- fglrx-legacy-driver/trunk/debian/control	2012-09-10 13:28:07 UTC (rev 1049)
+++ fglrx-legacy-driver/trunk/debian/control	2012-09-10 13:34:29 UTC (rev 1050)
@@ -28,7 +28,7 @@
 Vcs-Svn: svn://svn.debian.org/svn/pkg-fglrx/fglrx-legacy-driver/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-fglrx/fglrx-legacy-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-legacy-driver
 Architecture: i386 amd64
@@ -186,7 +186,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),
@@ -341,6 +342,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  lsb-base,
+ glx-alternative-fglrx,
 Recommends:
  ${fglrx}-driver (= ${binary:Version}),
  acpid,

Modified: fglrx-legacy-driver/trunk/debian/module/control.template.in
===================================================================
--- fglrx-legacy-driver/trunk/debian/module/control.template.in	2012-09-10 13:28:07 UTC (rev 1049)
+++ fglrx-legacy-driver/trunk/debian/module/control.template.in	2012-09-10 13:34:29 UTC (rev 1050)
@@ -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

Modified: fglrx-legacy-driver/trunk/debian/module/rules.in
===================================================================
--- fglrx-legacy-driver/trunk/debian/module/rules.in	2012-09-10 13:28:07 UTC (rev 1049)
+++ fglrx-legacy-driver/trunk/debian/module/rules.in	2012-09-10 13:34:29 UTC (rev 1050)
@@ -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)

Modified: fglrx-legacy-driver/trunk/debian/rules
===================================================================
--- fglrx-legacy-driver/trunk/debian/rules	2012-09-10 13:28:07 UTC (rev 1049)
+++ fglrx-legacy-driver/trunk/debian/rules	2012-09-10 13:34:29 UTC (rev 1050)
@@ -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' \


