[debian-edu-commits] debian-edu/ 01/02: debian/rules: put tasks file only in education-tasks (Closes: #841388)

[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 d7b72bdda0c9a4693cdc90bf646c094401d29541
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Oct 22 09:42:21 2016 +0200

    debian/rules: put tasks file only in education-tasks (Closes: #841388)
    
    debian/rules: override dh commands defined in /usr/share/blends-dev/rules
    to make sure the tasks file only ends up in the education-tasks package
    but not in education-menus. This is quite probably a bug in blends-dev.
    Closes: #841388)
    This bug only became visible when seperatly building arch dependent and
    independent packages, but not when building them combined, that's why I
    thought 1.912 addressed this issue.
---
 debian/changelog | 13 ++++++++++++-
 debian/rules     | 11 +++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 56a983d..27d4900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,18 @@
+debian-edu (1.913) UNRELEASED; urgency=medium
+
+  * debian/rules: override dh commands defined in /usr/share/blends-dev/rules
+    to make sure the tasks file only ends up in the education-tasks package
+    but not in education-menus. This is quite probably a bug in blends-dev.
+    (Closes: #841388)
+    This bug only became visible when seperatly building arch dependent and
+    independent packages, but not when building them combined, that's why I
+    thought 1.912 addressed this issue.
+
+ -- Holger Levsen <holger at debian.org>  Sat, 22 Oct 2016 09:30:12 +0200
+
 debian-edu (1.912) unstable; urgency=medium
 
   * debian/control.stub: mark education-tasks as Multi-Arch: foreign.
-    (Closes: #841388)
   * Makefile: Use (= ${source:Version}) for arch:all depends in debian/control
     as recommended by
     https://lintian.debian.org/tags/not-binnmuable-any-depends-all.html
diff --git a/debian/rules b/debian/rules
index 908ab44..5becc89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,14 @@
 #!/usr/bin/make -f
 
 include /usr/share/blends-dev/rules
+
+# the next two overrides should probably go into blends-dev itself…
+# (see 1.913 changelog entry)
+override_dh_install:
+	$(BLEND_INSTALL_HELPER)
+	dh_install
+
+override_dh_auto_install-indep:
+	$(BLEND_INSTALL_HELPER)
+	dh_install $(BLENDNAME)-tasks.desc usr/share/tasksel/descs
+

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