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

[Andreas Beckmann]

Author: anbe
Date: 2014-02-13 10:29:25 +0000 (Thu, 13 Feb 2014)
New Revision: 1343

Modified:
   fglrx-driver/trunk/debian/rules
   fglrx-driver/trunk/debian/rules.defs
Log:
prepare for generating 14.1 beta tarball ...

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2014-01-31 09:43:49 UTC (rev 1342)
+++ fglrx-driver/trunk/debian/rules	2014-02-13 10:29:25 UTC (rev 1343)
@@ -194,18 +194,22 @@
 ############################################################################
 
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
-INSTALLER_PREFIX	?= amd-driver-installer-catalyst
+INSTALLER_PREFIX	?= amd-catalyst
+INSTALLER_PREFIX.zip	?= $(INSTALLER_PREFIX)
+INSTALLER_PREFIX.run	?= $(INSTALLER_PREFIX)
 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).zip
+INSTALLER_SUFFIX.zip	?= $(INSTALLER_SUFFIX)
+INSTALLER_SUFFIX.run	?= $(INSTALLER_SUFFIX)
+INSTALLER_ZIP		?= $(INSTALLER_PREFIX.zip)-$(UPSTREAM_VERSION.zip)-$(INSTALLER_SUFFIX.zip).zip
+INSTALLER		?= $(INSTALLER_PREFIX.run)-$(UPSTREAM_VERSION.run)-$(INSTALLER_SUFFIX.run).run
 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))
+UPSTREAM_VERSION.zip	?= $(or $(patsubst ZVER=%,%,$(filter ZVER=%,$(DEB_BUILD_OPTIONS))),$(NEW_UPSTREAM_VERSION))
+UPSTREAM_VERSION.run	?= $(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	?= $(subst -,.,$(subst -beta,~beta,$(NEW_UPSTREAM_VERSION)))
+FIXUP_BETA		?= $(subst -beta,~beta,$(subst beta-,beta,$(subst betav,beta,$1)))
+REAL_UPSTREAM_VERSION	?= $(subst -,.,$(call FIXUP_BETA,$(NEW_UPSTREAM_VERSION)))
 
 get-orig-source-checks:
 	test -z "$(NEW_UPSTREAM_VERSION)" && echo "Version not defined" && exit 1 || true

Modified: fglrx-driver/trunk/debian/rules.defs
===================================================================
--- fglrx-driver/trunk/debian/rules.defs	2014-01-31 09:43:49 UTC (rev 1342)
+++ fglrx-driver/trunk/debian/rules.defs	2014-02-13 10:29:25 UTC (rev 1343)
@@ -2,6 +2,6 @@
 SIGNATURE_VERSION	 = 13.11~betav9.4
 XORG_ABI_LIST		 = 14 13 12 11 10 8 6.0
 
-INSTALLER_PREFIX	 = amd-catalyst
-#INSTALLER_SUFFIX	 = x86.x86_64
-#INSTALLER_SUFFIX_ZIP	 = linux-x86.x86_64
+#INSTALLER_PREFIX	 = amd-driver-installer-catalyst
+INSTALLER_PREFIX.run	 = amd-driver-installer
+INSTALLER_SUFFIX.run	 = x86.x86_64