[debian-edu-commits] debian-edu/ 01/01: Adjust KDE Plasma related code now that desktop-base uses alternatives.
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Sun Dec 18 15:48:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
schweer-guest pushed a commit to branch master
in repository debian-edu-artwork.
commit e8a9e643254e7c52dd4bffc4551e193d8e1404bb
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Sun Dec 18 16:44:06 2016 +0100
Adjust KDE Plasma related code now that desktop-base uses alternatives.
Drop KDE plasma desktop configuration script: the one shipped with
desktop-base 9.0.0 is sufficient now that alternatives is usable via
active-theme. Adjust various files to reflect this change.
Make sure the previosly needed link to the configuration file gets
removed upon upgrades.
---
art-lines/desktop-base/20-desktop-base-edu.js | 13 -------------
art-lines/desktop-base/Makefile.am | 6 +-----
art-softwaves/desktop-base/20-desktop-base-edu.js | 13 -------------
art-softwaves/desktop-base/Makefile.am | 6 +-----
art-spacefun/desktop-base/20-desktop-base-edu.js | 13 -------------
art-spacefun/desktop-base/Makefile.am | 6 +-----
debian/changelog | 8 ++++++--
debian/debian-edu-artwork-lines.install | 1 -
debian/debian-edu-artwork-softwaves.install | 1 -
debian/debian-edu-artwork-spacefun.install | 1 -
debian/debian-edu-artwork.postinst | 3 +++
debian/debian-edu-artwork.postrm | 7 -------
debian/update-debian-edu-artwork-lines | 17 -----------------
debian/update-debian-edu-artwork-softwaves | 17 -----------------
debian/update-debian-edu-artwork-spacefun | 17 -----------------
15 files changed, 12 insertions(+), 117 deletions(-)
diff --git a/art-lines/desktop-base/20-desktop-base-edu.js b/art-lines/desktop-base/20-desktop-base-edu.js
deleted file mode 100644
index e84e917..0000000
--- a/art-lines/desktop-base/20-desktop-base-edu.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Placed in /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/
-//
-// This script is run once for each user and it sets the default wallpaper
-// for all activities
-
-d = desktops()
-
-for (i in d) {
- d[i].wallpaperPlugin = 'org.kde.image'
- d[i].currentConfigGroup = Array('Wallpaper', 'org.kde.image', 'General')
- d[i].writeConfig('Image', 'Debian-Edu-Lines')
- d[i].writeConfig('FillMode', '2') //enables croping
-}
diff --git a/art-lines/desktop-base/Makefile.am b/art-lines/desktop-base/Makefile.am
index c592e90..194c0ce 100644
--- a/art-lines/desktop-base/Makefile.am
+++ b/art-lines/desktop-base/Makefile.am
@@ -25,9 +25,6 @@ loginimg_DATA = $(LOGINIMG)
grubimgdir = $(datadir)/desktop-base/debian-edu-$(THEME)-theme/grub/
grubimg_DATA = $(GRUBIMG) grub_background.sh
-kdeplasmadir = $(datadir)/debian-edu-artwork-$(THEME)/kde4/apps/plasma-desktop/init/
-kdeplasma_DATA = 20-desktop-base-edu.js
-
# Build rules for PNG files using the SVG files as source.
grub-4x3.png: grub-4x3.svg
inkscape -z -e $@ $^
@@ -45,8 +42,7 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)$(wallpaperimgdir)
$(mkinstalldirs) $(DESTDIR)$(loginimgdir)
$(mkinstalldirs) $(DESTDIR)$(grubimgdir)
- $(mkinstalldirs) $(DESTDIR)$(kdeplasmadir)
-EXTRA_DIST = $(wallpaper_DATA) $(wallpaperimg_DATA) $(loginimg_DATA) $(grubimg_DATA) $(kdeplasma_DATA)
+EXTRA_DIST = $(wallpaper_DATA) $(wallpaperimg_DATA) $(loginimg_DATA) $(grubimg_DATA)
CLEANFILES = grub-4x3.png grub-16x9.png
diff --git a/art-softwaves/desktop-base/20-desktop-base-edu.js b/art-softwaves/desktop-base/20-desktop-base-edu.js
deleted file mode 100644
index b621ae0..0000000
--- a/art-softwaves/desktop-base/20-desktop-base-edu.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Placed in /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/
-//
-// This script is run once for each user and it sets the default wallpaper
-// for all activities
-
-d = desktops()
-
-for (i in d) {
- d[i].wallpaperPlugin = 'org.kde.image'
- d[i].currentConfigGroup = Array('Wallpaper', 'org.kde.image', 'General')
- d[i].writeConfig('Image', 'Debian-Edu-SoftWaves')
- d[i].writeConfig('FillMode', '2') //enables croping
-}
diff --git a/art-softwaves/desktop-base/Makefile.am b/art-softwaves/desktop-base/Makefile.am
index 755eccb..19b94dd 100644
--- a/art-softwaves/desktop-base/Makefile.am
+++ b/art-softwaves/desktop-base/Makefile.am
@@ -26,9 +26,6 @@ loginimg_DATA = $(LOGINIMG)
grubimgdir = $(datadir)/desktop-base/debian-edu-$(THEME)-theme/grub/
grubimg_DATA = $(GRUBIMG) grub_background.sh
-kdeplasmadir = $(datadir)/debian-edu-artwork-$(THEME)/kde4/apps/plasma-desktop/init/
-kdeplasma_DATA = 20-desktop-base-edu.js
-
# Build rules for PNG files using the SVG files as source.
grub-4x3.png: grub-4x3.svg
inkscape -z -e $@ $^
@@ -46,8 +43,7 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)$(wallpaperimgdir)
$(mkinstalldirs) $(DESTDIR)$(loginimgdir)
$(mkinstalldirs) $(DESTDIR)$(grubimgdir)
- $(mkinstalldirs) $(DESTDIR)$(kdeplasmadir)
-EXTRA_DIST = $(wallpaper_DATA) $(wallpaperimg_DATA) $(loginimg_DATA) $(grubimg_DATA) $(kdeplasma_DATA)
+EXTRA_DIST = $(wallpaper_DATA) $(wallpaperimg_DATA) $(loginimg_DATA) $(grubimg_DATA)
CLEANFILES = grub-4x3.png grub-16x9.png
diff --git a/art-spacefun/desktop-base/20-desktop-base-edu.js b/art-spacefun/desktop-base/20-desktop-base-edu.js
deleted file mode 100644
index 224e42c..0000000
--- a/art-spacefun/desktop-base/20-desktop-base-edu.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Placed in /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/
-//
-// This script is run once for each user and it sets the default wallpaper
-// for all activities
-
-d = desktops()
-
-for (i in d) {
- d[i].wallpaperPlugin = 'org.kde.image'
- d[i].currentConfigGroup = Array('Wallpaper', 'org.kde.image', 'General')
- d[i].writeConfig('Image', 'Debian-Edu-Spacefun')
- d[i].writeConfig('FillMode', '2') //enables croping
-}
diff --git a/art-spacefun/desktop-base/Makefile.am b/art-spacefun/desktop-base/Makefile.am
index 69005a5..1ef41f2 100644
--- a/art-spacefun/desktop-base/Makefile.am
+++ b/art-spacefun/desktop-base/Makefile.am
@@ -26,15 +26,11 @@ loginimg_DATA = $(LOGINIMG)
grubimgdir = $(datadir)/desktop-base/debian-edu-$(THEME)-theme/grub/
grubimg_DATA = $(GRUBIMG) grub_background.sh
-kdeplasmadir = $(datadir)/debian-edu-artwork-$(THEME)/kde4/apps/plasma-desktop/init/
-kdeplasma_DATA = 20-desktop-base-edu.js
-
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(wallpaperdir)
$(mkinstalldirs) $(DESTDIR)$(wallpaperimgdir)
$(mkinstalldirs) $(DESTDIR)$(loginimgdir)
$(mkinstalldirs) $(DESTDIR)$(grubimgdir)
- $(mkinstalldirs) $(DESTDIR)$(kdeplasmadir)
-EXTRA_DIST = $(wallpaper_DATA) $(wallpaperimg_DATA) $(loginimg_DATA) $(grubimg_DATA) $(kdeplasma_DATA)
+EXTRA_DIST = $(wallpaper_DATA) $(wallpaperimg_DATA) $(loginimg_DATA) $(grubimg_DATA)
diff --git a/debian/changelog b/debian/changelog
index 7d82f59..3eb8b94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,14 +10,18 @@ debian-edu-artwork (0.902-1) UNRELEASED; urgency=medium
- Drop diversion for the desktop-login-background.svg, use alternatives.
- Add alternatives configuration for desktop-theme and desktop-grub.
- Make sure that no longer needed symlinks get removed upon upgrades.
+ - Drop KDE plasma desktop configuration script: the one shipped with
+ desktop-base 9.0.0 is sufficient now that alternatives is usable via
+ active-theme. Adjust various files to reflect this change.
* Make d-e-a depend upon desktop-base version >= 9.0.0.
* Make d-e-a-spacefun work with desktop-base 9.0.0 too, but using PNG files
except for the desktop-login-background (SVG file available).
* Add SVG image for the installer menu background based upon syslinux.svg
from the desktop-base package as the grub background image shows too
many artefacts.
- * d-e-a.postinst: Remove no longer needed link to PXE background image (now
- managed via 'active-theme' alternatives) upon upgrades.
+ * d-e-a.postinst: Remove no longer needed links to PXE background image and
+ to KDE plasma config script (now managed via 'active-theme' alternatives)
+ upon upgrades.
* Fix debian-edu-artwork.(postinst|postrm); thanks again to Andreas Beckmann
for hints and explanations. (Closes: #847279).
diff --git a/debian/debian-edu-artwork-lines.install b/debian/debian-edu-artwork-lines.install
index 2a4c744..7d1a3d1 100644
--- a/debian/debian-edu-artwork-lines.install
+++ b/debian/debian-edu-artwork-lines.install
@@ -1,4 +1,3 @@
-usr/share/debian-edu-artwork-lines/
usr/share/desktop-base/debian-edu-lines-theme/
usr/share/ldm/themes/debian-edu-lines/
usr/share/pixmaps/debian-edu-lines*
diff --git a/debian/debian-edu-artwork-softwaves.install b/debian/debian-edu-artwork-softwaves.install
index 0471d2e..47fc3c7 100644
--- a/debian/debian-edu-artwork-softwaves.install
+++ b/debian/debian-edu-artwork-softwaves.install
@@ -1,4 +1,3 @@
-usr/share/debian-edu-artwork-softwaves/
usr/share/desktop-base/debian-edu-softwaves-theme/
usr/share/ldm/themes/debian-edu-softwaves/
usr/share/pixmaps/debian-edu-softwaves*
diff --git a/debian/debian-edu-artwork-spacefun.install b/debian/debian-edu-artwork-spacefun.install
index 102f1ff..8f20036 100644
--- a/debian/debian-edu-artwork-spacefun.install
+++ b/debian/debian-edu-artwork-spacefun.install
@@ -1,4 +1,3 @@
-usr/share/debian-edu-artwork-spacefun/
usr/share/desktop-base/debian-edu-spacefun-theme/
usr/share/ldm/themes/debian-edu-spacefun/
usr/share/pixmaps/debian-edu-spacefun*
diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index 64b6c03..1c4c99a 100755
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -21,6 +21,9 @@ case "$1" in
if [ -h /usr/share/images/desktop-base/debian-edu-pxe.png ] ; then
rm -f /usr/share/images/desktop-base/debian-edu-pxe.png
fi
+ if [ -h /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/20-desktop-base-edu.js ] ; then
+ rm -f /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/20-desktop-base-edu.js
+ fi
fi
;;
esac
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index f9006c4..eb491d1 100755
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -9,12 +9,6 @@ restore_plymouth_theme() {
fi
}
-unlink_desktop_base_edu_js() {
- if [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] ; then
- rm -f /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js
- fi
-}
-
unlink_login_background() {
if [ -h /usr/share/images/desktop-base/login-background.svg ] ; then
rm -f /usr/share/images/desktop-base/login-background.svg
@@ -25,7 +19,6 @@ if [ "$1" = remove ]; then
dpkg-divert --package debian-edu-artwork --rename \
--remove /usr/share/gnome-shell/theme/gnome-shell.css
restore_plymouth_theme
- unlink_desktop_base_edu_js
unlink_login_background
update-alternatives --auto desktop-login-background
fi
diff --git a/debian/update-debian-edu-artwork-lines b/debian/update-debian-edu-artwork-lines
index 0ebe3fe..27793c6 100755
--- a/debian/update-debian-edu-artwork-lines
+++ b/debian/update-debian-edu-artwork-lines
@@ -123,21 +123,6 @@ unlink_gnome_shell_css() {
fi
}
-symlink_kde_base_edu_js() {
- if [ -f /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
- [ -d /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/ ]; then
- ln -fs /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/
- fi
-}
-
-unlink_kde_base_edu_js() {
- if [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
- [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
- [ "$(readlink /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates//20-desktop-base-edu.js)" = "/usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js" ]; then
- rm -f /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js
- fi
-}
-
## Plymouth
set_plymouth_theme() {
if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
@@ -159,7 +144,6 @@ case "$1" in
change_desktop_background
compile_gschemas
set_plymouth_theme
- symlink_kde_base_edu_js
symlink_gnome_shell_css
;;
remove)
@@ -168,7 +152,6 @@ case "$1" in
restore_grub_background
restore_desktop_background
compile_gschemas
- unlink_kde_base_edu_js
unlink_gnome_shell_css
;;
esac
diff --git a/debian/update-debian-edu-artwork-softwaves b/debian/update-debian-edu-artwork-softwaves
index 71a2908..1e610b0 100755
--- a/debian/update-debian-edu-artwork-softwaves
+++ b/debian/update-debian-edu-artwork-softwaves
@@ -125,21 +125,6 @@ unlink_gnome_shell_css() {
fi
}
-symlink_kde_base_edu_js() {
- if [ -f /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
- [ -d /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/ ]; then
- ln -fs /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/
- fi
-}
-
-unlink_kde_base_edu_js() {
- if [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
- [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
- [ "$(readlink /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates//20-desktop-base-edu.js)" = "/usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js" ]; then
- rm -f /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js
- fi
-}
-
## Plymouth
set_plymouth_theme() {
if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
@@ -161,7 +146,6 @@ case "$1" in
change_desktop_background
compile_gschemas
set_plymouth_theme
- symlink_kde_base_edu_js
symlink_gnome_shell_css
;;
remove)
@@ -170,7 +154,6 @@ case "$1" in
restore_grub_background
restore_desktop_background
compile_gschemas
- unlink_kde_base_edu_js
unlink_gnome_shell_css
;;
esac
diff --git a/debian/update-debian-edu-artwork-spacefun b/debian/update-debian-edu-artwork-spacefun
index 40c66f7..8b6a1bd 100755
--- a/debian/update-debian-edu-artwork-spacefun
+++ b/debian/update-debian-edu-artwork-spacefun
@@ -125,21 +125,6 @@ unlink_gnome_shell_css() {
fi
}
-symlink_kde_base_edu_js() {
- if [ -f /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
- [ -d /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/ ]; then
- ln -fs /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/
- fi
-}
-
-unlink_kde_base_edu_js() {
- if [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
- [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
- [ "$(readlink /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates//20-desktop-base-edu.js)" = "/usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js" ]; then
- rm -f /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js
- fi
-}
-
## Plymouth
set_plymouth_theme() {
if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
@@ -161,7 +146,6 @@ case "$1" in
change_desktop_background
compile_gschemas
set_plymouth_theme
- symlink_kde_base_edu_js
symlink_gnome_shell_css
;;
remove)
@@ -170,7 +154,6 @@ case "$1" in
restore_grub_background
restore_desktop_background
compile_gschemas
- unlink_kde_base_edu_js
unlink_gnome_shell_css
;;
esac
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git
More information about the debian-edu-commits
mailing list