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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-10-12 11:55:21 +0000 (Fri, 12 Oct 2012)
New Revision: 1111

Modified:
   fglrx-driver/branches/experimental/debian/changelog
   fglrx-driver/branches/experimental/debian/rules
Log:
add ZVER and RVER overrides

Modified: fglrx-driver/branches/experimental/debian/changelog
===================================================================
--- fglrx-driver/branches/experimental/debian/changelog	2012-10-12 11:29:27 UTC (rev 1110)
+++ fglrx-driver/branches/experimental/debian/changelog	2012-10-12 11:55:21 UTC (rev 1111)
@@ -7,8 +7,11 @@
     - Remove obsolete conffile /etc/modprobe.d/fglrx-driver.conf.
     - Purging fglrx-driver is no longer required for switching to Radeon.
   * debian/watch: Mangle the version of upstream beta releases.
-  * get-orig-source: Download beta releases and mangle their version.
-  * Repack into .xz, about 24% size reduction over .bz2.
+  * debian/rules get-orig-source:
+    - Support "funny" upstream naming schemes by allowing RVER and ZVER
+      overrides for the version number used in the .run and .zip files.
+    - Download beta releases and mangle their version.
+    - Repack into .xz, about 24% size reduction over .bz2.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Thu, 13 Sep 2012 13:33:04 +0200
 

Modified: fglrx-driver/branches/experimental/debian/rules
===================================================================
--- fglrx-driver/branches/experimental/debian/rules	2012-10-12 11:29:27 UTC (rev 1110)
+++ fglrx-driver/branches/experimental/debian/rules	2012-10-12 11:55:21 UTC (rev 1111)
@@ -188,18 +188,17 @@
 ############################################################################
 
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
-INSTALLER		?= amd-driver-installer-$(NEW_UPSTREAM_VERSION)-x86.x86_64.run
-INSTALLER_ZIP		?= $(INSTALLER:.run=.zip)
+INSTALLER		?= amd-driver-installer-$(RUN_UPSTREAM_VERSION)-x86.x86_64.run
+INSTALLER_ZIP		?= amd-driver-installer-$(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)))
 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))
 INTERNAL_VERSION	:= $(shell test ! -s $(INSTALLER) || sh $(INSTALLER) --info | sed -n '/^Identification:/ s/[^0-9]*//p')
-REAL_UPSTREAM_VERSION	?= $(subst -beta,~beta,$(ZIP_UPSTREAM_VERSION))
+REAL_UPSTREAM_VERSION	?= $(subst -beta,~beta,$(NEW_UPSTREAM_VERSION))
 
 get-orig-source-checks:
-	# This target needs DEB_BUILD_OPTIONS to contain the version specification
-	# in the following form: VER=some.version.number
 	test -z "$(NEW_UPSTREAM_VERSION)" && echo "Version not defined" && exit 1 || true
 	test ! -e debian/rules && echo "Run this command from the root of the package" && exit 1 || true
 
@@ -241,5 +240,7 @@
 get-orig-source:
 	# This target needs DEB_BUILD_OPTIONS to contain the version specification
 	# in the following form: VER=some.version.number
+	# In case AMD tried yet another funny naming scheme, ZVER and RVER can be
+	# used to override the version number for the .zip and .run files.
 endif
 .PHONY: get-orig-source repack_upstream_archive