[Pkg-fglrx-devel] r1176 - fglrx-legacy-driver/trunk/debian

[Andreas Beckmann]

Author: anbe
Date: 2013-02-03 17:12:10 +0000 (Sun, 03 Feb 2013)
New Revision: 1176

Modified:
   fglrx-legacy-driver/trunk/debian/changelog
   fglrx-legacy-driver/trunk/debian/rules
   fglrx-legacy-driver/trunk/debian/rules.defs
   fglrx-legacy-driver/trunk/debian/watch
Log:
adjust for new upstream naming scheme

Modified: fglrx-legacy-driver/trunk/debian/changelog
===================================================================
--- fglrx-legacy-driver/trunk/debian/changelog	2013-02-03 16:59:02 UTC (rev 1175)
+++ fglrx-legacy-driver/trunk/debian/changelog	2013-02-03 17:12:10 UTC (rev 1176)
@@ -16,6 +16,7 @@
     - libgl1-fglrx-legacy-glx:i386: Breaks: ia32-libs (<< 1:0).
     - Remove DM-Upload-Allowed control field, it is obsolete.
     - Bump Standards-Version to 3.9.4 (no changes needed).
+  * debian/watch, debian/rules: Adjust for new upstream release naming scheme.
 
  -- Andreas Beckmann <anbe at debian.org>  Sun, 03 Feb 2013 15:47:09 +0100
 

Modified: fglrx-legacy-driver/trunk/debian/rules
===================================================================
--- fglrx-legacy-driver/trunk/debian/rules	2013-02-03 16:59:02 UTC (rev 1175)
+++ fglrx-legacy-driver/trunk/debian/rules	2013-02-03 17:12:10 UTC (rev 1176)
@@ -192,8 +192,9 @@
 
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
 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
+INSTALLER_SUFFIX	?= linux-x86.x86_64
+INSTALLER		?= $(INSTALLER_PREFIX)-$(RUN_UPSTREAM_VERSION)-$(INSTALLER_SUFFIX).run
+INSTALLER_ZIP		?= $(INSTALLER_PREFIX)-$(ZIP_UPSTREAM_VERSION)-$(INSTALLER_SUFFIX).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-legacy-driver/trunk/debian/rules.defs
===================================================================
--- fglrx-legacy-driver/trunk/debian/rules.defs	2013-02-03 16:59:02 UTC (rev 1175)
+++ fglrx-legacy-driver/trunk/debian/rules.defs	2013-02-03 17:12:10 UTC (rev 1176)
@@ -2,7 +2,6 @@
 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_PREFIX	 = amd-driver-installer-catalyst
+INSTALLER_SUFFIX	 = legacy-linux-x86.x86_64
 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 16:59:02 UTC (rev 1175)
+++ fglrx-legacy-driver/trunk/debian/watch	2013-02-03 17:12:10 UTC (rev 1176)
@@ -1,3 +1,3 @@
 version=3
 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)
+http://support.amd.com/us/gpudownload/linux/legacy/Pages/legacy-radeon_linux.aspx .*/amd-driver-installer-catalyst-(.*)-legacy-linux-x86.x86_64.(?:run|zip)