[debian-edu-commits] [Git][debian-edu/debian-edu][master] 4 commits: tasks/main-server: recommend debian-installer-12-netboot-* and 11 anymore.

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian Edu / debian-edu


Commits:
c34049f5 by Holger Levsen at 2022-12-17T21:30:38+01:00
tasks/main-server: recommend debian-installer-12-netboot-* and 11 anymore.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
c886f15f by Holger Levsen at 2022-12-17T21:34:21+01:00
Bump standards version to 4.6.2, no changes needed.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
0a1926a0 by Holger Levsen at 2022-12-17T21:36:45+01:00
d/control: updated after running 'make dist', bringing back scribus and openboard, and taking away openuniverse

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
6091e7ed by Holger Levsen at 2022-12-17T21:38:00+01:00
release as 2.12.11

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


4 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,13 @@
-debian-edu (2.12.11) UNRELEASED; urgency=medium
+debian-edu (2.12.11) unstable; urgency=medium
 
-  * d/control: updated after running 'make dist', bringing back audacity.
+  * tasks/main-server: recommend debian-installer-12-netboot-* and not *11*
+    anymore.
+  * d/control:
+    - bump standards version to 4.6.2, no changes needed.
+    - updated after running 'make dist', bringing back audacity, scribus and
+      openboard, and taking away openuniverse.
 
- -- Holger Levsen <holger at debian.org>  Mon, 24 Oct 2022 23:58:40 +0200
+ -- Holger Levsen <holger at debian.org>  Sat, 17 Dec 2022 21:36:55 +0100
 
 debian-edu (2.12.10) 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 (= 13), blends-dev, debhelper
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu.git
 Vcs-Browser: https://salsa.debian.org/debian-edu/debian-edu
@@ -44,12 +44,12 @@ Depends: ${misc:Depends},
 Recommends: education-menus,
             gpredict,
             kstars,
-            openuniverse,
             stellarium,
             xplanet,
             xplanet-images
 Suggests: astronomical-almanac,
           lightspeed,
+          openuniverse,
           sunclock,
           xtide,
           xtide-data
@@ -347,6 +347,7 @@ Recommends: cheese,
             gimp-data-extras,
             inkscape,
             ocrad,
+            openboard,
             openclipart,
             openclipart-libreoffice,
             plymouth,
@@ -395,7 +396,6 @@ Suggests: auctex,
           monopd,
           ncftp,
           netpbm,
-          openboard,
           postgresql,
           postgresql-client,
           pppoeconf,
@@ -552,10 +552,10 @@ Recommends: dia,
             inkscape,
             librecad,
             pencil2d,
+            scribus,
             xpaint
 Suggests: blender,
           hugin,
-          scribus,
           tgif,
           xaos,
           xfig
@@ -688,8 +688,8 @@ Recommends: apache2,
             cups,
             cups-bsd,
             cups-pdf,
-            debian-installer-11-netboot-amd64,
-            debian-installer-11-netboot-i386,
+            debian-installer-12-netboot-amd64,
+            debian-installer-12-netboot-i386,
             dovecot-gssapi,
             dovecot-imapd,
             education-networked,


=====================================
debian/control.stub
=====================================
@@ -8,7 +8,7 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
  Wolfgang Schweer <wschweer at arcor.de>,
  Dominik George <nik at naturalnet.de>
 Build-Depends: debhelper-compat (= 13), blends-dev, debhelper
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu.git
 Vcs-Browser: https://salsa.debian.org/debian-edu/debian-edu


=====================================
tasks/main-server
=====================================
@@ -35,8 +35,8 @@ NeedConfig: yes - touch the corresponding bind zone file
 
 Recommends:
  isc-dhcp-server-ldap,
- debian-installer-11-netboot-i386,
- debian-installer-11-netboot-amd64,
+ debian-installer-12-netboot-i386,
+ debian-installer-12-netboot-amd64,
  tftpd-hpa,
  ipxe,
 NeedConfig: yes - set local IP range, DNS name and default routing



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/2bcaed067f9f4d4c5e655c409ee6d349de3b4a89...6091e7ed92d08954eab1410861884f21d669917f

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/2bcaed067f9f4d4c5e655c409ee6d349de3b4a89...6091e7ed92d08954eab1410861884f21d669917f
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/20221217/9832aa4a/attachment-0001.htm>