[L/unstable 11/13] UBUNTU: [Packaging] simplify abinum and uploadnum definitions

[Masahiro Yamada]

I do not say that I fully understood this complex regex, but this
commit splits the debian revision at the first period - the first
half as abinum and the second as uploadnum.

Signed-off-by: Masahiro Yamada <masahiro.yamada at canonical.com>
---
 debian/rules.d/0-common-vars.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index ec9c5680493b..d3ba95eb8822 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -78,11 +78,11 @@ ifeq ($(full_build),false)
 skipdbg=true
 endif
 
-abinum		:= $(shell echo $(revision) | sed -r -e 's/([^\+~]*)\.[^\.]+(~.*)?(\+.*)?$$/\1/')$(abi_suffix)
-prev_abinum	:= $(shell echo $(prev_revision) | sed -r -e 's/([^\+~]*)\.[^\.]+(~.*)?(\+.*)?$$/\1/')$(abi_suffix)
+abinum		:= $(firstword $(subst .,$(space),$(revision)))$(abi_suffix)
+prev_abinum	:= $(firstword $(subst .,$(space),$(prev_revision)))$(abi_suffix)
 abi_release	:= $(release)-$(abinum)
 
-uploadnum	:= $(shell echo $(revision) | sed -r -e 's/[^\+~]*\.([^\.~]+(~.*)?(\+.*)?$$)/\1/')
+uploadnum	:= $(patsubst $(abinum).%,%,$(revision))
 ifneq ($(full_build),false)
   uploadnum	:= $(uploadnum)-Ubuntu
 endif
-- 
2.34.1