[Blends-commit] [SCM] blends-dev branch, master, updated. 9298afe9d90c490bca0153b4c0aa20c084c7c7b6

[Mike Gabriel]

The following commit has been merged in the master branch:
commit 9298afe9d90c490bca0153b4c0aa20c084c7c7b6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Aug 12 00:20:02 2017 -0400

    devtools: Re-work configuration of NODEPENDS flag in blend-gen-control script. The Makefile now has to set GENCONTROL_DEPEND = true, to enable Depends: fields from task files being propagated to Depends: fields in debian/control. For an example, see Makefile in debian-edu src:package.

diff --git a/devtools/Makefile b/devtools/Makefile
index 5dc9606..271c9fa 100755
--- a/devtools/Makefile
+++ b/devtools/Makefile
@@ -11,7 +11,7 @@
 TARGET_DIST := $(shell head -1 debian/changelog |awk '{print $$3}'|tr -d ';')
 BLEND := $(shell /usr/share/blends-dev/blend-get-names blendname)
 GENCONTROL := /usr/share/blends-dev/blend-gen-control
-GENCONTROL_NODEPENDS := $(shell grep GENCONTROL_NODEPENDS Makefile | cut -d "=" -f2 || echo -D)
+GENCONTROL_OPTS := $(shell grep -q -E '^GENCONTROL_DEPENDS\s*=\s*(T|t)(R|r)(U|u)(E|e)\s*$$' Makefile || echo "-D")
 TASKSELOPTS := $(shell grep TASKSELOPTS Makefile | cut -d '=' -f2)
 
 # Verify whether config/control exists, if yes, add it to the depends of debian/control
@@ -24,7 +24,7 @@ debian/control: debian/control.stub debian/changelog tasks/* $(CONFIGCONTROL)
 	 echo "# This file is autogenerated via "make -f debian/rules dist".  Do not edit!"; \
 	 cat debian/control.stub; \
 	 test -f config/control && ( cat config/control; echo ) ; \
-	$(GENCONTROL) -s $(TARGET_DIST) -S $(GENCONTROL_NODEPENDS) -c -m -i -A) > $@.new && mv $@.new $@
+	$(GENCONTROL) -s $(TARGET_DIST) -S $(GENCONTROL_OPTS) -c -m -i -A) > $@.new && mv $@.new $@
 
 tasksel: $(BLEND)-tasks.desc
 $(BLEND)-tasks.desc: tasks/* debian/changelog

-- 
Git repository for blends code