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

[Patrick Matthäi]

Author: pmatthaei
Date: 2013-01-18 08:31:05 +0000 (Fri, 18 Jan 2013)
New Revision: 1154

Modified:
   fglrx-driver/branches/experimental/debian/changelog
   fglrx-driver/branches/experimental/debian/rules
   fglrx-driver/branches/experimental/debian/watch
Log:
* Adjust debian/rules and debian/watch to the new AMD driver name.


Modified: fglrx-driver/branches/experimental/debian/changelog
===================================================================
--- fglrx-driver/branches/experimental/debian/changelog	2013-01-18 08:29:25 UTC (rev 1153)
+++ fglrx-driver/branches/experimental/debian/changelog	2013-01-18 08:31:05 UTC (rev 1154)
@@ -2,6 +2,7 @@
 
   * 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.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 08 Jan 2013 19:06:51 +0100
 

Modified: fglrx-driver/branches/experimental/debian/rules
===================================================================
--- fglrx-driver/branches/experimental/debian/rules	2013-01-18 08:29:25 UTC (rev 1153)
+++ fglrx-driver/branches/experimental/debian/rules	2013-01-18 08:31:05 UTC (rev 1154)
@@ -191,9 +191,9 @@
 ############################################################################
 
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
-INSTALLER_PREFIX	?= amd-driver-installer
-INSTALLER		?= $(INSTALLER_PREFIX)-$(RUN_UPSTREAM_VERSION)-x86.x86_64.run
-INSTALLER_ZIP		?= $(INSTALLER_PREFIX)-$(ZIP_UPSTREAM_VERSION)-x86.x86_64.zip
+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)))

Modified: fglrx-driver/branches/experimental/debian/watch
===================================================================
--- fglrx-driver/branches/experimental/debian/watch	2013-01-18 08:29:25 UTC (rev 1153)
+++ fglrx-driver/branches/experimental/debian/watch	2013-01-18 08:31:05 UTC (rev 1154)
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/-beta/~beta/;s/-/./g" \
-http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx .*/amd-driver-installer-(?:catalyst-)?(.*)-x86.x86_64.(?:run|zip)
+http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx .*/amd-driver-installer-(?:catalyst-)?(.*).linux-x86.x86_64.(?:run|zip)