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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-10-12 13:32:57 +0000 (Fri, 12 Oct 2012)
New Revision: 1119

Modified:
   fglrx-driver/branches/experimental/debian/changelog
   fglrx-driver/branches/experimental/debian/rules
   fglrx-driver/branches/experimental/debian/watch
Log:
change versioning scheme, upstreamversion ~= s/-/./

Modified: fglrx-driver/branches/experimental/debian/changelog
===================================================================
--- fglrx-driver/branches/experimental/debian/changelog	2012-10-12 13:20:52 UTC (rev 1118)
+++ fglrx-driver/branches/experimental/debian/changelog	2012-10-12 13:32:57 UTC (rev 1119)
@@ -1,6 +1,8 @@
-fglrx-driver (1:12-9~beta-1) UNRELEASED; urgency=low
+fglrx-driver (1:12.9~beta-1) UNRELEASED; urgency=low
 
   * New upstream beta 12-9 (2012-09-26) (9.00).
+  * debian/watch, debian/rules: Mangle upstream version to substitute dash
+    with point, changing the versioning scheme from YY-MM to YY.MM.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Fri, 12 Oct 2012 14:56:47 +0200
 

Modified: fglrx-driver/branches/experimental/debian/rules
===================================================================
--- fglrx-driver/branches/experimental/debian/rules	2012-10-12 13:20:52 UTC (rev 1118)
+++ fglrx-driver/branches/experimental/debian/rules	2012-10-12 13:32:57 UTC (rev 1119)
@@ -199,7 +199,7 @@
 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,$(NEW_UPSTREAM_VERSION))
+REAL_UPSTREAM_VERSION	?= $(subst -,.,$(subst -beta,~beta,$(NEW_UPSTREAM_VERSION)))
 
 get-orig-source-checks:
 	test -z "$(NEW_UPSTREAM_VERSION)" && echo "Version not defined" && exit 1 || true

Modified: fglrx-driver/branches/experimental/debian/watch
===================================================================
--- fglrx-driver/branches/experimental/debian/watch	2012-10-12 13:20:52 UTC (rev 1118)
+++ fglrx-driver/branches/experimental/debian/watch	2012-10-12 13:32:57 UTC (rev 1119)
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/-beta/~beta/" \
+opts="uversionmangle=s/-beta/~beta/;s/-/./g" \
 http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx .*/amd-driver-installer-(.*)-x86.x86_64.(?:run|zip)