[debian-edu-commits] [Git][debian-edu/debian-edu][master] 6 commits: Add sources.list.bookworm, drop sources.list.buster

[Wolfgang Schweer (@schweer-guest)]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu


Commits:
9aee1174 by Wolfgang Schweer at 2021-08-15T12:05:43+02:00
Add sources.list.bookworm, drop sources.list.buster

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

- - - - -
e15d0cd5 by Wolfgang Schweer at 2021-08-15T12:06:58+02:00
Adjust the sources.list.UNRELEASED symlink (bullseye -> bookworm)

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

- - - - -
c6124ce7 by Wolfgang Schweer at 2021-08-15T12:09:46+02:00
Ajust debian/{README.source, copyright} to match the changes

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

- - - - -
9c95ac8f by Wolfgang Schweer at 2021-08-15T12:11:36+02:00
Replace sddm-theme-elarun with sddm-theme-debian elarun

This way the SDDM login background respects the desktop-base settings

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

- - - - -
fc14a69f by Wolfgang Schweer at 2021-08-15T12:15:34+02:00
Merge branch 'master' of salsa.debian.org:debian-edu/debian-edu

- - - - -
12ca9b7d by Wolfgang Schweer at 2021-08-15T12:32:58+02:00
Add debian/changelog entries for last commits

Update debian/control after running 'make dist'.

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

- - - - -


8 changed files:

- debian/README.source
- debian/changelog
- debian/control
- debian/copyright
- sources.list.UNRELEASED
- + sources.list.bookworm
- − sources.list.buster
- tasks/desktop-kde


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 bullseye atm), since it is used
+(UNRELEASED is not allowed, it should be bookworm 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,15 @@
+debian-edu (2.12.1) UNRELEASED; urgency=medium
+
+  * Start on 2.12.1 as Debian 12 (bookworm) is targeted.
+  * Add sources.list.bookworm, drop sources.list.buster.
+  * Adjust the sources.list.UNRELEASED symlink (bullseye -> bookworm).
+  * Ajust debian/{README.source, copyright} to match the changes.
+  * tasks/desktop-kde: Replace sddm-theme-elarun with sddm-theme-debian elarun
+    to let the SDDM login background respect the desktop-base settings.
+  * debian/control: Update after running 'make dist'.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 15 Aug 2021 12:16:55 +0200
+
 debian-edu (2.11.37) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/control
=====================================
@@ -234,7 +234,7 @@ Recommends: education-astronomy,
             kdegraphics-thumbnailers,
             kdeutils,
             kio-audiocd,
-            sddm-theme-elarun,
+            sddm-theme-debian-elarun,
             task-kde-desktop
 Suggests: education-development,
           education-primaryschool,


=====================================
debian/copyright
=====================================
@@ -57,8 +57,8 @@ Files: debian/*
  menus/applications-merged/science.menu
  menus/applications-merged/video.menu
  menus/is-enabled
+ sources.list.bookworm
  sources.list.bullseye
- sources.list.buster
  sources.list.README
  sources.list.stable
  sources.list.unstable


=====================================
sources.list.UNRELEASED
=====================================
@@ -1 +1 @@
-sources.list.bullseye
\ No newline at end of file
+sources.list.bookworm
\ No newline at end of file


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


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


=====================================
tasks/desktop-kde
=====================================
@@ -13,7 +13,7 @@ Recommends:
 
 Recommends:
  task-kde-desktop,
- sddm-theme-elarun,
+ sddm-theme-debian-elarun,
 
 Recommends:
  kio-audiocd,



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/0c186f46d726411e434da4142dcbf26da46cf295...12ca9b7d1c54664d60aa1fd499899629a631491b

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/0c186f46d726411e434da4142dcbf26da46cf295...12ca9b7d1c54664d60aa1fd499899629a631491b
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/20210815/d2c2c322/attachment-0001.htm>