[debian-edu-commits] debian-edu/ 07/09: debian: Add new binary package debian-edu-artwork-softwaves, remove d-e-a-joy and d-e-a-spacefun.
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Fri Oct 28 15:48:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
schweer-guest pushed a commit to branch schweer/softwaves
in repository debian-edu-artwork.
commit f66e1af1a87a8606ba06f7ededf29040e18fa792
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Fri Oct 28 16:36:34 2016 +0200
debian: Add new binary package debian-edu-artwork-softwaves, remove d-e-a-joy and d-e-a-spacefun.
---
debian/control | 24 +--
debian/debian-edu-artwork-joy.install | 10 --
debian/debian-edu-artwork-joy.manpages | 1 -
debian/debian-edu-artwork-joy.postinst | 11 --
debian/debian-edu-artwork-lines.install | 6 +-
debian/debian-edu-artwork-softwaves.install | 8 +
debian/debian-edu-artwork-softwaves.manpages | 1 +
...tinst => debian-edu-artwork-softwaves.postinst} | 2 +-
...oy.prerm => debian-edu-artwork-softwaves.prerm} | 2 +-
debian/debian-edu-artwork-spacefun.install | 10 --
debian/debian-edu-artwork-spacefun.manpages | 1 -
debian/debian-edu-artwork-spacefun.prerm | 11 --
debian/debian-edu-artwork.install | 1 +
debian/debian-edu-artwork.links | 1 -
debian/debian-edu-artwork.postrm | 10 +-
debian/debian-edu-artwork.preinst | 4 -
debian/rules | 7 +-
debian/update-debian-edu-artwork-joy.8 | 38 -----
debian/update-debian-edu-artwork-lines | 57 ++++----
debian/update-debian-edu-artwork-lines.8 | 4 +-
...ork-joy => update-debian-edu-artwork-softwaves} | 91 ++++++------
...fun.8 => update-debian-edu-artwork-softwaves.8} | 14 +-
debian/update-debian-edu-artwork-spacefun | 161 ---------------------
23 files changed, 110 insertions(+), 365 deletions(-)
diff --git a/debian/control b/debian/control
index dd93c55..eab0285 100644
--- a/debian/control
+++ b/debian/control
@@ -24,14 +24,14 @@ Vcs-git: git://anonscm.debian.org/debian-edu/debian-edu-artwork.git
Package: debian-edu-artwork
Architecture: all
Depends: ${misc:Depends},
- debian-edu-artwork-lines | debian-edu-artwork-joy | debian-edu-artwork-spacefun,
+ debian-edu-artwork-softwaves | debian-edu-artwork-lines,
desktop-base,
libconfig-inifiles-perl,
libglib2.0-bin,
Enhances: gdm3,
- kdm,
ldm,
- lightdm
+ lightdm,
+ slim
Description: Debian Edu themes and artwork
This package contains a collection of images, themes, wallpapers and splash
screens for use with Debian Edu.
@@ -50,26 +50,14 @@ Description: Debian Edu Lines (jessie) themes and artwork
.
This package contains all files for the Debian Edu Lines (jessie) artwork.
-Package: debian-edu-artwork-joy
+Package: debian-edu-artwork-softwaves
Architecture: all
Depends: ${misc:Depends},
debian-edu-artwork,
Breaks: debian-edu-artwork (<< 0.46~)
Replaces: debian-edu-artwork (<< 0.46~)
-Description: Debian Edu Joy (wheezy) themes and artwork
+Description: Debian Edu softwaves (stretch) themes and artwork
The Debian Edu Artwork package set provides a collection of images, themes,
wallpapers and splash screens for use with Debian Edu.
.
- This package contains all files for the Debian Edu Joy (wheezy) artwork.
-
-Package: debian-edu-artwork-spacefun
-Architecture: all
-Depends: ${misc:Depends},
- debian-edu-artwork,
-Breaks: debian-edu-artwork (<< 0.46~)
-Replaces: debian-edu-artwork (<< 0.46~)
-Description: Debian Edu Spacefun (squeeze) themes and artwork
- The Debian Edu Artwork packages provide a collection of images, themes,
- wallpapers and splash screens for use with Debian Edu.
- .
- This package contains all files for the Debian Edu Spacefun (squeeze) artwork.
+ This package contains all files for the Debian Edu softwaves (stretch) artwork.
diff --git a/debian/debian-edu-artwork-joy.install b/debian/debian-edu-artwork-joy.install
deleted file mode 100644
index 3a0900d..0000000
--- a/debian/debian-edu-artwork-joy.install
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/share/debian-edu-artwork-joy/
-usr/share/images/desktop-base/debian-edu-joy*
-usr/share/kde4/apps/kdm/themes/debian-edu-joy/
-usr/share/kde4/apps/ksplash/Themes/Debian-Edu-Joy/
-usr/share/ldm/themes/debian-edu-joy/
-usr/share/pixmaps/debian-edu-joy*.png
-usr/share/pixmaps/splash/debian-edu-joy*.png
-usr/share/wallpapers/Debian-Edu-Joy/
-debian/update-debian-edu-artwork-joy /usr/sbin/
-usr/share/gnome-shell/theme/debian-edu-joy*
\ No newline at end of file
diff --git a/debian/debian-edu-artwork-joy.manpages b/debian/debian-edu-artwork-joy.manpages
deleted file mode 100644
index d4b6058..0000000
--- a/debian/debian-edu-artwork-joy.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/update*joy.8
\ No newline at end of file
diff --git a/debian/debian-edu-artwork-joy.postinst b/debian/debian-edu-artwork-joy.postinst
deleted file mode 100755
index f1df9fe..0000000
--- a/debian/debian-edu-artwork-joy.postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-set -e
-
-#DEBHELPER#
-
-case "$1" in
- configure)
- update-debian-edu-artwork-joy configure
- ;;
-esac
diff --git a/debian/debian-edu-artwork-lines.install b/debian/debian-edu-artwork-lines.install
index 0363f51..4d3929b 100644
--- a/debian/debian-edu-artwork-lines.install
+++ b/debian/debian-edu-artwork-lines.install
@@ -1,10 +1,8 @@
usr/share/debian-edu-artwork-lines/
usr/share/images/desktop-base/debian-edu-lines*
-usr/share/kde4/apps/kdm/themes/debian-edu-lines/
-usr/share/kde4/apps/ksplash/Themes/Debian-Edu-Lines/*
usr/share/ldm/themes/debian-edu-lines/
-usr/share/pixmaps/debian-edu-lines*.png
-usr/share/pixmaps/splash/debian-edu-lines*.png
+usr/share/pixmaps/debian-edu-lines*
+usr/share/plymouth/themes/debian-edu-lines/
usr/share/wallpapers/Debian-Edu-Lines/
debian/update-debian-edu-artwork-lines /usr/sbin/
usr/share/gnome-shell/theme/debian-edu-lines*
diff --git a/debian/debian-edu-artwork-softwaves.install b/debian/debian-edu-artwork-softwaves.install
new file mode 100644
index 0000000..badeaca
--- /dev/null
+++ b/debian/debian-edu-artwork-softwaves.install
@@ -0,0 +1,8 @@
+usr/share/debian-edu-artwork-softwaves/
+usr/share/images/desktop-base/debian-edu-softwaves*
+usr/share/ldm/themes/debian-edu-softwaves/
+usr/share/pixmaps/debian-edu-softwaves*
+usr/share/plymouth/themes/debian-edu-softwaves/
+usr/share/wallpapers/Debian-Edu-SoftWaves/
+debian/update-debian-edu-artwork-softwaves /usr/sbin/
+usr/share/gnome-shell/theme/debian-edu-softwaves*
diff --git a/debian/debian-edu-artwork-softwaves.manpages b/debian/debian-edu-artwork-softwaves.manpages
new file mode 100644
index 0000000..603206e
--- /dev/null
+++ b/debian/debian-edu-artwork-softwaves.manpages
@@ -0,0 +1 @@
+debian/update*softwaves.8
\ No newline at end of file
diff --git a/debian/debian-edu-artwork-spacefun.postinst b/debian/debian-edu-artwork-softwaves.postinst
similarity index 58%
rename from debian/debian-edu-artwork-spacefun.postinst
rename to debian/debian-edu-artwork-softwaves.postinst
index 79827cd..6cc99d5 100755
--- a/debian/debian-edu-artwork-spacefun.postinst
+++ b/debian/debian-edu-artwork-softwaves.postinst
@@ -6,6 +6,6 @@ set -e
case "$1" in
configure)
- update-debian-edu-artwork-spacefun configure
+ update-debian-edu-artwork-softwaves configure
;;
esac
diff --git a/debian/debian-edu-artwork-joy.prerm b/debian/debian-edu-artwork-softwaves.prerm
similarity index 60%
rename from debian/debian-edu-artwork-joy.prerm
rename to debian/debian-edu-artwork-softwaves.prerm
index 7f69c54..998457f 100755
--- a/debian/debian-edu-artwork-joy.prerm
+++ b/debian/debian-edu-artwork-softwaves.prerm
@@ -4,7 +4,7 @@ set -e
case "$1" in
remove)
- update-debian-edu-artwork-joy $1
+ update-debian-edu-artwork-softwaves $1
;;
esac
diff --git a/debian/debian-edu-artwork-spacefun.install b/debian/debian-edu-artwork-spacefun.install
deleted file mode 100644
index 11e0ef3..0000000
--- a/debian/debian-edu-artwork-spacefun.install
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/share/debian-edu-artwork-spacefun/
-usr/share/images/desktop-base/debian-edu-spacefun*
-usr/share/kde4/apps/kdm/themes/debian-edu-spacefun/
-usr/share/kde4/apps/ksplash/Themes/Debian-Edu-Spacefun/
-usr/share/ldm/themes/debian-edu-spacefun/
-usr/share/pixmaps/debian-edu-spacefun*.png
-usr/share/pixmaps/splash/debian-edu-spacefun*.png
-usr/share/wallpapers/Debian-Edu-Spacefun/
-debian/update-debian-edu-artwork-spacefun /usr/sbin/
-usr/share/gnome-shell/theme/debian-edu-spacefun*
\ No newline at end of file
diff --git a/debian/debian-edu-artwork-spacefun.manpages b/debian/debian-edu-artwork-spacefun.manpages
deleted file mode 100644
index 271ebce..0000000
--- a/debian/debian-edu-artwork-spacefun.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/update*spacefun.8
\ No newline at end of file
diff --git a/debian/debian-edu-artwork-spacefun.prerm b/debian/debian-edu-artwork-spacefun.prerm
deleted file mode 100755
index 62d3f8d..0000000
--- a/debian/debian-edu-artwork-spacefun.prerm
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
- remove)
- update-debian-edu-artwork-spacefun $1
- ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/debian-edu-artwork.install b/debian/debian-edu-artwork.install
index 496fa7f..470bca9 100644
--- a/debian/debian-edu-artwork.install
+++ b/debian/debian-edu-artwork.install
@@ -2,3 +2,4 @@ etc/
usr/share/glib-2.0/
usr/share/mate-panel/
usr/share/gdm/
+
diff --git a/debian/debian-edu-artwork.links b/debian/debian-edu-artwork.links
index 09ca74b..a29a486 100644
--- a/debian/debian-edu-artwork.links
+++ b/debian/debian-edu-artwork.links
@@ -1,3 +1,2 @@
usr/share/images/desktop-base/login-background.svg.edu-diverted usr/share/images/desktop-base/login-background.svg
-usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js.edu-diverted usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js
usr/share/gnome-shell/theme/gnome-shell.css.edu-diverted usr/share/gnome-shell/theme/gnome-shell.css
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index ad1c7cd..a20dd69 100755
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -2,13 +2,19 @@
set -e
+restore_plymouth_theme() {
+ if which plymouth-set-default-theme > /dev/null ; then
+ plymouth-set-default-theme -r || true
+ update-initramfs -u -k all
+ fi
+}
+
if [ "$1" = remove ]; then
dpkg-divert --package debian-edu-artwork --rename \
--remove /usr/share/images/desktop-base/login-background.svg
dpkg-divert --package debian-edu-artwork --rename \
- --remove /usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js
- dpkg-divert --package debian-edu-artwork --rename \
--remove /usr/share/gnome-shell/theme/gnome-shell.css
+ restore_plymouth_theme
fi
#DEBHELPER#
diff --git a/debian/debian-edu-artwork.preinst b/debian/debian-edu-artwork.preinst
index 647addf..37fd2ff 100755
--- a/debian/debian-edu-artwork.preinst
+++ b/debian/debian-edu-artwork.preinst
@@ -9,10 +9,6 @@ if [ "$1" = install ] || [ $1 = upgrade ]; then
/usr/share/images/desktop-base/login-background.svg
dpkg-divert --package debian-edu-artwork \
--rename \
- --divert /usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js.edu-diverted \
- /usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js
- dpkg-divert --package debian-edu-artwork \
- --rename \
--divert /usr/share/gnome-shell/theme/gnome-shell.css.edu-diverted \
/usr/share/gnome-shell/theme/gnome-shell.css
fi
diff --git a/debian/rules b/debian/rules
index 26bff93..3a28b49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,12 +14,9 @@ DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp
DEB_DH_BUILDDEB_ARGS = -- -Zxz
sbindir := /usr/sbin/
-install/debian-edu-artwork-joy::
+install/debian-edu-artwork-softwaves::
install -d debian/$(cdbs_curpkg)$(sbindir)
- install debian/update-debian-edu-artwork-joy debian/$(cdbs_curpkg)$(sbindir)
-install/debian-edu-artwork-spacefun::
- install -d debian/$(cdbs_curpkg)$(sbindir)
- install debian/update-debian-edu-artwork-spacefun debian/$(cdbs_curpkg)$(sbindir)
+ install debian/update-debian-edu-artwork-softwaves debian/$(cdbs_curpkg)$(sbindir)
install/debian-edu-artwork-lines::
install -d debian/$(cdbs_curpkg)$(sbindir)
install debian/update-debian-edu-artwork-lines debian/$(cdbs_curpkg)$(sbindir)
diff --git a/debian/update-debian-edu-artwork-joy.8 b/debian/update-debian-edu-artwork-joy.8
deleted file mode 100644
index 19fa8d5..0000000
--- a/debian/update-debian-edu-artwork-joy.8
+++ /dev/null
@@ -1,38 +0,0 @@
-'\" -*- coding: utf-8 -*-
-.if \n(.g .ds T< \\FC
-.if \n(.g .ds T> \\F[\n[.fam]]
-.de URL
-\\$2 \(la\\$1\(ra\\$3
-..
-.if \n(.g .mso www.tmac
-.TH update-debian-edu-artwork-joy 8 "June 2014" "Debian Edu"
-.SH NAME
-update-debian-edu-artwork-joy \- Enable/disable Debian Edu Joy themes system-wide
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-\fBupdate-debian-edu-artwork-joy\fR \kx
-.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
-'in \n(.iu+\nxu
-{
-\fIconfigure\fR
-|
-\fIremove\fR
-}
-'in \n(.iu-\nxu
-.ad b
-'hy
-.SH DESCRIPTION
-\fBupdate-debian-edu-artwork-joy\fR \fIconfigure\fR enables the Debian Edu Joy theming (as shipped with Debian Edu wheezy)
-system-wide (several login managers, KDE splash, KDE theme, background for all desktops, MATE theme and panel layout,
-GRUB boot loader, etc.pp.).
-.PP
-\fBupdate-debian-edu-artwork-joy\fR \fIremove\fR disables the Debian Edu themes and switches back to Debian's default
-themes (from package \fIdesktop-base\fR).
-.SH "SEE ALSO"
-\fBupdate-debian-edu-artwork-spacefun\fR
-.SH AUTHOR
-This manual has been written by for the Debian Edu project by
-
-Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/debian/update-debian-edu-artwork-lines b/debian/update-debian-edu-artwork-lines
index 36f1e13..159c256 100755
--- a/debian/update-debian-edu-artwork-lines
+++ b/debian/update-debian-edu-artwork-lines
@@ -20,10 +20,13 @@ change_grub_background() {
update-alternatives --install \
/usr/share/images/desktop-base/desktop-grub.png \
desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png $priority
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-grub.png $priority
update-alternatives --set desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png
- ln -sf debian-edu-${EDUTHEME}-splash.png /usr/share/pixmaps/splash/debian-edu-splash.png
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-grub.png
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-grub.png \
+ desktop-grub \
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-grub_1920x1080.png 20
if which update-grub2 > /dev/null ; then
sync
update-grub2 || true
@@ -32,9 +35,9 @@ change_grub_background() {
restore_grub_background() {
update-alternatives --remove desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png
- rm -f /usr/share/pixmaps/splash/debian-edu-splash.png
-
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-grub.png
+ update-alternatives --remove desktop-grub \
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-grub_1920x1080.png
if which update-grub2 > /dev/null ; then
update-grub2 || true
fi
@@ -55,9 +58,9 @@ change_desktop_background() {
update-alternatives --set desktop-background.xml \
/usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml
- for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper_1280x1024.svg \
+ for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper_1024x768.svg \
debian-edu-${EDUTHEME}-wallpaper_1600x1200.svg \
- debian-edu-${EDUTHEME}-wallpaper_1920x1080.svg \
+ debian-edu-${EDUTHEME}-wallpaper_1280x1024.svg \
debian-edu-${EDUTHEME}-wallpaper_1920x1200.svg \
debian-edu-${EDUTHEME}-wallpaper_2560x1080.svg; do
update-alternatives --install \
@@ -75,9 +78,9 @@ restore_desktop_background() {
desktop-background.xml \
/usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml
- for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper_1280x1024.svg \
+ for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper_1024x768.svg \
debian-edu-${EDUTHEME}-wallpaper_1600x1200.svg \
- debian-edu-${EDUTHEME}-wallpaper_1920x1080.svg \
+ debian-edu-${EDUTHEME}-wallpaper_1280x1024.svg \
debian-edu-${EDUTHEME}-wallpaper_1920x1200.svg \
debian-edu-${EDUTHEME}-wallpaper_2560x1080.svg; do
update-alternatives --remove desktop-background \
@@ -86,20 +89,6 @@ restore_desktop_background() {
}
## Wallpaper
-change_ksplash() {
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-splash \
- desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.svg 55
- update-alternatives --set desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.svg
-}
-
-restore_ksplash() {
- update-alternatives --remove desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.svg
-}
-
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/
@@ -108,7 +97,7 @@ compile_gschemas() {
symlink_login_background() {
if [ -f /usr/share/images/desktop-base/login-background.svg.edu-diverted ]; then
- ln -fs /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-login+grub.svg /usr/share/images/desktop-base/login-background.svg
+ ln -fs /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-login.svg /usr/share/images/desktop-base/login-background.svg
fi
}
@@ -126,25 +115,34 @@ unlink_gnome_shell_css() {
}
symlink_kde_base_edu_js() {
- if [ -f /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ]; then
- ln -fs /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js /usr/share/kde4/apps/plasma-desktop/init/
+ 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 ] && \
- [ "$(readlink /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js)" = "/usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js" ]; then
+ [ -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 which plymouth-set-default-theme > /dev/null ; then
+ plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
+ fi
+}
+
case "$1" in
configure)
change_ldm_background
change_grub_background
change_desktop_background
- change_ksplash
compile_gschemas
+ set_plymouth_theme
symlink_login_background
symlink_kde_base_edu_js
symlink_gnome_shell_css
@@ -153,7 +151,6 @@ case "$1" in
restore_ldm_background
restore_grub_background
restore_desktop_background
- restore_ksplash
compile_gschemas
unlink_kde_base_edu_js
unlink_gnome_shell_css
diff --git a/debian/update-debian-edu-artwork-lines.8 b/debian/update-debian-edu-artwork-lines.8
index 99a1aa5..f0af88d 100644
--- a/debian/update-debian-edu-artwork-lines.8
+++ b/debian/update-debian-edu-artwork-lines.8
@@ -31,8 +31,8 @@ GRUB boot loader, etc.pp.).
\fBupdate-debian-edu-artwork-lines\fR \fIremove\fR disables the Debian Edu themes and switches back to Debian's default
themes (from package \fIdesktop-base\fR).
.SH "SEE ALSO"
-\fBupdate-debian-edu-artwork-spacefun\fR
+\fBupdate-debian-edu-artwork-sharp\fR
.SH AUTHOR
-This manual has been written by for the Debian Edu project by
+This manual has been written for the Debian Edu project by
Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/debian/update-debian-edu-artwork-joy b/debian/update-debian-edu-artwork-softwaves
similarity index 55%
rename from debian/update-debian-edu-artwork-joy
rename to debian/update-debian-edu-artwork-softwaves
index 516edd7..f7427e9 100755
--- a/debian/update-debian-edu-artwork-joy
+++ b/debian/update-debian-edu-artwork-softwaves
@@ -1,7 +1,7 @@
#! /bin/sh
set -e
-EDUTHEME="joy"
+EDUTHEME="softwaves"
change_ldm_background() {
update-alternatives --install /usr/share/ldm/themes/default \
@@ -20,10 +20,13 @@ change_grub_background() {
update-alternatives --install \
/usr/share/images/desktop-base/desktop-grub.png \
desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png $priority
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-grub.png $priority
update-alternatives --set desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png
- ln -sf debian-edu-${EDUTHEME}-splash.png /usr/share/pixmaps/splash/debian-edu-splash.png
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-grub.png
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-grub.png \
+ desktop-grub \
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-grub_1920x1080.png 20
if which update-grub2 > /dev/null ; then
sync
update-grub2 || true
@@ -32,9 +35,9 @@ change_grub_background() {
restore_grub_background() {
update-alternatives --remove desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png
- rm -f /usr/share/pixmaps/splash/debian-edu-splash.png
-
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-grub.png
+ update-alternatives --remove desktop-grub \
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-grub_1920x1080.png
if which update-grub2 > /dev/null ; then
update-grub2 || true
fi
@@ -45,9 +48,9 @@ change_desktop_background() {
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
- /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.svg 75
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper_1920x1080.svg 75
update-alternatives --set desktop-background \
- /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.svg
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper_1920x1080.svg
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background.xml \
desktop-background.xml \
@@ -55,11 +58,11 @@ change_desktop_background() {
update-alternatives --set desktop-background.xml \
/usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml
- for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper01_1280x1024.svg \
- debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg \
- debian-edu-${EDUTHEME}-wallpaper01_1920x1080.svg \
- debian-edu-${EDUTHEME}-wallpaper01_1920x1200.svg \
- debian-edu-${EDUTHEME}-wallpaper01_1280x1024.svg; do
+ for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper_1024x768.svg \
+ debian-edu-${EDUTHEME}-wallpaper_1600x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper_1280x1024.svg \
+ debian-edu-${EDUTHEME}-wallpaper_1920x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper_2560x1080.svg; do
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
@@ -70,36 +73,22 @@ change_desktop_background() {
restore_desktop_background() {
update-alternatives --remove \
desktop-background \
- /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.svg
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper_1920x1080.svg
update-alternatives --remove \
desktop-background.xml \
/usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml
- for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper01_1280x1024.svg \
- debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg \
- debian-edu-${EDUTHEME}-wallpaper01_1920x1080.svg \
- debian-edu-${EDUTHEME}-wallpaper01_1920x1200.svg \
- debian-edu-${EDUTHEME}-wallpaper01_1280x1024.svg; do
+ for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper_1024x768.svg \
+ debian-edu-${EDUTHEME}-wallpaper_1600x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper_1280x1024.svg \
+ debian-edu-${EDUTHEME}-wallpaper_1920x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper_2560x1080.svg; do
update-alternatives --remove desktop-background \
/usr/share/images/desktop-base/$WALLPAPER
done
}
## Wallpaper
-change_ksplash() {
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-splash \
- desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.svg 55
- update-alternatives --set desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.svg
-}
-
-restore_ksplash() {
- update-alternatives --remove desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.svg
-}
-
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/
@@ -108,43 +97,52 @@ compile_gschemas() {
symlink_login_background() {
if [ -f /usr/share/images/desktop-base/login-background.svg.edu-diverted ]; then
- ln -fs /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper02_1600x1200.svg /usr/share/images/desktop-base/login-background.svg
+ ln -fs /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-login.svg /usr/share/images/desktop-base/login-background.svg
fi
}
symlink_gnome_shell_css() {
- if [ -f /usr/share/gnome-shell/theme/gnome-shell.css.edu-diverted ]; then
- ln -fs /usr/share/gnome-shell/theme/debian-edu-${EDUTHEME}-gnome-shell.css /usr/share/gnome-shell/theme/gnome-shell.css
- fi
+ if [ -f /usr/share/gnome-shell/theme/gnome-shell.css.edu-diverted ]; then
+ ln -fs /usr/share/gnome-shell/theme/debian-edu-${EDUTHEME}-gnome-shell.css /usr/share/gnome-shell/theme/gnome-shell.css
+ fi
}
unlink_gnome_shell_css() {
- if [ -h /usr/share/gnome-shell/theme/gnome-shell.css ] && \
- [ "$(readlink /usr/share/gnome-shell/theme/gnome-shell.css)" = "/usr/share/gnome-shell/theme/debian-edu-${EDUTHEME}-gnome-shell.css" ]; then
- rm -f /usr/share/gnome-shell/theme/gnome-shell.css
- fi
+ if [ -h /usr/share/gnome-shell/theme/gnome-shell.css ] && \
+ [ "$(readlink /usr/share/gnome-shell/theme/gnome-shell.css)" = "/usr/share/gnome-shell/theme/debian-edu-${EDUTHEME}-gnome-shell.css" ]; then
+ rm -f /usr/share/gnome-shell/theme/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 ]; then
- ln -fs /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js /usr/share/kde4/apps/plasma-desktop/init/
+ 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 ] && \
- [ "$(readlink /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js)" = "/usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js" ]; then
+ [ -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 which plymouth-set-default-theme > /dev/null ; then
+ plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
+ fi
+}
+
case "$1" in
configure)
change_ldm_background
change_grub_background
change_desktop_background
- change_ksplash
compile_gschemas
+ set_plymouth_theme
symlink_login_background
symlink_kde_base_edu_js
symlink_gnome_shell_css
@@ -153,7 +151,6 @@ case "$1" in
restore_ldm_background
restore_grub_background
restore_desktop_background
- restore_ksplash
compile_gschemas
unlink_kde_base_edu_js
unlink_gnome_shell_css
diff --git a/debian/update-debian-edu-artwork-spacefun.8 b/debian/update-debian-edu-artwork-softwaves.8
similarity index 50%
rename from debian/update-debian-edu-artwork-spacefun.8
rename to debian/update-debian-edu-artwork-softwaves.8
index 65b8773..3577897 100644
--- a/debian/update-debian-edu-artwork-spacefun.8
+++ b/debian/update-debian-edu-artwork-softwaves.8
@@ -5,14 +5,14 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH update-debian-edu-artwork-spacefun 8 "June 2014" "Debian Edu"
+.TH update-debian-edu-artwork-softwaves 8 "September 2014" "Debian Edu"
.SH NAME
-update-debian-edu-artwork-spacefun \- Enable/disable Debian Edu Spacefun themes system-wide
+update-debian-edu-artwork-softwaves \- Enable/disable Debian Edu softwaves themes system-wide
.SH SYNOPSIS
'nh
.fi
.ad l
-\fBupdate-debian-edu-artwork-spacefun\fR \kx
+\fBupdate-debian-edu-artwork-softwaves\fR \kx
.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
'in \n(.iu+\nxu
{
@@ -24,15 +24,15 @@ update-debian-edu-artwork-spacefun \- Enable/disable Debian Edu Spacefun themes
.ad b
'hy
.SH DESCRIPTION
-\fBupdate-debian-edu-artwork-spacefun\fR \fIconfigure\fR enables the Debian Edu Spacefun theming (as shipped with Debian Edu wheezy)
+\fBupdate-debian-edu-artwork-softwaves\fR \fIconfigure\fR enables the Debian Edu softwaves theming (as shipped with Debian Edu Jessie)
system-wide (several login managers, KDE splash, KDE theme, background for all desktops, MATE theme and panel layout,
GRUB boot loader, etc.pp.).
.PP
-\fBupdate-debian-edu-artwork-spacefun\fR \fIremove\fR disables the Debian Edu themes and switches back to Debian's default
+\fBupdate-debian-edu-artwork-softwaves\fR \fIremove\fR disables the Debian Edu themes and switches back to Debian's default
themes (from package \fIdesktop-base\fR).
.SH "SEE ALSO"
-\fBupdate-debian-edu-artwork-joy\fR
+\fBupdate-debian-edu-artwork-lines\fR
.SH AUTHOR
-This manual has been written by for the Debian Edu project by
+This manual has been written for the Debian Edu project by
Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/debian/update-debian-edu-artwork-spacefun b/debian/update-debian-edu-artwork-spacefun
deleted file mode 100755
index 7fa3804..0000000
--- a/debian/update-debian-edu-artwork-spacefun
+++ /dev/null
@@ -1,161 +0,0 @@
-#! /bin/sh
-set -e
-
-EDUTHEME="spacefun"
-
-change_ldm_background() {
- update-alternatives --install /usr/share/ldm/themes/default \
- ldm-theme /usr/share/ldm/themes/debian-edu-${EDUTHEME} 85
- update-alternatives --set ldm-theme \
- /usr/share/ldm/themes/debian-edu-${EDUTHEME}
-}
-
-restore_ldm_background() {
- update-alternatives --remove ldm-theme /usr/share/ldm/themes/debian-edu-${EDUTHEME}
-}
-
-
-## GRUB
-change_grub_background() {
- priority=50 # value higher than 20 used for ${EDUTHEME}-grub.png in desktop-base
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-grub.png \
- desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png $priority
- update-alternatives --set desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png
- ln -sf debian-edu-${EDUTHEME}-splash.png /usr/share/pixmaps/splash/debian-edu-splash.png
- if which update-grub2 > /dev/null ; then
- sync
- update-grub2 || true
- fi
-}
-
-restore_grub_background() {
- update-alternatives --remove desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png
- rm -f /usr/share/pixmaps/splash/debian-edu-splash.png
-
- if which update-grub2 > /dev/null ; then
- update-grub2 || true
- fi
-}
-
-## Wallpaper
-change_desktop_background() {
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-background \
- desktop-background \
- /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.png 75
- update-alternatives --set desktop-background \
- /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.png
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-background.xml \
- desktop-background.xml \
- /usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml 20
- update-alternatives --set desktop-background.xml \
- /usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml
- for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper01_1280x1024.png \
- debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg \
- debian-edu-${EDUTHEME}-wallpaper01_1600x1200.png \
- debian-edu-${EDUTHEME}-wallpaper01_1920x1080.png \
- debian-edu-${EDUTHEME}-wallpaper01_1920x1200.png; do
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-background \
- desktop-background \
- /usr/share/images/desktop-base/$WALLPAPER 50
- done
-}
-
-restore_desktop_background() {
- update-alternatives --remove \
- desktop-background \
- /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.png
- update-alternatives --remove \
- desktop-background.xml \
- /usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml
-
- for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper01_1280x1024.png \
- debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg \
- debian-edu-${EDUTHEME}-wallpaper01_1600x1200.png \
- debian-edu-${EDUTHEME}-wallpaper01_1920x1080.png \
- debian-edu-${EDUTHEME}-wallpaper01_1920x1200.png; do
- update-alternatives --remove desktop-background \
- /usr/share/images/desktop-base/$WALLPAPER
- done
-}
-
-## Wallpaper
-change_ksplash() {
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-splash \
- desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.png 55
- update-alternatives --set desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.png
-}
-
-restore_ksplash() {
- update-alternatives --remove desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.png
-}
-
-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
-}
-
-symlink_login_background() {
- if [ -f /usr/share/images/desktop-base/login-background.svg.edu-diverted ]; then
- ln -fs /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg /usr/share/images/desktop-base/login-background.svg
- fi
-}
-
-symlink_gnome_shell_css() {
- if [ -f /usr/share/gnome-shell/theme/gnome-shell.css.edu-diverted ]; then
- ln -fs /usr/share/gnome-shell/theme/debian-edu-${EDUTHEME}-gnome-shell.css /usr/share/gnome-shell/theme/gnome-shell.css
- fi
-}
-
-unlink_gnome_shell_css() {
- if [ -h /usr/share/gnome-shell/theme/gnome-shell.css ] && \
- [ "$(readlink /usr/share/gnome-shell/theme/gnome-shell.css)" = "/usr/share/gnome-shell/theme/debian-edu-${EDUTHEME}-gnome-shell.css" ]; then
- rm -f /usr/share/gnome-shell/theme/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 ]; then
- ln -fs /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js /usr/share/kde4/apps/plasma-desktop/init/
- fi
-}
-
-unlink_kde_base_edu_js() {
- if [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
- [ "$(readlink /usr/share/kde4/apps/plasma-desktop/init/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
-}
-
-case "$1" in
- configure)
- change_ldm_background
- change_grub_background
- change_desktop_background
- change_ksplash
- compile_gschemas
- symlink_login_background
- symlink_kde_base_edu_js
- symlink_gnome_shell_css
- ;;
- remove)
- restore_ldm_background
- restore_grub_background
- restore_desktop_background
- restore_ksplash
- 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