UBUNTU: [Debian] uploadnum should be the remainder of the version

The uploadnum variable in debian/rules is somewhat confusingly named,
it should be the "remainder of the version after <version>-<abinum>", not
just the uploadnum itself.  This version is only used for identification
in uname -v and there it is completely appropriate for this to be complete
with backport versions etc.

BugLink: http://bugs.launchpad.net/bugs/1407755
Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index d86914df7194413202d682d32c1f9c3a50326082..d2d62c1ed79231124df9300dcbb98bd6d0cc1dc2 100644 (file)
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -65,7 +65,7 @@ abinum                := $(shell echo $(revision) | sed -r -e 's/([^\+~]*)\.[^\.]+(~.*)?(\+.*)
 prev_abinum    := $(shell echo $(prev_revision) | sed -r -e 's/([^\+~]*)\.[^\.]+(~.*)?(\+.*)?$$/\1/')$(abi_suffix)
 abi_release    := $(release)-$(abinum)
 
-uploadnum      := $(shell echo $(revision) | sed -r -e 's/[^\+~]*\.([^\.~]+)(~.*)?(\+.*)?$$/\1/')
+uploadnum      := $(shell echo $(revision) | sed -r -e 's/[^\+~]*\.([^\.~]+(~.*)?(\+.*)?$$)/\1/')
 ifneq ($(full_build),false)
   uploadnum    := $(uploadnum)-Ubuntu
 endif