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

[Andreas Beckmann]

Author: anbe
Date: 2014-09-09 07:47:06 +0000 (Tue, 09 Sep 2014)
New Revision: 1390

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/rules
   fglrx-driver/trunk/debian/rules.defs
Log:
new innovative upstream versioning scheme (and a new beta, btw)

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2014-09-09 07:23:37 UTC (rev 1389)
+++ fglrx-driver/trunk/debian/changelog	2014-09-09 07:47:06 UTC (rev 1390)
@@ -1,14 +1,20 @@
-fglrx-driver (1:14.6~betav1.0-2) UNRELEASED; urgency=medium
+fglrx-driver (1:14.6~betav1.0-2014.07.11-1) UNRELEASED; urgency=medium
 
+  [ Andreas Beckmann ]
+  * New upstream beta release 14.6-beta-v1.0-jul11 (2014-07-14) (14.20).
+    (Closes: #759338)
+
+  [ Patrick Matthäi ]
   * Add turkish debconf translation.
     Closes: #757496
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 11 Aug 2014 15:44:58 +0200
+ -- Andreas Beckmann <anbe at debian.org>  Tue, 09 Sep 2014 09:23:15 +0200
 
 fglrx-driver (1:14.6~betav1.0-1) experimental; urgency=medium
 
   [ Michael Gilbert ]
-  * New upstream beta release (closes: #749973).
+  * New upstream beta release 14.6-beta-v1.0-may23 (2014-0?-??) (14.20).
+    (Closes: #749973)
 
   [ Andreas Beckman ]
   * Update list of supported models.

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2014-09-09 07:23:37 UTC (rev 1389)
+++ fglrx-driver/trunk/debian/rules	2014-09-09 07:47:06 UTC (rev 1390)
@@ -210,9 +210,9 @@
 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')
-FIXUP_BETA		?= $(subst -beta,~beta,$(subst beta-,beta,$(subst betav,beta,$1)))
+FIXUP_BETA		?= $(subst -beta,~beta,$(subst beta-,beta,$(subst betav,beta,$(subst beta-v,beta,$1))))
 FIXUP_RC		?= $(subst -rc,~rc,$(subst rcv,rc,$(subst rc-,rc,$1)))
-REAL_UPSTREAM_VERSION	?= $(subst -,.,$(call FIXUP_RC,$(call FIXUP_BETA,$(NEW_UPSTREAM_VERSION))))
+REAL_UPSTREAM_VERSION	?= $(call FIXUP_RC,$(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-09-09 07:23:37 UTC (rev 1389)
+++ fglrx-driver/trunk/debian/rules.defs	2014-09-09 07:47:06 UTC (rev 1390)
@@ -1,8 +1,10 @@
 MULTIARCH		 = yes
-SIGNATURE_VERSION	 = 14.6~betav1.0
+SIGNATURE_VERSION	 = 14.6~betav1.0-2014.07.11
 XORG_ABI_LIST		 = 15 14 13 12 11 10 8 6.0
 
 #INSTALLER_PREFIX	 = amd-driver-installer-catalyst
+INSTALLER_PREFIX.zip	 = linux-amd-catalyst
 INSTALLER_PREFIX.run	 = fglrx-$(UPSTREAM_VERSION.run)/amd-driver-installer
 INSTALLER_SUFFIX.run	 = x86.x86_64
-INSTALLER_SUFFIX.zip	 = linux-x86-x86-64
+INSTALLER_SUFFIX.zip	 =
+#INSTALLER_SUFFIX.zip	 = linux-x86-x86-64