Merge pull request #7042 from stangri/master-luci.mk

luci.mk: include release in version number

diff --combined luci.mk
index 7e965a06fb01db2b56992b5361b20120c421da48,c89fea6558e4e32553f63f9e88b5209077dca0be..c26dfbbf2aa9fa6b75bb229f8b91482f74af2662
--- 1/luci.mk
--- 2/luci.mk
+++ b/luci.mk
@@@ -85,18 -85,18 +85,18 @@@ define findre
        if [ -n "$$1" ]; then
          secs="$$(($$1 % 86400))"; \
          yday="$$(date --utc --date="@$$1" "+%y.%j")"; \
 -        printf 'git-%s.%05d~%s' "$$yday" "$$secs" "$$2"; \
 +        printf '%s.%05d~%s' "$$yday" "$$secs" "$$2"; \
        else \
 -        echo "unknown"; \
 +        echo "0"; \
        fi; \
      else \
        ts=$$(find . -type f $(if $(1),-not) -path './po/*' -printf '%T@\n' 2>/dev/null | sort -rn | head -n1 | cut -d. -f1); \
        if [ -n "$$ts" ]; then \
          secs="$$(($$ts % 86400))"; \
          date="$$(date --utc --date="@$$ts" "+%y%m%d")"; \
 -        printf '%s.%05d' "$$date" "$$secs"; \
 +        printf '0.%s.%05d' "$$date" "$$secs"; \
        else \
 -        echo "unknown"; \
 +        echo "0"; \
        fi; \
      fi \
    )
@@@ -153,7 -153,7 +153,7 @@@ ifneq ($(LUCI_SUBMENU),none
  endif
    TITLE:=$(if $(LUCI_TITLE),$(LUCI_TITLE),LuCI $(LUCI_NAME) $(LUCI_TYPE))
    DEPENDS:=$(LUCI_DEPENDS)
-   VERSION:=$(if $(PKG_VERSION),$(PKG_VERSION),$(PKG_SRC_VERSION))
+   VERSION:=$(if $(PKG_VERSION),$(if $(PKG_RELEASE),$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_VERSION)),$(PKG_SRC_VERSION))
    $(if $(LUCI_EXTRA_DEPENDS),EXTRA_DEPENDS:=$(LUCI_EXTRA_DEPENDS))
    $(if $(LUCI_PKGARCH),PKGARCH:=$(LUCI_PKGARCH))
    $(if $(PKG_PROVIDES),PROVIDES:=$(PKG_PROVIDES))