[Pkg-fglrx-devel] r1173 - in fglrx-legacy-driver/trunk/debian: . patches

Andreas Beckmann anbe at alioth.debian.org
Sun Feb 3 16:31:36 UTC 2013


Author: anbe
Date: 2013-02-03 16:31:36 +0000 (Sun, 03 Feb 2013)
New Revision: 1173

Added:
   fglrx-legacy-driver/trunk/debian/patches/04-linux-3.7.diff
   fglrx-legacy-driver/trunk/debian/patches/05-linux-3.8.diff
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/copyright
   fglrx-legacy-driver/trunk/debian/fglrx-control.install.in
   fglrx-legacy-driver/trunk/debian/fglrx-driver.templates
   fglrx-legacy-driver/trunk/debian/patches/series
   fglrx-legacy-driver/trunk/debian/rules
   fglrx-legacy-driver/trunk/debian/rules.defs
   fglrx-legacy-driver/trunk/debian/watch
Log:
merge fglrx-driver/branches/experimental up to r1172 (excluding translations)

Modified: fglrx-legacy-driver/trunk/debian/README.Debian
===================================================================
--- fglrx-legacy-driver/trunk/debian/README.Debian	2013-02-03 15:36:55 UTC (rev 1172)
+++ fglrx-legacy-driver/trunk/debian/README.Debian	2013-02-03 16:31:36 UTC (rev 1173)
@@ -10,7 +10,11 @@
 Please include a link to such an upstream bug report when filing the
 problem in your Linux distribution's bug tracking system.
 
+As of January 2013 there is also a new Support Ticket Process by AMD:
 
+    http://support.amd.com/us/kbarticles/Pages/ticketprocess.aspx
+
+
 This driver will replace parts of your X11/Mesa system:
 =======================================================
 If you encounter problems with the proprietary fglrx driver and want to

Modified: fglrx-legacy-driver/trunk/debian/changelog
===================================================================
--- fglrx-legacy-driver/trunk/debian/changelog	2013-02-03 15:36:55 UTC (rev 1172)
+++ fglrx-legacy-driver/trunk/debian/changelog	2013-02-03 16:31:36 UTC (rev 1173)
@@ -49,6 +49,80 @@
 
  -- Andreas Beckmann <debian at abeckmann.de>  Thu, 02 Aug 2012 15:01:37 +0200
 
