[debian-edu-commits] [Git][debian-edu/debian-edu][master] 3 commits: tasks/main-server: Replace icinga with icinga2. (Closes: #933260)

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu


Commits:
c27f9aef by Wolfgang Schweer at 2019-07-28T15:03:51Z
tasks/main-server: Replace icinga with icinga2. (Closes: #933260)

Thanks to Bas Couwenberg.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
252ef82e by Wolfgang Schweer at 2019-07-28T15:04:45Z
debian/control: Updated after running 'make dist'.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
255d5a71 by Wolfgang Schweer at 2019-07-28T15:06:24Z
Start on 2.11.1 as Debian 11 Bullseye is targeted.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


3 changed files:

- debian/changelog
- debian/control
- tasks/main-server


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,14 @@
-debian-edu (2.10.48) UNRELEASED; urgency=medium
+debian-edu (2.11.1) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * Bump standards version to 4.4.0, no changes needed.
 
+  [ Wolfgang Schweer ]
+  * Start on 2.11.1 as Debian 11 Bullseye is targeted.
+  * tasks/main-server: Replace icinga with icinga2. (Closes: #933260)
+    Thanks to Bas Couwenberg.
+  * debian/control: Update after running 'make dist'.
+
  -- Holger Levsen <holger at debian.org>  Sun, 07 Jul 2019 17:59:29 +0200
 
 debian-edu (2.10.47) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
  Wolfgang Schweer <wschweer at arcor.de>,
  Dominik George <nik at naturalnet.de>
 Build-Depends: debhelper-compat (= 11), blends-dev
-Standards-Version: 4.4.0
+Standards-Version: 4.3.0
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu
 Vcs-Browser: https://salsa.debian.org/debian-edu/debian-edu
@@ -334,7 +334,6 @@ Recommends: cheese,
             freerdp2-x11 | rdesktop,
             gimp,
             gimp-data-extras,
-            gimp-ufraw,
             gtk-recordmydesktop,
             inkscape,
             ocrad,
@@ -356,6 +355,7 @@ Suggests: auctex,
           fonts-arphic-uming,
           fonts-mlym,
           gettext,
+          gimp-ufraw,
           gnuplot,
           gosa-desktop,
           gv,
@@ -710,7 +710,7 @@ Recommends: apache2,
             gosa-plugin-sudo,
             gosa-plugin-sudo-schema,
             gosa-schema,
-            icinga,
+            icinga2,
             iptables,
             isc-dhcp-server-ldap,
             krb5-admin-server,
@@ -808,7 +808,6 @@ Architecture: any
 Depends: ${misc:Depends},
          education-tasks (= ${binary:Version})
 Recommends: education-menus,
-            goplay,
             laby,
             planner,
             scratch,
@@ -816,6 +815,7 @@ Recommends: education-menus,
             tilp2,
             vym
 Suggests: freeplane,
+          goplay,
           jclic
 Description: Debian Edu miscellaneous applications for education
  This metapackage depends on miscellaneous applications that can be useful
@@ -837,7 +837,6 @@ Recommends: audacious,
             lingot,
             lmms,
             mcp-plugins,
-            musescore,
             nted,
             pianobooster,
             qsynth,
@@ -848,7 +847,8 @@ Recommends: audacious,
             timgm6mb-soundfont,
             tuxguitar
 Suggests: festival,
-          lilypond
+          lilypond,
+          musescore
 Description: Debian Edu music and sound applications
  This metapackage depends on various applications that can be used to
  teach music.


=====================================
tasks/main-server
=====================================
@@ -113,7 +113,7 @@ Recommends:
 NeedConfig: yes - done automatically by preseeding sitesummary
 
 Recommends:
- icinga,
+ icinga2,
  monitoring-plugins-standard,
  nagios-nrpe-plugin,
 NeedConfig: yes - done via preseeding: icingaadmin password, enable cgi.



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/a8604993c819f5e892bdee58b34e1d21d90f6012...255d5a71a9a7f5fb31393dad204e905a0725cf0d

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/a8604993c819f5e892bdee58b34e1d21d90f6012...255d5a71a9a7f5fb31393dad204e905a0725cf0d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20190728/8ae3f10e/attachment-0001.html>