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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-10-12 11:04:33 +0000 (Fri, 12 Oct 2012)
New Revision: 1109

Modified:
   fglrx-driver/branches/experimental/debian/changelog
   fglrx-driver/branches/experimental/debian/rules
Log:
get-orig-source: download beta releases and mangle their version

Modified: fglrx-driver/branches/experimental/debian/changelog
===================================================================
--- fglrx-driver/branches/experimental/debian/changelog	2012-10-12 10:41:10 UTC (rev 1108)
+++ fglrx-driver/branches/experimental/debian/changelog	2012-10-12 11:04:33 UTC (rev 1109)
@@ -7,6 +7,7 @@
     - 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.
 
  -- 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 10:41:10 UTC (rev 1108)
+++ fglrx-driver/branches/experimental/debian/rules	2012-10-12 11:04:33 UTC (rev 1109)
@@ -190,12 +190,12 @@
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
 INSTALLER		?= amd-driver-installer-$(NEW_UPSTREAM_VERSION)-x86.x86_64.run
 INSTALLER_ZIP		?= $(INSTALLER:.run=.zip)
-URL_PATH		?= www2.ati.com/drivers/linux
+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))
 INTERNAL_VERSION	:= $(shell test ! -s $(INSTALLER) || sh $(INSTALLER) --info | sed -n '/^Identification:/ s/[^0-9]*//p')
-REAL_UPSTREAM_VERSION	?= $(ZIP_UPSTREAM_VERSION)
+REAL_UPSTREAM_VERSION	?= $(subst -beta,~beta,$(ZIP_UPSTREAM_VERSION))
 
 get-orig-source-checks:
 	# This target needs DEB_BUILD_OPTIONS to contain the version specification