[Pkg-fglrx-devel] r1256 - fglrx-driver/trunk/debian

[Andreas Beckmann]

Author: anbe
Date: 2013-07-29 00:59:12 +0000 (Mon, 29 Jul 2013)
New Revision: 1256

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/rules
   fglrx-driver/trunk/debian/rules.defs
Log:
and again a new naming scheme ...

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2013-07-29 00:57:25 UTC (rev 1255)
+++ fglrx-driver/trunk/debian/changelog	2013-07-29 00:59:12 UTC (rev 1256)
@@ -3,6 +3,7 @@
   * amd-opencl-dev: Provides/Conflicts/Replaces: opencl-dev.
   * amd-libopencl1: Provide virtual packages libopencl-1.1-1 and
     libopencl-1.2-1 and update description. 
+  * d/rules{,.defs}: Add support for yet another upstream file naming scheme.
 
  -- Andreas Beckmann <anbe at debian.org>  Fri, 26 Jul 2013 01:04:26 +0200
 

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2013-07-29 00:57:25 UTC (rev 1255)
+++ fglrx-driver/trunk/debian/rules	2013-07-29 00:59:12 UTC (rev 1256)
@@ -196,8 +196,9 @@
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
 INSTALLER_PREFIX	?= amd-driver-installer-catalyst
 INSTALLER_SUFFIX	?= linux-x86.x86_64
+INSTALLER_SUFFIX_ZIP	?= $(INSTALLER_SUFFIX)
 INSTALLER		?= $(INSTALLER_PREFIX)-$(RUN_UPSTREAM_VERSION)-$(INSTALLER_SUFFIX).run
-INSTALLER_ZIP		?= $(INSTALLER_PREFIX)-$(ZIP_UPSTREAM_VERSION)-$(INSTALLER_SUFFIX).zip
+INSTALLER_ZIP		?= $(INSTALLER_PREFIX)-$(ZIP_UPSTREAM_VERSION)-$(INSTALLER_SUFFIX_ZIP).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/trunk/debian/rules.defs
===================================================================
--- fglrx-driver/trunk/debian/rules.defs	2013-07-29 00:57:25 UTC (rev 1255)
+++ fglrx-driver/trunk/debian/rules.defs	2013-07-29 00:59:12 UTC (rev 1256)
@@ -1,3 +1,7 @@
 MULTIARCH		 = yes
 SIGNATURE_VERSION	 =
 XORG_ABI_LIST		 = 13 12 11 10 8 6.0
+
+INSTALLER_PREFIX	 = amd-driver-installer-catalyst
+INSTALLER_SUFFIX	 = x86.x86_64
+INSTALLER_SUFFIX_ZIP	 = linux-x86.x86_64