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

2017-08-11 Thread Mike Gabriel 
The following commit has been merged in the master branch:
commit 73e124d2fa03ed6e5c926096464ea02f7490b809
Author: Mike Gabriel 
Date:   Fri Aug 11 23:30:02 2017 -0400

Revert "devtools/Makefile: Make -D option configurable from the make 
command call."

This reverts commit f5762a700033d232418776b9f9303e9d26f138e2.

diff --git a/devtools/Makefile b/devtools/Makefile
index dc1a233..c2038a8 100755
--- a/devtools/Makefile
+++ b/devtools/Makefile
@@ -11,7 +11,6 @@
 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 := -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 +23,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) $(GENCONTROL_NODEPENDS) -S -c -m -i -A) 
> $@.new && mv $@.new $@
+   $(GENCONTROL) -s $(TARGET_DIST) -S -D -c -m -i -A) > $@.new && mv 
$@.new $@
 
 tasksel: $(BLEND)-tasks.desc
 $(BLEND)-tasks.desc: tasks/* debian/changelog

-- 
Git repository for blends code

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

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

2017-08-11 Thread Mike Gabriel 
The following commit has been merged in the master branch:
commit 3a1e275c0c73755d690c605083ba761c9bababa7
Author: Mike Gabriel 
Date:   Fri Aug 11 23:31:00 2017 -0400

devtools/Makefile: Make -D option configurable from the make command call 
(v2).

diff --git a/devtools/Makefile b/devtools/Makefile
index c2038a8..5dc9606 100755
--- a/devtools/Makefile
+++ b/devtools/Makefile
@@ -11,6 +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)
 TASKSELOPTS := $(shell grep TASKSELOPTS Makefile | cut -d '=' -f2)
 
 # Verify whether config/control exists, if yes, add it to the depends of 
debian/control
@@ -23,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 -D -c -m -i -A) > $@.new && mv 
$@.new $@
+   $(GENCONTROL) -s $(TARGET_DIST) -S $(GENCONTROL_NODEPENDS) -c -m -i -A) 
> $@.new && mv $@.new $@
 
 tasksel: $(BLEND)-tasks.desc
 $(BLEND)-tasks.desc: tasks/* debian/changelog

-- 
Git repository for blends code

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

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

2017-08-11 Thread Mike Gabriel 
The following commit has been merged in the master branch:
commit 9298afe9d90c490bca0153b4c0aa20c084c7c7b6
Author: Mike Gabriel 
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

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

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

2017-08-11 Thread Mike Gabriel 
The following commit has been merged in the master branch:
commit fd08b447a75e2ccfdefa344a3c9401f18f55734e
Author: Mike Gabriel 
Date:   Fri Aug 11 23:29:49 2017 -0400

Revert "Revert "devtools/blend-gen-control: With -D (no depends) set, 
assure that packages under Depends: _and_ Recommends: in task files end up 
under Recommends: in debian/control.""

This reverts commit ccc56ca41b29e8212ff1aafbf7ce7c1355726395.

diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 45a2cad..d0e8d33 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -256,12 +256,14 @@ sub gen_control {
 #   if defined $taskinfo{$task}{Recommends};
 push(@suggests, @{$taskinfo{$task}{Suggests}})
 if defined $taskinfo{$task}{Suggests};
+my @recommends_sorted = sort_uniq(\%seenlist, @recommends);
+my @suggests_sorted = sort_uniq(\%seenlist, @suggests);
 print("Recommends: ",
-  join(",\n ", sort_uniq(\%seenlist, @recommends)),"\n")
-if defined $taskinfo{$task}{Depends};
+  join(",\n ", @recommends_sorted),"\n")
+if @recommends_sorted;
 print("Suggests: ",
-  join(",\n ", sort_uniq(\%seenlist, @suggests)),"\n")
-if @suggests;
+  join(",\n ", @suggests_sorted),"\n")
+if @suggests_sorted;
 }
 else {
 for $header (qw(Depends Recommends Suggests)) {

-- 
Git repository for blends code

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit