[debian-edu-commits] debian-edu/ 03/03: Update after running 'make' dist; add changelog entries.

[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 a05bd62d402ea0729600fb946919675b5972230c
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Aug 27 15:59:40 2016 +0200

    Update after running 'make' dist; add changelog entries.
---
 debian-edu-tasks.desc |  8 ++++----
 debian/changelog      |  8 ++++++++
 debian/control        | 32 ++++++++++++++++----------------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index aa620d3..a51413d 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -344,10 +344,10 @@ Key:
 Task: education-networked
 Parent: debian-edu
 Section: debian-edu
-Description: Debian Edu networked minimal packages
- A metapackage containing dependencies for packages required on all
- networked installations (workstation and main-server, but not
- standalone) in the Debian Edu Blend.
+Description: Debian Edu network packages
+ A metapackage containing dependencies for packages required on
+ network installations (with the exception of roaming workstation
+ and minimal) in the Debian Edu Blend.
 Test-new-install: mark show
 Test-edu-profile: Minimal Workstation Main-Server Thin-Client-Server
 Key: 
diff --git a/debian/changelog b/debian/changelog
index 1f79893..c599f1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu (1.905) UNRELEASED; urgency=medium
+
+  * Adjust d/control.stub Uploaders field as d/control is generated.
+  * tasks/desktop-gnome: Replace libreoffice-gtk2 with libreoffice-gtk3.
+  * Update after running 'make dist'.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sat, 27 Aug 2016 15:36:56 +0200
+
 debian-edu (1.904) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/debian/control b/debian/control
index 89eb9ec..3d75f0c 100644
--- a/debian/control
+++ b/debian/control
@@ -205,7 +205,7 @@ Recommends: education-common,
  libreoffice-calc,
  libreoffice-draw,
  libreoffice-gnome,
- libreoffice-gtk,
+ libreoffice-gtk3,
  libreoffice-impress,
  libreoffice-java-common,
  libreoffice-math,
@@ -250,6 +250,7 @@ Recommends: ark,
  kde-l10n-nl,
  kde-l10n-ptbr,
  kde-l10n-sv,
+ kde-spectacle,
  kde-standard,
  kdeaccessibility,
  kdeedu,
@@ -274,7 +275,6 @@ Recommends: ark,
  korganizer,
  krdc,
  krfb,
- ksnapshot,
  ksshaskpass | ssh-askpass,
  kturtle,
  kwalletmanager,
@@ -342,7 +342,7 @@ Recommends: education-common,
  libreoffice-base,
  libreoffice-calc,
  libreoffice-draw,
- libreoffice-gtk,
+ libreoffice-gtk2,
  libreoffice-impress,
  libreoffice-java-common,
  libreoffice-math,
@@ -851,6 +851,8 @@ Recommends: apache2,
  gosa-plugin-sudo,
  gosa-plugin-sudo-schema,
  gosa-schema,
+ icinga2,
+ icinga2-classicui,
  iptables,
  isc-dhcp-server-ldap,
  krb5-admin-server,
@@ -863,9 +865,9 @@ Recommends: apache2,
  links,
  makepasswd,
  memtest86+,
+ monitoring-plugins-standard,
  munin,
  nagios-nrpe-plugin,
- nagios-plugins-standard,
  nfs-kernel-server,
  ntp,
  openssl,
@@ -897,8 +899,6 @@ Suggests: apache2-doc,
  libsasl2-modules-ldap,
  mdns-scan,
  mysql-client,
- nagios3,
- nagios3-doc,
  nfs-server,
  nslint,
  ocsinventory-reports,
@@ -985,7 +985,6 @@ Architecture: any
 Depends: education-tasks (= ${binary:Version})
 Recommends: audacious,
  audacity,
- denemo,
  education-menus,
  fluid-soundfont-gm,
  fluidsynth,
@@ -1000,8 +999,10 @@ Recommends: audacious,
  qsynth,
  rosegarden,
  solfege,
- swh-plugins
+ swh-plugins,
+ terminatorx
 Suggests: beast,
+ denemo,
  festival,
  freebirth,
  kguitar,
@@ -1009,7 +1010,6 @@ Suggests: beast,
  lilypond,
  noteedit,
  score-reading-trainer,
- terminatorx,
  ultrastar-ng-xine
 Description: Debian Edu music and sound applications
  This metapackage depends on various applications that can be used to
@@ -1024,10 +1024,10 @@ Recommends: education-networked-common,
  libpam-krb5,
  network-manager,
  nscd
-Description: Debian Edu networked minimal packages
- A metapackage containing dependencies for packages required on all
- networked installations (workstation and main-server, but not
- standalone) in the Debian Edu Blend.
+Description: Debian Edu network packages
+ A metapackage containing dependencies for packages required on
+ network installations (with the exception of roaming workstation
+ and minimal) in the Debian Edu Blend.
 
 Package: education-networked-common
 Section: metapackages
@@ -1062,10 +1062,10 @@ Suggests: cifs-utils,
  nscd,
  ntp-doc,
  ocsinventory-agent
-Description: Debian Edu networked minimal packages
+Description: Debian Edu common networking packages
  A metapackage containing dependencies for packages required on all
- networked installations (workstation and main-server, but not
- standalone) in the Debian Edu Blend.
+ network installations (workstation, roaming workstation, minimal
+ and main-server, but not standalone) in the Debian Edu Blend.
 
 Package: education-physics
 Section: metapackages

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