debian/README.source

@@ -29,7 +29,7 @@ file should not be checked into Git.  Then use for instance
 debuild / pdebuild (but not git-buildpackage) to build the package.
 
 The distribution field in debian/changelog has to have a valid value
-(UNRELEASED is not allowed, it should be jessie atm), since it is used
+(UNRELEASED is not allowed, it should be bullseye atm), since it is used
 (directly from Git) for the CD and DVD builds.
 
 This is documented in more detail in the documentation from blends-dev

debian/changelog

+debian-edu (2.11.3) unstable; urgency=medium
+
+  * Add sources.list.bullseye and make sources.list.UNRELEASED symlink point
+    to it.
+  * Drop sources.list.stretch and sources.list.jessie.
+  * Update d/copyright and d/README.source for the two previous changes.
+  * sources.list.buster: drop commented out entry for ftp.skolelinux.org as
+    wheezy was the last release that used that service.
+  * d/control:
+    - bump standards version to 4.4.1, no changes needed.
+    - drop versioning on dependency on tasksel.
+    - update after running 'make dist'.
+
+ -- Holger Levsen <holger@debian.org>  Thu, 03 Oct 2019 09:02:04 +0100
+
 debian-edu (2.11.2) unstable; urgency=medium
 
   [ Wolfgang Schweer ]

debian/control

@@ -9,7 +9,7 @@ Uploaders: Petter Reinholdtsen <pere@debian.org>,
  Wolfgang Schweer <wschweer@arcor.de>,
  Dominik George <nik@naturalnet.de>
 Build-Depends: debhelper-compat (= 12), blends-dev
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu
 Vcs-Browser: https://salsa.debian.org/debian-edu/debian-edu
@@ -20,7 +20,7 @@ Package: education-tasks
 Section: misc
 Architecture: any
 Multi-Arch: same
-Depends: tasksel (>= 3.23),
+Depends: tasksel,
  ${misc:Depends}
 Description: Debian Edu tasks for tasksel
  This package provides Debian Edu tasks in tasksel.
@@ -69,8 +69,7 @@ Section: metapackages
 Architecture: any
 Depends: ${misc:Depends},
          education-tasks (= ${binary:Version})
-Recommends: avogadro,
-            chemtool,
+Recommends: chemtool,
             easychem,
             education-menus,
             gchempaint,
@@ -79,7 +78,8 @@ Recommends: avogadro,
             kalzium,
             pymol,
             viewmol
-Suggests: rasmol
+Suggests: avogadro,
+          rasmol
 Description: Debian Edu chemistry related applications
  This metapackage depends on various applications that can be used to
  teach chemistry.
@@ -452,7 +452,6 @@ Recommends: anjuta,
             build-essential,
             bwbasic,
             codeblocks,
-            ddd,
             drpython,
             education-menus,
             fp-compiler,
@@ -484,7 +483,8 @@ Recommends: anjuta,
             subversion,
             thonny,
             umbrello
-Suggests: swi-prolog,
+Suggests: ddd,
+          swi-prolog,
           swi-prolog-doc,
           tcl8.6-dev,
           tk8.6-dev
@@ -550,13 +550,13 @@ Recommends: dia,
             education-menus,
             gimp,
             inkscape,
-            librecad,
             pencil2d,
-            scribus,
             xpaint
 Suggests: blender,
           hugin,
+          librecad,
           pinta,
+          scribus,
           tgif,
           xaos,
           xfig
@@ -717,7 +717,6 @@ Recommends: apache2,
             krb5-kdc,
             krb5-kdc-ldap,
             ldap2zone,
-            libapache2-mod-auth-kerb,
             libnss3-tools,
             libsasl2-modules-gssapi-mit,
             links,
@@ -750,6 +749,7 @@ Suggests: apache2-doc,
           dovecot-pop3d,
           dsh,
           krb5-doc,
+          libapache2-mod-auth-kerb,
           libsasl2-modules-ldap,
           nslint,
           ocsinventory-reports,
@@ -833,9 +833,7 @@ Recommends: audacious,
             fluidsynth,
             freebirth,
             gtick,
-            hydrogen,
             lingot,
-            lmms,
             mcp-plugins,
             nted,
             pianobooster,
@@ -847,7 +845,9 @@ Recommends: audacious,
             timgm6mb-soundfont,
             tuxguitar
 Suggests: festival,
+          hydrogen,
           lilypond,
+          lmms,
           musescore
 Description: Debian Edu music and sound applications
  This metapackage depends on various applications that can be used to
@@ -1073,10 +1073,10 @@ Depends: ${misc:Depends},
 Recommends: ffmpeg,
             gstreamer1.0-plugins-ugly,
             kdenlive,
-            openshot,
             stopmotion
 Suggests: kino,
           libdvdcss2,
+          openshot,
           pitivi,
           xine-ui
 Description: Debian Edu video applications

debian/control.stub

@@ -8,7 +8,7 @@ Uploaders: Petter Reinholdtsen <pere@debian.org>,
  Wolfgang Schweer <wschweer@arcor.de>,
  Dominik George <nik@naturalnet.de>
 Build-Depends: debhelper-compat (= 12), blends-dev
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu
 Vcs-Browser: https://salsa.debian.org/debian-edu/debian-edu
@@ -19,7 +19,7 @@ Package: education-tasks
 Section: misc
 Architecture: any
 Multi-Arch: same
-Depends: tasksel (>= 3.23),
+Depends: tasksel,
  ${misc:Depends}
 Description: Debian Edu tasks for tasksel
  This package provides Debian Edu tasks in tasksel.

debian/copyright

@@ -57,11 +57,10 @@ Files: debian/*
  menus/applications-merged/science.menu
  menus/applications-merged/video.menu
  menus/is-enabled
+ sources.list.bullseye
  sources.list.buster
- sources.list.jessie
  sources.list.README
  sources.list.stable
- sources.list.stretch
  sources.list.unstable
  tasks/lang-ja-desktop
  tasks/lang-da-desktop

sources.list.UNRELEASED

-sources.list.buster
\ No newline at end of file
+sources.list.bullseye
\ No newline at end of file

sources.list.bullseye

+# Use bullseye as final target for Debian Edu metapackages
+deb http://deb.debian.org/debian/ bullseye main contrib non-free

sources.list.buster

 # Use buster as final target for Debian Edu metapackages
 deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb http://ftp.skolelinux.org/skolelinux/ buster-test local

sources.list.jessie

-# Use jessie as final target for Debian Edu metapackages
-deb http://deb.debian.org/debian/ jessie main contrib non-free

sources.list.stretch

-# Use stretch as final target for Debian Edu metapackages
-deb http://deb.debian.org/debian/ stretch main contrib non-free
-#deb http://ftp.skolelinux.org/skolelinux/ stretch-test local