[debian-edu-commits] debian-edu/ 04/04: Override dist target to remove edu-all metapackage that was introduced by blends-dev 0.6.93

[Andreas Tille]

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

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

commit 596ff5b98862b8174a3f713f8cd4fae7961f4e1e
Author: Andreas Tille <tille at debian.org>
Date:   Tue May 24 12:06:18 2016 +0200

    Override dist target to remove edu-all metapackage that was introduced by blends-dev 0.6.93
---
 Makefile             |  5 ++++-
 debian/README.source | 11 ++++++++---
 debian/changelog     |  3 +++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index cd5eb90..b841dc8 100755
--- a/Makefile
+++ b/Makefile
@@ -12,4 +12,7 @@ dist:
 	sed -i -e '/^ *gosa-plugin-netgroups,$$/d' \
 	       -e '/^Package: education-main-server/{;N;N;N;N;s/\nDepends: [^\n]*/&, gosa-plugin-netgroups,/;}' \
 	       debian/control
-
+	# This removes the education-all metapackage which was created by
+	# using blends-dev 0.6.93
+	# Closes: #825004
+	sed -i -e '/^Package: edu-all$$/,/^$$/d' debian/control
diff --git a/debian/README.source b/debian/README.source
index b24d4f4..936174d 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -46,9 +46,14 @@ cdd-doc package which is also available online under
 
    http://blends.alioth.debian.org/blends/ap-DevelDescription.en.html#s-svn
 
-Remark: The original blends-dev dist target was overriden in Makefile
-to enable a strong Depends: gosa-plugin-netgroups in the debian/control
-file.
+Remarks:
+  1. The original blends-dev dist target was overridden in Makefile to
+     enable a strong Depends: gosa-plugin-netgroups in the debian/control
+     file.
+  2. Blends-dev version 0.6.93 introduces a new metapackage edu-all which
+     is intended to be used in the installer.  Since Debian Edu has a
+     different solution for this the edu-all metapackage is removed from
+     the resulting debian/control file in the overridden dist target
 
 How to add packages to the tasks
 --------------------------------
diff --git a/debian/changelog b/debian/changelog
index 8ea5803..4222206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ debian-edu (1.901) UNRELEASED; urgency=medium
   * Enable strong Depends: gosa-plugin-netgroups by doing some post-editing
     in the dist target
     Closes: #793667
+  * Override dist target to remove edu-all metapackage that was introduced
+    by blends-dev 0.6.93
+    Closes: #825004
 
  -- Andreas Tille <tille at debian.org>  Tue, 24 May 2016 11:41:23 +0200
 

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