[debian-edu-commits] debian-edu/ 285/437: * Depend on desktop-base and use update-alternatives to switch on debian-edu artwork. * Remove diversion of /usr/share/desktop-base/grub_background.sh as it is not needed when using update-alternatives.

Mike Gabriel sunweaver at debian.org
Sun Mar 2 23:49:43 UTC 2014


This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu-artwork.

commit db60063bd098d4ea4ac21afb2ee64be1ed0f00f0
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Sat Jun 18 18:23:02 2011 +0000

    * Depend on desktop-base and use update-alternatives to switch on
      debian-edu artwork.
    * Remove diversion of /usr/share/desktop-base/grub_background.sh as it
      is not needed when using update-alternatives.
---
 art/kde/Makefile.am               |  6 +--
 art/kde/Makefile.in               | 50 +++++----------------
 art/kde/kdesktoprc                |  4 --
 art/splash/Makefile.am            |  4 --
 art/splash/Makefile.in            | 24 +++++-----
 art/splash/grub_background.sh     |  4 --
 debian/changelog                  |  4 ++
 debian/control                    |  2 +-
 debian/debian-edu-artwork.postrm  |  1 -
 debian/debian-edu-artwork.preinst |  3 --
 debian/update-artwork             | 92 +++++++++++++++++++++++++++++++++++----
 11 files changed, 112 insertions(+), 82 deletions(-)

diff --git a/art/kde/Makefile.am b/art/kde/Makefile.am
index 1f16dbe..2203845 100644
--- a/art/kde/Makefile.am
+++ b/art/kde/Makefile.am
@@ -11,12 +11,8 @@ kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
 Xsessiondir      = /etc/X11/Xsession.d/
 Xsession_DATA    = 25debian-edu-artwork
 
-kdedefaultdir    = /usr/share/debian-edu-artwork/kde-profile/share/config
-kdedefault_DATA  = kdesktoprc
-
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(kdeimgdir)
 	$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
-	$(mkinstalldirs) $(DESTDIR)$(kdedefaultdir)
 
-EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA)
+EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA)
diff --git a/art/kde/Makefile.in b/art/kde/Makefile.in
index 433d9d1..a6f66fd 100644
--- a/art/kde/Makefile.in
+++ b/art/kde/Makefile.in
@@ -64,9 +64,8 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(Xsessiondir)" \
-	"$(DESTDIR)$(kdedefaultdir)" "$(DESTDIR)$(kdeimgdir)"
-DATA = $(Xsession_DATA) $(kdedefault_DATA) $(kdeimg_DATA)
+am__installdirs = "$(DESTDIR)$(Xsessiondir)" "$(DESTDIR)$(kdeimgdir)"
+DATA = $(Xsession_DATA) $(kdeimg_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -166,9 +165,7 @@ kdeimgdir = $(datadir)/wallpapers
 kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
 Xsessiondir = /etc/X11/Xsession.d/
 Xsession_DATA = 25debian-edu-artwork
-kdedefaultdir = /usr/share/debian-edu-artwork/kde-profile/share/config
-kdedefault_DATA = kdesktoprc
-EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA)
+EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -222,26 +219,6 @@ uninstall-XsessionDATA:
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(Xsessiondir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(Xsessiondir)" && rm -f $$files
-install-kdedefaultDATA: $(kdedefault_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(kdedefaultdir)" || $(MKDIR_P) "$(DESTDIR)$(kdedefaultdir)"
-	@list='$(kdedefault_DATA)'; test -n "$(kdedefaultdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(kdedefaultdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(kdedefaultdir)" || exit $$?; \
-	done
-
-uninstall-kdedefaultDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(kdedefault_DATA)'; test -n "$(kdedefaultdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(kdedefaultdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(kdedefaultdir)" && rm -f $$files
 install-kdeimgDATA: $(kdeimg_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(kdeimgdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeimgdir)"
@@ -303,7 +280,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(Xsessiondir)" "$(DESTDIR)$(kdedefaultdir)" "$(DESTDIR)$(kdeimgdir)"; do \
+	for dir in "$(DESTDIR)$(Xsessiondir)" "$(DESTDIR)$(kdeimgdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -352,7 +329,7 @@ info: info-am
 info-am:
 
 install-data-am: install-XsessionDATA install-data-local \
-	install-kdedefaultDATA install-kdeimgDATA
+	install-kdeimgDATA
 
 install-dvi: install-dvi-am
 
@@ -396,8 +373,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-XsessionDATA uninstall-kdedefaultDATA \
-	uninstall-kdeimgDATA
+uninstall-am: uninstall-XsessionDATA uninstall-kdeimgDATA
 
 .MAKE: install-am install-strip
 
@@ -406,19 +382,17 @@ uninstall-am: uninstall-XsessionDATA uninstall-kdedefaultDATA \
 	install install-XsessionDATA install-am install-data \
 	install-data-am install-data-local install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-kdedefaultDATA \
-	install-kdeimgDATA install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-XsessionDATA uninstall-am \
-	uninstall-kdedefaultDATA uninstall-kdeimgDATA
+	install-info install-info-am install-kdeimgDATA install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-XsessionDATA uninstall-am uninstall-kdeimgDATA
 
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(kdeimgdir)
 	$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
-	$(mkinstalldirs) $(DESTDIR)$(kdedefaultdir)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/art/kde/kdesktoprc b/art/kde/kdesktoprc
deleted file mode 100644
index 8dfc458..0000000
--- a/art/kde/kdesktoprc
+++ /dev/null
@@ -1,4 +0,0 @@
-[Desktop0]
-MultiWallpaperMode=NoMulti
-Wallpaper=debian-edu-wallpaper01_1600x1200.png
-WallpaperMode=Scaled
diff --git a/art/splash/Makefile.am b/art/splash/Makefile.am
index 8e45df1..6c386fd 100644
--- a/art/splash/Makefile.am
+++ b/art/splash/Makefile.am
@@ -5,10 +5,6 @@ splash_DATA = $(SPLASH) debian-edu-splash-grub.png
 
 grub2splashdir= /usr/share/desktop-base/
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(grub2splashdir)
-	$(INSTALL) grub_background.sh $(DESTDIR)$(grub2splashdir)
-
 debian-edu-splash-grub.png:
 	cp background-grub2.png $@
 
diff --git a/art/splash/Makefile.in b/art/splash/Makefile.in
index 31d24d2..e098547 100644
--- a/art/splash/Makefile.in
+++ b/art/splash/Makefile.in
@@ -303,7 +303,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local install-splashDATA
+install-data-am: install-splashDATA
 
 install-dvi: install-dvi-am
 
@@ -353,19 +353,15 @@ uninstall-am: uninstall-splashDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-splashDATA install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-splashDATA
-
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(grub2splashdir)
-	$(INSTALL) grub_background.sh $(DESTDIR)$(grub2splashdir)
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-splashDATA install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-splashDATA
+
 
 debian-edu-splash-grub.png:
 	cp background-grub2.png $@
diff --git a/art/splash/grub_background.sh b/art/splash/grub_background.sh
deleted file mode 100644
index 32084e1..0000000
--- a/art/splash/grub_background.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# This script is used by /etc/grub.d/05_debian_theme with grub version 2
-WALLPAPER="/usr/share/pixmaps/splash/debian-edu-splash-grub.png"
-COLOR_NORMAL="white/black"
-COLOR_HIGHLIGHT="magenta/black"
diff --git a/debian/changelog b/debian/changelog
index 1bc424a..379edb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ debian-edu-artwork (0.0.32-3) UNRELEASED; urgency=low
     for GRUB2.  Remove imagemagick from builddeps.
   * Add all available resolutions of the debian-edu-wallpaper.
   * Fit kdm/gdm better with new debian-edu-wallpaper.
+  * Depend on desktop-base and use update-alternatives to switch on
+    debian-edu artwork.
+  * Remove diversion of /usr/share/desktop-base/grub_background.sh as it
+    is not needed when using update-alternatives.
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 06 Dec 2010 11:12:20 +0100
 
diff --git a/debian/control b/debian/control
index e5e7ad6..6355145 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ XS-DM-Upload-Allowed: yes
 
 Package: debian-edu-artwork
 Architecture: all
-Depends: ${misc:Depends}, libconfig-inifiles-perl
+Depends: ${misc:Depends}, libconfig-inifiles-perl, desktop-base
 Suggests: grub (>= 0.95+cvs20040624-10), kdm
 Conflicts: grub (<< 0.97-39), desktop-base (<< 5.0.5)
 Description: Debian Edu themes and artwork
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index 12c70ec..866cfa9 100644
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -5,7 +5,6 @@ set -e
 if [ "$1" = remove ]
 then
 	dpkg-divert --package debian-edu-artwork --rename --remove /usr/share/gdm/defaults.conf
-	dpkg-divert --package debian-edu-artwork --rename --remove /usr/share/desktop-base/grub_background.sh
 fi
 
 #DEBHELPER#
diff --git a/debian/debian-edu-artwork.preinst b/debian/debian-edu-artwork.preinst
index f1c57a6..0f0a333 100644
--- a/debian/debian-edu-artwork.preinst
+++ b/debian/debian-edu-artwork.preinst
@@ -6,9 +6,6 @@ if [ "$1" = install ] || [ $1 = upgrade ]
 then
 	dpkg-divert --package debian-edu-artwork --divert \
 		/usr/share/gdm/defaults.conf.orig --rename /usr/share/gdm/defaults.conf
-	dpkg-divert --package debian-edu-artwork --divert \
-		/usr/share/desktop-base/grub_background.sh.orig --rename /usr/share/desktop-base/grub_background.sh
-
 fi
 
 #DEBHELPER#
diff --git a/debian/update-artwork b/debian/update-artwork
index 4d59e9e..11977fc 100644
--- a/debian/update-artwork
+++ b/debian/update-artwork
@@ -10,30 +10,106 @@ restore_ldm_background() {
     update-alternatives --remove ldm-theme /usr/share/ldm/themes/debian-edu
 }
 
+
+## GRUB
 change_grub_background() {
-    if [ -f /boot/grub/grub.cfg ] && ! grep -q 'debian-edu-splash-grub.png' /boot/grub/grub.cfg ; then
-	## update-grub should find our splash image and update grub.cfg:
-	update-grub || true
+    update-alternatives --install \
+        /usr/share/images/desktop-base/desktop-grub.png \
+        desktop-grub \
+        /usr/share/pixmaps/splash/debian-edu-splash-grub.png 16
+
+    if which update-grub2 > /dev/null ; then
+        sync
+        update-grub2 || true
     fi
 }
 
 restore_grub_background() {
-    if [ -f /boot/grub/grub.cfg ] && grep -q 'debian-edu-splash-grub.png' /boot/grub/grub.cfg ; then
-	## update-grub should revert grub.cfg to point to the default image: 
-	update-grub || true
+    update-alternatives --remove desktop-grub \
+	/usr/share/pixmaps/splash/debian-edu-splash-grub.png
+
+    if which update-grub2 > /dev/null ; then
+        update-grub2 || true
     fi
 }
 
-## change_kdm_theme() and restore_kdm_theme() are not needed anymore,
-## our theme is added to /etc/default/kdm.d/
+## Wallpaper
+change_desktop_background() {
+    update-alternatives --install \
+        /usr/share/images/desktop-base/desktop-background \
+	desktop-background \
+	/usr/share/wallpapers/debian-edu-wallpaper01_1920x1080.png 50
+
+    update-alternatives --install \
+        /usr/share/images/desktop-base/desktop-background \
+	desktop-background \
+	/usr/share/wallpapers/debian-edu-wallpaper01_1920x1200.png 50
+ 
+    update-alternatives --install \
+        /usr/share/images/desktop-base/desktop-background \
+	desktop-background \
+	/usr/share/wallpapers/debian-edu-wallpaper01_1600x1200.png 65
+
+    update-alternatives --install \
+        /usr/share/images/desktop-base/desktop-background \
+	desktop-background \
+	/usr/share/wallpapers/debian-edu-wallpaper02_1920x1080.png 50
+
+    update-alternatives --install \
+        /usr/share/images/desktop-base/desktop-background \
+	desktop-background \
+	/usr/share/wallpapers/debian-edu-wallpaper02_1920x1200.png 50
+
+    update-alternatives --install \
+        /usr/share/images/desktop-base/desktop-background \
+	desktop-background \
+	/usr/share/wallpapers/debian-edu-wallpaper02_1600x1200.png 50
+}
+
+restore_desktop_background() {
+    update-alternatives --remove desktop-background \
+	/usr/share/wallpapers/debian-edu-wallpaper01_1920x1080.png
+
+    update-alternatives --remove desktop-background \
+	/usr/share/wallpapers/debian-edu-wallpaper01_1920x1200.png
+
+    update-alternatives --remove desktop-background \
+	/usr/share/wallpapers/debian-edu-wallpaper01_1600x1200.png
+
+    update-alternatives --remove desktop-background \
+	/usr/share/wallpapers/debian-edu-wallpaper02_1920x1080.png
+
+    update-alternatives --remove desktop-background \
+	/usr/share/wallpapers/debian-edu-wallpaper02_1920x1200.png
+
+    update-alternatives --install desktop-background \
+	/usr/share/wallpapers/debian-edu-wallpaper02_1600x1200.png
+}
+
+## Wallpaper
+change_ksplash() {
+    update-alternatives --install \
+	/usr/share/images/desktop-base/desktop-splash \
+	desktop-splash \
+	/usr/share/kde4/apps/ksplash/Themes/Debian-Edu/1600x1200/background.png 55
+}
+
+restore_ksplash() {
+    update-alternatives --remove desktop-splash \
+	/usr/share/kde4/apps/ksplash/Themes/Debian-Edu/1600x1200/background.png
+}
 
 case "$1" in
   configure)
     change_ldm_background
     change_grub_background
+    change_desktop_background
+    change_ksplash
     ;;
   remove)
     restore_ldm_background
     restore_grub_background
+    restore_desktop_background
+    restore_ksplash
     ;;
 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