[debian-edu-commits] [Git][debian-edu/debian-edu-artwork][master] Adjust dependencies and related files after moving configuration to d-e-config

[Wolfgang Schweer]

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


Commits:
64392212 by Wolfgang Schweer at 2020-11-25T11:27:44+01:00
Adjust dependencies and related files after moving configuration to d-e-config

Drop dependency on libglib2.0-bin now that schema files are gone.

Cleanup debian/update-debian-edu-artwork-{buster,softwaves} from now superfluous code.
(Actually unneeded anyway because installing schema files triggers compiling.)

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

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/update-debian-edu-artwork-buster
- debian/update-debian-edu-artwork-softwaves


Changes:

=====================================
debian/changelog
=====================================
@@ -7,8 +7,13 @@ debian-edu-artwork (2.11.0.2-3) UNRELEASED; urgency=medium
   * debian/control: Use https://blends.debian.org/edu as homepage.
   * Drop both Mate desktop environment and Gdm login configuration from
     art-common. These non-artwork items moved to d-e-config as a better suited
-    place. Adjust configure.ac, debian/debian-edu-artwork.install and all
-    involved Makefile.am files.
+    place.
+    - Adjust configure.ac, debian/debian-edu-artwork.install and all
+      involved Makefile.am files.
+    - Drop dependency on libglib2.0-bin now that schema files are gone.
+    - Cleanup debian/update-debian-edu-artwork-{buster,softwaves} from now
+      superfluous code.
+
   * Drop debian/debian-edu-artwork{-buster,-softlines}.lintian-overrides files.
     These are no longer needed / now unknown to Lintian because a NEWS file
     exists. (Making an upstream changelog file superfluous.)


=====================================
debian/control
=====================================
@@ -28,7 +28,6 @@ Depends: ${misc:Depends},
          debian-edu-artwork-buster | debian-edu-artwork-softwaves,
          desktop-base,
          libconfig-inifiles-perl,
-         libglib2.0-bin,
 Suggests: debian-edu-artwork-spacefun
 Enhances: gdm3,
           lightdm,


=====================================
debian/update-debian-edu-artwork-buster
=====================================
@@ -100,13 +100,6 @@ restore_desktop_background() {
     done
 }
 
-## Wallpaper
-compile_gschemas() {
-    if [ -d /usr/share/glib-2.0/schemas/ ] && [ -x /usr/bin/glib-compile-schemas ]; then
-        glib-compile-schemas /usr/share/glib-2.0/schemas/
-    fi
-}
-
 ## Plymouth
 set_plymouth_theme() {
     if [ -f /etc/plymouth/plymouthd.conf ] && [ -f /etc/debian-edu/config ] && which plymouth-set-default-theme > /dev/null ; then
@@ -143,7 +136,6 @@ case "$1" in
 		set_active_theme
 		change_grub_background
 		change_desktop_background
-		compile_gschemas
 		set_plymouth_theme
 		set_lockscreen
 	;;
@@ -151,7 +143,6 @@ case "$1" in
 		restore_active_theme
 		restore_grub_background
 		restore_desktop_background
-		compile_gschemas
 		restore_lockscreen
 	;;
 esac


=====================================
debian/update-debian-edu-artwork-softwaves
=====================================
@@ -102,13 +102,6 @@ restore_desktop_background() {
     done
 }
 
-## Wallpaper
-compile_gschemas() {
-    if [ -d /usr/share/glib-2.0/schemas/ ] && [ -x /usr/bin/glib-compile-schemas ]; then
-        glib-compile-schemas /usr/share/glib-2.0/schemas/
-    fi
-}
-
 ## Plymouth
 set_plymouth_theme() {
     if [ -f /etc/plymouth/plymouthd.conf ] && [ -f /etc/debian-edu/config ] && which plymouth-set-default-theme > /dev/null ; then
@@ -145,7 +138,6 @@ case "$1" in
 		set_active_theme
 		change_grub_background
 		change_desktop_background
-		compile_gschemas
 		set_plymouth_theme
 		set_lockscreen
 	;;
@@ -153,7 +145,6 @@ case "$1" in
 		restore_active_theme
 		restore_grub_background
 		restore_desktop_background
-		compile_gschemas
 		restore_lockscreen
 	;;
 esac



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/-/commit/6439221280c06eb6c302fac1c412fb469465eb39

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/-/commit/6439221280c06eb6c302fac1c412fb469465eb39
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/20201125/be6071dc/attachment-0001.html>