[debian-edu-commits] debian-edu/ 01/01: improve comments. also this is just a workaround for #825004 but not a solution…

[Holger Levsen]

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

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

commit d82b89ea585841342093e3c056d1fa087d78f766
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue May 24 12:13:47 2016 +0200

    improve comments. also this is just a workaround for #825004 but not a solution…
---
 Makefile             | 8 ++++----
 debian/README.source | 5 +++--
 debian/changelog     | 6 ++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index b841dc8..d8a64dc 100755
--- a/Makefile
+++ b/Makefile
@@ -3,16 +3,16 @@
 include /usr/share/blends-dev/Makefile
 
 dist:
-	# this is the original dist target from blends-dev Makefile
+	# 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 removes gosa-plugin-netgroups from the list of Recommends and
+	# This sed command removes gosa-plugin-netgroups from the list of Recommends and
 	# adds gosa-plugin-netgroups to Depends
 	# Closes: #793667
 	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
+	# This sed command removes the education-all metapackage which was created by
 	# using blends-dev 0.6.93
-	# Closes: #825004
+	# work around for: #825004
 	sed -i -e '/^Package: edu-all$$/,/^$$/d' debian/control
diff --git a/debian/README.source b/debian/README.source
index 936174d..79225f3 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -49,11 +49,12 @@ cdd-doc package which is also available online under
 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.
+     file. (See #793667 / since 1.901)
   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
+     the resulting debian/control file in the overridden dist target as
+     as a workaround for 825004. (Also introduced in 1.901.)
 
 How to add packages to the tasks
 --------------------------------
diff --git a/debian/changelog b/debian/changelog
index 4222206..0d75a6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,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
+    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
+    by blends-dev 0.6.93 (workaround for #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