[debian-edu-commits] debian-edu/ 41/437: * Start on kde and kdm background image installation. Not working yet, so the enabling code is commented out.

[Mike Gabriel]

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 ddbfa543e4f4cdef1aacc1684c48375be72b0891
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Aug 19 14:32:14 2006 +0000

      * Start on kde and kdm background image installation.  Not working
        yet, so the enabling code is commented out.
---
 art/Makefile.am                    |   2 +-
 art/kde/Makefile.am                |   9 +++++++++
 art/kde/debian-edu-kde.png         | Bin 0 -> 77853 bytes
 art/kde/debian-edu-kde.png.desktop |   6 ++++++
 configure.in                       |   1 +
 debian/changelog                   |   2 ++
 debian/debian-edu-artwork.postinst |  22 ++++++++++++++++++++--
 debian/debian-edu-artwork.prerm    |  20 ++++++++++++++++++++
 8 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/art/Makefile.am b/art/Makefile.am
index bdfa8a4..a634821 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -1 +1 @@
-SUBDIRS = ldm splash splashy usplash
+SUBDIRS = kde ldm splash splashy usplash
diff --git a/art/kde/Makefile.am b/art/kde/Makefile.am
new file mode 100644
index 0000000..6db9cc0
--- /dev/null
+++ b/art/kde/Makefile.am
@@ -0,0 +1,9 @@
+KDEIMG = debian-edu-kde.png
+
+kdeimgdir = $(datadir)/wallpapers
+kdeimg_DATA = $(KDEIMG) debian-edu-kde.png.desktop
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(kdeimgdir)
+
+EXTRA_DIST = $(kdeimg_DATA)
diff --git a/art/kde/debian-edu-kde.png b/art/kde/debian-edu-kde.png
new file mode 100644
index 0000000..01f3b48
Binary files /dev/null and b/art/kde/debian-edu-kde.png differ
diff --git a/art/kde/debian-edu-kde.png.desktop b/art/kde/debian-edu-kde.png.desktop
new file mode 100644
index 0000000..37d1380
--- /dev/null
+++ b/art/kde/debian-edu-kde.png.desktop
@@ -0,0 +1,6 @@
+[Wallpaper]
+Encoding=UTF-8
+File=debian-edu-kde.jpg
+Name=Debian Edu
+ImageType=pixmap
+Author=Qwertz
diff --git a/configure.in b/configure.in
index 734ea18..c3799c9 100644
--- a/configure.in
+++ b/configure.in
@@ -24,6 +24,7 @@ AC_PROG_INSTALL
 AC_OUTPUT([
 Makefile
 art/Makefile
+art/kde/Makefile
 art/ldm/Makefile
 art/splash/Makefile
 art/splashy/Makefile
diff --git a/debian/changelog b/debian/changelog
index f93a824..d7754a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ debian-edu-artwork (0.0.5) UNRELEASED; urgency=low
     all artwork for Debian Edu in one location.
   * Add postinst code for debian-edu-artwork to select the debian-edu
     ldm theme at install time.
+  * Start on kde and kdm background image installation.  Not working
+    yet, so the enabling code is commented out.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed,  9 Aug 2006 23:22:25 +0200
 
diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index 30d6be3..33bd49e 100644
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -4,9 +4,27 @@ set -e
 
 #DEBHELPER#
 
-case "$1" in
-  configure)
+change_ldm_background() {
     update-alternatives --install /usr/share/ldm/themes/default \
         ldm-theme /usr/share/ldm/themes/debian-edu 80
+}
+
+# Insert our background image for kdm and kde unless we already have
+# done so.
+change_kde_background() {
+    defaultbgimg=/usr/share/wallpapers/debian-kde_default.png
+    if [ -f $defaultbgimg ] ; then
+	/usr/sbin/dpkg-divert --package debian-edu-artwork --add $defaultbgimg
+	mv $defaultbgimg $defaultbgimg.distrib
+	ln -s debian-edu-kde.png $defaultbgimg
+    fi
+}
+
+case "$1" in
+  configure)
+    change_ldm_background
+
+    # Need to get this working
+    #change_kde_background
     ;;
 esac
diff --git a/debian/debian-edu-artwork.prerm b/debian/debian-edu-artwork.prerm
new file mode 100644
index 0000000..9cc28d4
--- /dev/null
+++ b/debian/debian-edu-artwork.prerm
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+set -e
+
+#DEBHELPER#
+
+# Remove diversion for KDE background image
+restore_kde_background() {
+    defaultbgimg=/usr/share/wallpapers/debian-kde_default.png
+    if [ -h $defaultbgimg ] ; then
+	rm $defaultbgimg
+	/usr/sbin/dpkg-divert --remove $defaultbgimg
+    fi
+}
+
+case "$1" in
+  remove)
+    #restore_kde_background
+    ;;
+esac

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git