[ARVADOS-WORKBENCH2] updated: 1.1.4-6-ge947735

[Git user]

Summary of changes:
 Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

       via  e9477357d7836cc0f91b0afede0583f1070c00fa (commit)
      from  7def2ec835ed1aaf0cb02fa19a787db14b0d2354 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e9477357d7836cc0f91b0afede0583f1070c00fa
Author: Nico Cesar <ncesar at veritasgenetics.com>
Date:   Tue Jun 12 14:01:57 2018 -0400

    13544: Package Iteration was missing in the Makefile.
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <ncesar at veritasgenetics.com>

diff --git a/Makefile b/Makefile
index ba710a8..8e29481 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,10 @@ DATE_FROM_TS_GIT?=$(shell date -ud @$(TS_GIT) +%Y%m%d%H%M%S)
 # something in the lines of 1.2.0.20180612145021, this will be the package version
 NIGHTLY_VERSION?=$(GIT_TAG).$(DATE_FROM_TS_GIT)
 
+# ITERATION is the package iteration, intended for manual change if anything non-code related
+# changes in the package. (i.e. example config files externally added
+ITERATION?=1
+
 DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
 MAINTAINER=Ward Vandewege <wvandewege at veritasgenetics.com>
 
@@ -67,6 +71,7 @@ packages-with-version: build
 	 -t deb \
 	 -n "$(APP_NAME)" \
 	 -v "$(VERSION)" \
+	 --iteration "$(ITERATION)" \
 	 --maintainer="$(MAINTAINER)" \
 	 --description="$(DESCRIPTION)" \
 	 --deb-no-default-config-files \
@@ -76,6 +81,7 @@ packages-with-version: build
 	 -t rpm \
 	 -n "$(APP_NAME)" \
 	 -v "$(VERSION)" \
+	 --iteration "$(ITERATION)" \
 	 --maintainer="$(MAINTAINER)" \
 	 --description="$(DESCRIPTION)" \
 	 $(WORKSPACE)/build/=DEST_DIR
@@ -87,6 +93,7 @@ packages: build
 	 -t deb \
 	 -n "$(APP_NAME)" \
 	 -v "$(NIGHTLY_VERSION)" \
+	 --iteration "$(ITERATION)" \
 	 --maintainer="$(MAINTAINER)" \
 	 --description="$(DESCRIPTION)" \
 	 --deb-no-default-config-files \
@@ -96,6 +103,7 @@ packages: build
 	 -t rpm \
 	 -n "$(APP_NAME)" \
 	 -v "$(NIGHTLY_VERSION)" \
+	 --iteration "$(ITERATION)" \
 	 --maintainer="$(MAINTAINER)" \
 	 --description="$(DESCRIPTION)" \
 	 $(WORKSPACE)/build/=DEST_DIR

-----------------------------------------------------------------------


hooks/post-receive
--