[ARVADOS-WORKBENCH2] updated: 2.3.0-2-gad17f8ef

[Git user]

Summary of changes:
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

       via  ad17f8efd3c26dda57264156cfc9a80c51c3a639 (commit)
      from  7c0bfc4df5218d306114aa089e2d588c5e6928da (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 ad17f8efd3c26dda57264156cfc9a80c51c3a639
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Nov 1 15:49:21 2021 -0400

    --config-files goes to APP_NAME so that multiple packages don't conflict
    
    no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/Makefile b/Makefile
index 26361bb1..ab58fc58 100644
--- a/Makefile
+++ b/Makefile
@@ -97,8 +97,9 @@ $(DEB_FILE): build
 	 --url="https://arvados.org" \
 	 --license="GNU Affero General Public License, version 3.0" \
 	 --description="$(DESCRIPTION)" \
-	 --config-files="etc/arvados/workbench2/workbench2.example.json" \
-	$(WORKSPACE)/build/=$(DEST_DIR)
+	 --config-files="etc/arvados/$(APP_NAME)/workbench2.example.json" \
+	$(WORKSPACE)/build/=$(DEST_DIR) \
+	etc/arvados/workbench2/workbench2.example.json=/etc/arvados/$(APP_NAME)/workbench2.example.json
 
 $(RPM_FILE): build
 	fpm \
@@ -112,8 +113,9 @@ $(RPM_FILE): build
 	 --url="https://arvados.org" \
 	 --license="GNU Affero General Public License, version 3.0" \
 	 --description="$(DESCRIPTION)" \
-	 --config-files="etc/arvados/workbench2/workbench2.example.json" \
-	 $(WORKSPACE)/build/=$(DEST_DIR)
+	 --config-files="etc/arvados/$(APP_NAME)/workbench2.example.json" \
+	 $(WORKSPACE)/build/=$(DEST_DIR) \
+	etc/arvados/workbench2/workbench2.example.json=/etc/arvados/$(APP_NAME)/workbench2.example.json
 
 copy: $(DEB_FILE) $(RPM_FILE)
 	for target in $(TARGETS) ; do \

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


hooks/post-receive
--