[debian-edu-commits] debian-edu/ 01/01: Makefile: Drop work-around for gosa-plugin-netgroups being promoted to Depends: in debian/control.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu.

commit 621a2498bdc6127cc57c4ecfcad158300d9dfa0f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Aug 12 00:37:21 2017 -0400

    Makefile: Drop work-around for gosa-plugin-netgroups being promoted to Depends: in debian/control.
    
      This is now supported by blends-dev. To enable the new
      "GENCONTROL_DEPENDS" mode in blends-dev, we set GENCONTROL_DEV to true.
      (See #825172 for more details).
    
      debian/control: Bump B-D for blends-dev to (>= 0.6.99).
---
 Makefile            | 25 ++-----------------------
 debian/changelog    |  5 +++++
 debian/control      |  2 +-
 debian/control.stub |  2 +-
 4 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index 72af73f..5d20218 100755
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,6 @@
 #!/usr/bin/make -f
 
 TASKSELOPTS = -u
-include /usr/share/blends-dev/Makefile
+GENCONTROL_DEPENDS = true
 
-dist:
-	# the next two lines are taken from the original dist target from blends-dev Makefile
-	rm -f $(BLEND)-tasks.desc debian/control
-	make -f debian/rules get-orig-source
-	# This sed command removes gosa-plugin-netgroups from the list of Recommends and
-	# adds gosa-plugin-netgroups to Depends (# Closes: #793667)
-	# (the implementation is a workaround for the missing feature
-	# in blends-dev tracked as #825172)
-	sed -i -e '/^ *gosa-plugin-netgroups,$$/d' \
-	       -e '/^Package: education-main-server/{;N;N;N;N;s/\nDepends: [^\n]*/&, gosa-plugin-netgroups,/;}' \
-	       debian/control
-	# regenerate source tarball after d/control was changed
-	# (this is a symptom of the above being a workaround and
-	# why it should be implemented in blends-dev - also
-	# compare the following line with the second line of this target…)
-	make -f debian/rules get-orig-source
-	# The following sed command does to things:
-	# workaround #845760: - use (= ${source:Version}) for arch:all depends
-	# workaround #845762: - add ${misc:Depends} to all generated binary packages
-	# 				(needed because we use debhelper)
-	# There might be a better way to achieve this with the blends-dev framework…
-	sed -i 's#education-tasks (= $${binary:Version})#education-tasks (= $${source:Version}), $${misc:Depends}#g' debian/control
+include /usr/share/blends-dev/Makefile
diff --git a/debian/changelog b/debian/changelog
index 6d8b8e3..b01ff0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,11 @@ debian-edu (1.925) UNRELEASED; urgency=medium
     component of D-E systems.
   * tasks/common: Promote smartmontools from Suggests: to Recommends:. Drop
     smartsuite (gone from Debian)."
+  * Makefile: Drop work-around for gosa-plugin-netgroups being promoted to
+    Depends: in debian/control. This is now supported by blends-dev. To
+    enable the new "GENCONTROL_DEPENDS" mode in blends-dev, we set
+    GENCONTROL_DEV to true. (See #825172 for more details).
+  * debian/control: Bump B-D for blends-dev to (>= 0.6.99).
 
   [ Holger Levsen ]
   * Add sources.list.buster and make sources.list.UNRELEASED symlink point to
diff --git a/debian/control b/debian/control
index 1320441..0034eb8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
  Holger Levsen <holger at debian.org>,
  Mike Gabriel <sunweaver at debian.org>,
  Wolfgang Schweer <wschweer at arcor.de>,
-Build-Depends: debhelper (>= 9), blends-dev (>= 0.6.94)
+Build-Depends: debhelper (>= 9), blends-dev (>= 0.6.99)
 Standards-Version: 4.0.1
 XS-Testsuite: autopkgtest
 Vcs-Git: git://anonscm.debian.org/debian-edu/debian-edu.git
diff --git a/debian/control.stub b/debian/control.stub
index 1bcadfe..bb3bc7b 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -6,7 +6,7 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
  Holger Levsen <holger at debian.org>,
  Mike Gabriel <sunweaver at debian.org>,
  Wolfgang Schweer <wschweer at arcor.de>,
-Build-Depends: debhelper (>= 9), blends-dev (>= 0.6.94)
+Build-Depends: debhelper (>= 9), blends-dev (>= 0.6.99)
 Standards-Version: 4.0.1
 XS-Testsuite: autopkgtest
 Vcs-Git: git://anonscm.debian.org/debian-edu/debian-edu.git

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu.git