[debian-edu-commits] debian-edu/ 01/01: Update after running 'make dist'.

[Wolfgang Schweer]

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

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

commit 54244e354024b0c1abb1f6d9716d2b9122f7224a
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Apr 21 18:02:13 2017 +0200

    Update after running 'make dist'.
---
 debian-edu-tasks.desc | 8 +++-----
 debian/control        | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index b496dea..ef1eaee 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -530,7 +530,6 @@ Packages: list
  kdenlive
  gcompris
  inkscape
- gosa-desktop
  libreoffice-l10n-el
  libreoffice-l10n-de
  libreoffice-l10n-fr
@@ -1360,7 +1359,6 @@ Packages: list
  kdenlive
  gcompris
  inkscape
- gosa-desktop
  libreoffice-l10n-el
  libreoffice-l10n-de
  libreoffice-l10n-fr
@@ -1513,6 +1511,7 @@ Packages: list
  gtk-recordmydesktop
  pavucontrol
  goplay
+ gosa-desktop
  krb5-auth-dialog
  jxplorer
  pulseaudio
@@ -2081,7 +2080,6 @@ Packages: list
  kdenlive
  gcompris
  inkscape
- gosa-desktop
  libreoffice-l10n-el
  libreoffice-l10n-de
  libreoffice-l10n-fr
@@ -2238,6 +2236,7 @@ Packages: list
  libpam-mklocaluser
  libpam-sss
  libnss-sss
+ gosa-desktop
  krb5-auth-dialog
 
 Task: education-standalone
@@ -2372,7 +2371,6 @@ Packages: list
  kdenlive
  gcompris
  inkscape
- gosa-desktop
  libreoffice-l10n-el
  libreoffice-l10n-de
  libreoffice-l10n-fr
@@ -2700,7 +2698,6 @@ Packages: list
  kdenlive
  gcompris
  inkscape
- gosa-desktop
  libreoffice-l10n-el
  libreoffice-l10n-de
  libreoffice-l10n-fr
@@ -2853,6 +2850,7 @@ Packages: list
  gtk-recordmydesktop
  pavucontrol
  goplay
+ gosa-desktop
  krb5-auth-dialog
  jxplorer
 
diff --git a/debian/control b/debian/control
index 232f104..27c8ffa 100644
--- a/debian/control
+++ b/debian/control
@@ -412,7 +412,6 @@ Recommends: alsa-utils,
  gnupg-agent,
  gnupg2 | gnupg,
  goplay,
- gosa-desktop,
  gsfonts-x11,
  gtk-recordmydesktop,
  hunspell-de-de,
@@ -1363,6 +1362,7 @@ Architecture: any
 Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: education-desktop-other,
  education-networked-common,
+ gosa-desktop,
  krb5-auth-dialog,
  libnss-mdns,
  libnss-sss,
@@ -1420,6 +1420,7 @@ Architecture: any
 Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: education-desktop-other,
  education-networked,
+ gosa-desktop,
  jxplorer,
  krb5-auth-dialog
 Suggests: kredentials

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