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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-10-26 09:17:38 +0000 (Fri, 26 Oct 2012)
New Revision: 1128

Modified:
   fglrx-driver/branches/experimental/debian/changelog
   fglrx-driver/branches/experimental/debian/rules
   fglrx-driver/branches/experimental/debian/rules.defs
   fglrx-driver/branches/experimental/debian/watch
Log:
upstream uses a new naming scheme ...

Modified: fglrx-driver/branches/experimental/debian/changelog
===================================================================
--- fglrx-driver/branches/experimental/debian/changelog	2012-10-26 09:14:59 UTC (rev 1127)
+++ fglrx-driver/branches/experimental/debian/changelog	2012-10-26 09:17:38 UTC (rev 1128)
@@ -1,6 +1,7 @@
 fglrx-driver (1:12.10-1) UNRELEASED; 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 10:56:05 +0200
 

Modified: fglrx-driver/branches/experimental/debian/rules
===================================================================
--- fglrx-driver/branches/experimental/debian/rules	2012-10-26 09:14:59 UTC (rev 1127)
+++ fglrx-driver/branches/experimental/debian/rules	2012-10-26 09:17:38 UTC (rev 1128)
@@ -191,8 +191,9 @@
 ############################################################################
 
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
-INSTALLER		?= amd-driver-installer-$(RUN_UPSTREAM_VERSION)-x86.x86_64.run
-INSTALLER_ZIP		?= amd-driver-installer-$(ZIP_UPSTREAM_VERSION)-x86.x86_64.zip
+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
 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/rules.defs
===================================================================
--- fglrx-driver/branches/experimental/debian/rules.defs	2012-10-26 09:14:59 UTC (rev 1127)
+++ fglrx-driver/branches/experimental/debian/rules.defs	2012-10-26 09:17:38 UTC (rev 1128)
@@ -1,2 +1,3 @@
 MULTIARCH		 = yes
 XORG_ABI_LIST		 = 12 11 10 8 6.0
+INSTALLER_PREFIX	 = amd-driver-installer-catalyst

Modified: fglrx-driver/branches/experimental/debian/watch
===================================================================
--- fglrx-driver/branches/experimental/debian/watch	2012-10-26 09:14:59 UTC (rev 1127)
+++ fglrx-driver/branches/experimental/debian/watch	2012-10-26 09:17:38 UTC (rev 1128)
@@ -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-(.*)-x86.x86_64.(?:run|zip)
+http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx .*/amd-driver-installer-(?:catalyst-)?(.*)-x86.x86_64.(?:run|zip)