[debian-edu-commits] [Git][debian-edu/debian-edu][master] 9 commits: debian/control: Update after running 'make dist'.

Holger Levsen gitlab at salsa.debian.org
Thu Oct 3 09:10:07 BST 2019



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


Commits:
0b5c8f48 by Holger Levsen at 2019-10-03T07:42:32Z
debian/control: Update after running 'make dist'.

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

- - - - -
09766cf7 by Holger Levsen at 2019-10-03T07:43:47Z
Bump standards version to 4.4.1, no changes needed.

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

- - - - -
9cd68e34 by Holger Levsen at 2019-10-03T07:45:02Z
drop versioning on dependency on tasksel.

>= 3.23 is fulfilled since jessie.

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

- - - - -
e8f1eaa8 by Holger Levsen at 2019-10-03T07:50:52Z
Add sources.list.bullseye and make sources.list.UNRELEASED symlink point to it.

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

- - - - -
a45c72ed by Holger Levsen at 2019-10-03T07:52:55Z
Drop sources.list.stretch and sources.list.jessie.

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

- - - - -
9d338310 by Holger Levsen at 2019-10-03T07:55:00Z
sources.list.buster: drop commented out entry for ftp.skolelinux.org as wheezy was the last release that used that service.

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

- - - - -
a3228c5b by Holger Levsen at 2019-10-03T07:59:36Z
Update d/copyright for the two previous changes.

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

- - - - -
e6e8c0fb by Holger Levsen at 2019-10-03T08:01:14Z
Update d/README.source as well

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

- - - - -
478d5e50 by Holger Levsen at 2019-10-03T08:02:37Z
release as 2.11.3

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

- - - - -


10 changed files:

- debian/README.source
- debian/changelog
- debian/control
- debian/control.stub
- debian/copyright
- sources.list.UNRELEASED
- + sources.list.bullseye
- sources.list.buster
- − sources.list.jessie
- − sources.list.stretch


Changes:

=====================================
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
=====================================
@@ -1,3 +1,18 @@
+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 at 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 at debian.org>,
  Wolfgang Schweer <wschweer at arcor.de>,
  Dominik George <nik at 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 at debian.org>,
  Wolfgang Schweer <wschweer at arcor.de>,
  Dominik George <nik at 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
=====================================
@@ -1 +1 @@
-sources.list.buster
\ No newline at end of file
+sources.list.bullseye
\ No newline at end of file


=====================================
sources.list.bullseye
=====================================
@@ -0,0 +1,2 @@
+# Use bullseye as final target for Debian Edu metapackages
+deb http://deb.debian.org/debian/ bullseye main contrib non-free


=====================================
sources.list.buster
=====================================
@@ -1,3 +1,2 @@
 # 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 deleted
=====================================
@@ -1,2 +0,0 @@
-# Use jessie as final target for Debian Edu metapackages
-deb http://deb.debian.org/debian/ jessie main contrib non-free


=====================================
sources.list.stretch deleted
=====================================
@@ -1,3 +0,0 @@
-# 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



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/fa5d3bf5cb6b952e9e59a7d56683057fb99cbddf...478d5e50fa155b2e90bb8333fb9620379ca8b685

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/fa5d3bf5cb6b952e9e59a7d56683057fb99cbddf...478d5e50fa155b2e90bb8333fb9620379ca8b685
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/20191003/2e4e95fa/attachment-0001.html>


More information about the debian-edu-commits mailing list