+fglrx-driver (1:13.1-3) UNRELEASED; urgency=low
+
+  * Add new atigetsysteminfo.sh script.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 03 Feb 2013 10:07:12 +0100
+
+fglrx-driver (1:13.1-2) experimental; urgency=low
+
+  [ Patrick Matthäi ]
+  * Add Ubuntu patch 05-linux-3.8 to add Linux 3.8 support.
+
+  [ Andreas Beckmann ]
+  * Update my email address.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 01 Feb 2013 14:08:41 +0100
+
+fglrx-driver (1:13.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Add patch 04-linux-3.7 from Oxan van Leeuwen to fix a FTBFS with Linux 3.7.
+    Closes: #697439
+  * Adjust debian/rules and debian/watch to the new AMD driver name.
+  * Do not recommend opencl-icd package.
+    Closes: #695884
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 18 Jan 2013 09:35:11 +0100
+
+fglrx-driver (1:12.11~beta11-1) experimental; urgency=low
+
+  * New upstream beta release.
+    - Import /etc/ati/signature from 12.10 for this beta release.
+  * Do not wrap first uploaders line, dch will think it is an NMU.
+  * Adjust amd-opencl-icd lintian overrides. Some spelling errors have been
+    fixed.
+  * Remove DM-Upload-Allowed control field, it is obsolete.
+  * Bump Standards-Version to 3.9.4 (no changes needed).
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 04 Jan 2013 21:19:47 +0100
+
+fglrx-driver (1:12.10-1) experimental; urgency=low
+
+  * New upstream release 12-10 (2012-10-22) (9.002).
+  * debian/watch, debian/rules: Adjust for new upstream release naming scheme.
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Fri, 26 Oct 2012 12:38:15 +0200
+
+fglrx-driver (1:12.9~beta-1) experimental; urgency=low
+
+  * New upstream beta 12-9 (2012-09-26) (9.00).
+  * debian/watch, debian/rules: Mangle upstream version to substitute dash
+    with point, changing the versioning scheme from YY-MM to YY.MM.
+  * Drop patch 01-fglrx_kernel_3.5.0, fixed upstream.
+  * Update lintian overrides for fixed and newly added misspellings.
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Fri, 12 Oct 2012 17:10:18 +0200
+
+fglrx-driver (1:12-8-1) experimental; urgency=low
+
+  * New upstream release 12-8 (2012-08-15) (8.982).
+  * Upload to experimental.
+  * The radeon backlisting is now handled by glx-alternative-fglrx.
+    - Bump glx-alternative-fglrx dependency accordingly.
+    - Remove obsolete conffile /etc/modprobe.d/fglrx-driver.conf.
+    - Purging fglrx-driver is no longer required for switching to Radeon.
+  * debian/watch: Mangle the version of upstream beta releases.
+  * debian/rules get-orig-source:
+    - Support "funny" upstream naming schemes by allowing RVER and ZVER
+      overrides for the version number used in the .run and .zip files.
+    - Download beta releases and mangle their version.
+    - Repack into .xz, about 24% size reduction over .bz2.
+  * Switch .deb compression to xz, saves 12 MB (27 %) on amd64.
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Fri, 12 Oct 2012 14:31:20 +0200
+
 fglrx-driver (1:12-6+point-3) unstable; urgency=low
 
   [ Debconf translations ]
@@ -194,7 +268,6 @@
     about all installed ICDs.  (Closes: #679025)
   * Work around debhelper bug #676168 and create shlibs.local on the fly.
 
-
  -- Michael Gilbert <mgilbert at debian.org>  Fri, 29 Jun 2012 13:49:27 -0400
 
 fglrx-driver (1:12-6~beta-1) unstable; urgency=low

Modified: fglrx-legacy-driver/trunk/debian/control
===================================================================
--- fglrx-legacy-driver/trunk/debian/control	2013-02-03 15:36:55 UTC (rev 1172)
+++ fglrx-legacy-driver/trunk/debian/control	2013-02-03 16:31:36 UTC (rev 1173)
@@ -2,11 +2,9 @@
 Section: non-free/x11
 Priority: extra
 Maintainer: Fglrx packaging team <pkg-fglrx-devel at lists.alioth.debian.org>
-Uploaders:
- Patrick Matthäi <pmatthaei at debian.org>,
+Uploaders: Patrick Matthäi <pmatthaei at debian.org>,
  Michael Gilbert <mgilbert at debian.org>,
- Andreas Beckmann <debian at abeckmann.de>,
-DM-Upload-Allowed: yes
+ Andreas Beckmann <anbe at debian.org>,
 Build-Depends:
  debhelper (>= 9),
  bzip2,
@@ -24,7 +22,7 @@
  rpl,
  dkms (>= 2.1.1.1),
  po-debconf,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 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
@@ -33,7 +31,7 @@
 Package: fglrx-legacy-driver
 Architecture: i386 amd64
 Pre-Depends:
- dpkg (>= 1.15.7.2),
+ dpkg (>= 1.15.7.2~),
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
@@ -86,6 +84,7 @@
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
+ dpkg (>= 1.15.7.2~)
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -117,6 +116,7 @@
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
+ dpkg (>= 1.15.7.2~)
 Depends:
  libgl1-${fglrx}-glx (= ${binary:Version}),
  ${shlibs:Depends},
@@ -147,6 +147,8 @@
 Package: libxvbaw-dev
 Section: non-free/libdevel
 Architecture:
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
 Depends:
  lib${fglrx}-amdxvba1 (= ${binary:Version}),
  ${misc:Depends},
@@ -172,11 +174,12 @@
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
+ dpkg (>= 1.15.7.2~),
 Depends:
  ${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],
@@ -202,6 +205,8 @@
 Package: fglrx-glx
 Section: non-free/oldlibs
 Architecture:
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
 Depends:
  libgl1-${fglrx}-glx,
  ${misc:Depends},
@@ -214,6 +219,7 @@
 Architecture:
 Pre-Depends:
  libc6-i386 (>= 2.9-18),
+ dpkg (>= 1.15.7.2~),
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
@@ -232,6 +238,7 @@
 Architecture:
 Pre-Depends:
  libc6-i386 (>= 2.9-18),
+ dpkg (>= 1.15.7.2~),
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -251,6 +258,8 @@
 Package: fglrx-legacy-modules-dkms
 Section: non-free/kernel
 Architecture: i386 amd64
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
 Depends:
  ${misc:Depends},
  dkms (>= 2.1),
@@ -281,6 +290,8 @@
 Package: fglrx-legacy-source
 Section: non-free/kernel
 Architecture: i386 amd64
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
 Depends:
  ${misc:Depends},
  debhelper (>= 8),
@@ -309,6 +320,8 @@
 
 Package: fglrx-legacy-control
 Architecture: i386 amd64
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
@@ -337,7 +350,7 @@
 Package: fglrx-legacy-atieventsd
 Architecture: i386 amd64
 Pre-Depends:
- dpkg (>= 1.15.7.2),
+ dpkg (>= 1.15.7.2~),
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
@@ -373,6 +386,7 @@
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
+ dpkg (>= 1.15.7.2~),
 Depends:
  libopencl1,
  ${shlibs:Depends},
@@ -405,12 +419,13 @@
 Architecture:
 Multi-Arch: same
 Pre-Depends:
- ${misc:Pre-Depends}
+ ${misc:Pre-Depends},
+ dpkg (>= 1.15.7.2~),
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Recommends:
- opencl-icd | amd-opencl-icd,
+ amd-opencl-icd,
 Provides:
  libopencl1,
 Conflicts:
@@ -433,6 +448,8 @@
 Package: amd-opencl-dev
 Architecture:
 Multi-Arch: same
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
 Depends:
  amd-libopencl1 | libopencl1,
  opencl-headers (>= 1.2),
@@ -450,11 +467,13 @@
 
 Package: amd-clinfo
 Architecture:
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Recommends:
- opencl-icd | amd-opencl-icd,
+ amd-opencl-icd,
 Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
 Description: AMD OpenCL info utility
  OpenCL (Open Computing Language) is a multivendor open standard for

Modified: fglrx-legacy-driver/trunk/debian/copyright
===================================================================
--- fglrx-legacy-driver/trunk/debian/copyright	2013-02-03 15:36:55 UTC (rev 1172)
+++ fglrx-legacy-driver/trunk/debian/copyright	2013-02-03 16:31:36 UTC (rev 1173)
@@ -206,7 +206,7 @@
            2008-2010 Bertrand Marc
            2009-2011 Patrick Matthäi <pmatthaei at debian.org>
            2009-2011 Michael Gilbert <michael.s.gilbert at gmail.com>
-           © 2011 Andreas Beckmann <debian at abeckmann.de>
+           © 2011-2013 Andreas Beckmann <anbe at debian.org>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

Modified: fglrx-legacy-driver/trunk/debian/fglrx-control.install.in
===================================================================
--- fglrx-legacy-driver/trunk/debian/fglrx-control.install.in	2013-02-03 15:36:55 UTC (rev 1172)
+++ fglrx-legacy-driver/trunk/debian/fglrx-control.install.in	2013-02-03 16:31:36 UTC (rev 1173)
@@ -1,3 +1,4 @@
 debian/amdcccle.desktop			usr/share/applications/
+common/usr/sbin/atigetsysteminfo.sh	usr/sbin/
 common/usr/share/icons/*		usr/share/icons/
 arch/_ARCH_/usr/X11R6/bin/amdcccle	usr/bin/

Modified: fglrx-legacy-driver/trunk/debian/fglrx-driver.templates
===================================================================
--- fglrx-legacy-driver/trunk/debian/fglrx-driver.templates	2013-02-03 15:36:55 UTC (rev 1172)
+++ fglrx-legacy-driver/trunk/debian/fglrx-driver.templates	2013-02-03 16:31:36 UTC (rev 1173)
@@ -24,6 +24,3 @@
  is disabled in the following config file(s):
  .
  ${config-files}
- .
- Note that switching to the free Radeon driver requires the fglrx-driver
- package to be purged (not just removed).

Copied: fglrx-legacy-driver/trunk/debian/patches/04-linux-3.7.diff (from rev 1172, fglrx-driver/branches/experimental/debian/patches/04-linux-3.7.diff)
===================================================================
--- fglrx-legacy-driver/trunk/debian/patches/04-linux-3.7.diff	                        (rev 0)
+++ fglrx-legacy-driver/trunk/debian/patches/04-linux-3.7.diff	2013-02-03 16:31:36 UTC (rev 1173)
@@ -0,0 +1,18 @@
+# Fix module FTBFS with Linux 3.7. Thanks to Oxan van Leeuwen for this patch.
+# Closes: #697439
+
+diff -Naur fglrx-driver-12.11~beta11.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-12.11~beta11/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-12.11~beta11.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-12-03 03:03:45.000000000 +0100
++++ fglrx-driver-12.11~beta11/common/lib/modules/fglrx/build_mod/firegl_public.c	2013-01-08 19:03:27.084640738 +0100
+@@ -203,6 +203,11 @@
+ #define VM_SHM 0
+ #endif
+ 
++// VM_RESERVED is replaced with VM_DONTEXPAND | VM_DONTDUMP in Linux 3.7+
++#ifndef VM_RESERVED
++#define VM_RESERVED (VM_DONTEXPAND | VM_DONTDUMP)
++#endif
++
+ #ifdef FGL_LINUX253P1_VMA_API
+ // Linux 2.5.3-pre1 and compatibles
+ #define FGL_VMA_API_TYPE        struct vm_area_struct *

Copied: fglrx-legacy-driver/trunk/debian/patches/05-linux-3.8.diff (from rev 1172, fglrx-driver/branches/experimental/debian/patches/05-linux-3.8.diff)
===================================================================
--- fglrx-legacy-driver/trunk/debian/patches/05-linux-3.8.diff	                        (rev 0)
+++ fglrx-legacy-driver/trunk/debian/patches/05-linux-3.8.diff	2013-02-03 16:31:36 UTC (rev 1173)
@@ -0,0 +1,16 @@
+# Patch from Alberto Milone <alberto.milone at canonical.com> to add Linux 3.8 support.
+
+diff -Naur fglrx-driver-13.1.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-13.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- fglrx-driver-13.1.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-01-15 16:42:53.000000000 +0100
++++ fglrx-driver-13.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-01-19 14:22:01.075952886 +0100
+@@ -775,7 +775,9 @@
+ unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
+ {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
+-    #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
++    #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
++        pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
++    #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
+         pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
+     #else 
+         pInfo->video_handle = pInfo->pcidev->dev.firmware_data;

Modified: fglrx-legacy-driver/trunk/debian/patches/series
===================================================================
--- fglrx-legacy-driver/trunk/debian/patches/series	2013-02-03 15:36:55 UTC (rev 1172)
+++ fglrx-legacy-driver/trunk/debian/patches/series	2013-02-03 16:31:36 UTC (rev 1173)
@@ -1,3 +1,5 @@
 01-fglrx_kernel_3.5.0.diff
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
+04-linux-3.7.diff
+05-linux-3.8.diff

Modified: fglrx-legacy-driver/trunk/debian/rules
===================================================================
--- fglrx-legacy-driver/trunk/debian/rules	2013-02-03 15:36:55 UTC (rev 1172)
+++ fglrx-legacy-driver/trunk/debian/rules	2013-02-03 16:31:36 UTC (rev 1173)
@@ -174,6 +174,9 @@
 		-Vfglrx:Info="`cat debian/control.info`" \
 		-Vfglrx:Models="`cat debian/control.models`"
 
+override_dh_builddeb:
+	        dh_builddeb -- -Zxz
+
 ############################################################################
 
 prepare-squeeze-backport:
@@ -188,17 +191,18 @@
 ############################################################################
 
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
-INSTALLER		?= amd-driver-installer-$(NEW_UPSTREAM_VERSION)-x86.x86_64.run
-INSTALLER_ZIP		?= $(INSTALLER:.run=.zip)
-URL_PATH		?= www2.ati.com/drivers/linux
+INSTALLER_PREFIX	?= amd-driver-installer-catalyst
+INSTALLER		?= $(INSTALLER_PREFIX)-$(RUN_UPSTREAM_VERSION)-linux-x86.x86_64.run
+INSTALLER_ZIP		?= $(INSTALLER_PREFIX)-$(ZIP_UPSTREAM_VERSION)-linux-x86.x86_64.zip
+URL_PATH		?= www2.ati.com/drivers/$(if $(findstring beta,$(NEW_UPSTREAM_VERSION)),beta,linux)
 CACHEDIR		?= /tmp
 NEW_UPSTREAM_VERSION	?= $(patsubst VER=%,%,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
+ZIP_UPSTREAM_VERSION	?= $(or $(patsubst ZVER=%,%,$(filter ZVER=%,$(DEB_BUILD_OPTIONS))),$(NEW_UPSTREAM_VERSION))
+RUN_UPSTREAM_VERSION	?= $(or $(patsubst RVER=%,%,$(filter RVER=%,$(DEB_BUILD_OPTIONS))),$(NEW_UPSTREAM_VERSION))
 INTERNAL_VERSION	:= $(shell test ! -s $(INSTALLER) || sh $(INSTALLER) --info | sed -n '/^Identification:/ s/[^0-9]*//p')
-REAL_UPSTREAM_VERSION	?= $(NEW_UPSTREAM_VERSION)
+REAL_UPSTREAM_VERSION	?= $(subst -,.,$(subst -beta,~beta,$(NEW_UPSTREAM_VERSION)))
 
 get-orig-source-checks:
-	# This target needs DEB_BUILD_OPTIONS to contain the version specification
-	# in the following form: VER=some.version.number
 	test -z "$(NEW_UPSTREAM_VERSION)" && echo "Version not defined" && exit 1 || true
 	test ! -e debian/rules && echo "Run this command from the root of the package" && exit 1 || true
 
@@ -212,7 +216,7 @@
 	[ ! -s $(CACHEDIR)/$(INSTALLER) ] || cp -a $(CACHEDIR)/$(INSTALLER) .
 	[ -s $(INSTALLER) ] || unzip $(CACHEDIR)/$(INSTALLER_ZIP)
 
-../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.bz2: $(INSTALLER) debian/rules
+../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz: $(INSTALLER) debian/rules
 	rm -fr $(packagename)-$(REAL_UPSTREAM_VERSION).orig
 	sh $(INSTALLER) --extract $(packagename)-$(REAL_UPSTREAM_VERSION).orig
 	@set -x ; \
@@ -224,10 +228,10 @@
 	    && chmod -R a-sx,u=rwX,go=rX . \
 	    && find . -type f \( -path '*/bin/*' -o -path '*/sbin/*' -o -name '*.sh' \) -exec chmod a+x {} +
 	# Create the tarball.
-	tar -cjf $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.bz2 \
+	tar -cJf $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz \
 	    --owner=root --group=src \
 	    $(packagename)-$(REAL_UPSTREAM_VERSION).orig
-	mv $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.bz2 ../
+	mv $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz ../
 	# Cleanup.
 	rm -fr $(packagename)-$(REAL_UPSTREAM_VERSION).orig
 
@@ -235,10 +239,12 @@
 	$(MAKE) -f debian/rules repack_upstream_archive
 	rm -f $(INSTALLER)
 
-repack_upstream_archive: ../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.bz2
+repack_upstream_archive: ../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz
 else
 get-orig-source:
 	# This target needs DEB_BUILD_OPTIONS to contain the version specification
 	# in the following form: VER=some.version.number
+	# In case AMD tried yet another funny naming scheme, ZVER and RVER can be
+	# used to override the version number for the .zip and .run files.
 endif
 .PHONY: get-orig-source repack_upstream_archive

Modified: fglrx-legacy-driver/trunk/debian/rules.defs
===================================================================
--- fglrx-legacy-driver/trunk/debian/rules.defs	2013-02-03 15:36:55 UTC (rev 1172)
+++ fglrx-legacy-driver/trunk/debian/rules.defs	2013-02-03 16:31:36 UTC (rev 1173)
@@ -2,6 +2,7 @@
 XORG_ABI_LIST		 = 12 11 10 8 6.0
 variant			 = -legacy
 variant_desc_suffix	 = $${Space}(legacy)
-INSTALLER		 = amd-driver-installer-catalyst-$(NEW_UPSTREAM_VERSION)-legacy-linux-x86.x86_64.run
+#INSTALLER		 = amd-driver-installer-catalyst-$(NEW_UPSTREAM_VERSION)-legacy-linux-x86.x86_64.run
+INSTALLER_PREFIX	 = amd-driver-installer-catalyst
 URL_PATH		 = www2.ati.com/drivers/legacy
 REAL_UPSTREAM_VERSION	 = $(INTERNAL_VERSION)

Modified: fglrx-legacy-driver/trunk/debian/watch
===================================================================
--- fglrx-legacy-driver/trunk/debian/watch	2013-02-03 15:36:55 UTC (rev 1172)
+++ fglrx-legacy-driver/trunk/debian/watch	2013-02-03 16:31:36 UTC (rev 1173)
@@ -1,3 +1,3 @@
 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)
+opts="uversionmangle=s/-beta/~beta/;s/-/./g" \
 http://support.amd.com/us/gpudownload/linux/legacy/Pages/legacy-radeon_linux.aspx .*/amd-driver-installer-(.*)-legacy-x86.x86_64.(?:run|zip)




More information about the Pkg-fglrx-devel mailing list