[debian-edu-commits] debian-edu/ 60/437: Enable our KDE wallpaper by default, by setting KDEDIRS in Xsession.d/.
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:24 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 57e9b9844287080fef2446b42d0b73e3b48c54bf
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Sun Sep 3 11:51:11 2006 +0000
Enable our KDE wallpaper by default, by setting KDEDIRS in Xsession.d/.
---
art/kde/25debian-edu-artwork | 2 +
art/kde/Makefile.am | 10 ++++-
art/kde/Makefile.in | 79 +++++++++++++++++++++++++++++++-------
art/kde/kdesktoprc | 4 ++
debian/changelog | 8 ++--
debian/debian-edu-artwork.install | 1 +
debian/debian-edu-artwork.postinst | 16 --------
debian/debian-edu-artwork.postrm | 15 +++++---
8 files changed, 96 insertions(+), 39 deletions(-)
diff --git a/art/kde/25debian-edu-artwork b/art/kde/25debian-edu-artwork
new file mode 100755
index 0000000..7b02f0a
--- /dev/null
+++ b/art/kde/25debian-edu-artwork
@@ -0,0 +1,2 @@
+KDEDIRS="/usr/share/debian-edu-artwork/kde-profile:$KDEDIRS"
+export KDEDIRS
diff --git a/art/kde/Makefile.am b/art/kde/Makefile.am
index 2e2e223..4601c95 100644
--- a/art/kde/Makefile.am
+++ b/art/kde/Makefile.am
@@ -3,7 +3,15 @@ KDEIMG = debian-edu-wallpaper.png
kdeimgdir = $(datadir)/wallpapers
kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
+Xsessiondir = /etc/X11/Xsession.d/
+Xsession_SCRIPTS = 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)
+EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA)
diff --git a/art/kde/Makefile.in b/art/kde/Makefile.in
index 77f5a17..42c0bd2 100644
--- a/art/kde/Makefile.in
+++ b/art/kde/Makefile.in
@@ -14,6 +14,7 @@
@SET_MAKE@
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -42,6 +43,10 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(Xsessiondir)" \
+ "$(DESTDIR)$(kdedefaultdir)" "$(DESTDIR)$(kdeimgdir)"
+XsessionSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(Xsession_SCRIPTS)
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -50,9 +55,9 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(kdeimgdir)"
+kdedefaultDATA_INSTALL = $(INSTALL_DATA)
kdeimgDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(kdeimg_DATA)
+DATA = $(kdedefault_DATA) $(kdeimg_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
@@ -138,7 +143,11 @@ target_alias = @target_alias@
KDEIMG = debian-edu-wallpaper.png
kdeimgdir = $(datadir)/wallpapers
kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
-EXTRA_DIST = $(kdeimg_DATA)
+Xsessiondir = /etc/X11/Xsession.d/
+Xsession_SCRIPTS = 25debian-edu-artwork
+kdedefaultdir = /usr/share/debian-edu-artwork/kde-profile/default
+kdedefault_DATA = kdesktoprc
+EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA)
all: all-am
.SUFFIXES:
@@ -171,7 +180,43 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-XsessionSCRIPTS: $(Xsession_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(Xsessiondir)" || $(mkdir_p) "$(DESTDIR)$(Xsessiondir)"
+ @list='$(Xsession_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(XsessionSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(Xsessiondir)/$$f'"; \
+ $(XsessionSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(Xsessiondir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-XsessionSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(Xsession_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f '$(DESTDIR)$(Xsessiondir)/$$f'"; \
+ rm -f "$(DESTDIR)$(Xsessiondir)/$$f"; \
+ done
uninstall-info-am:
+install-kdedefaultDATA: $(kdedefault_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(kdedefaultdir)" || $(mkdir_p) "$(DESTDIR)$(kdedefaultdir)"
+ @list='$(kdedefault_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(kdedefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdedefaultdir)/$$f'"; \
+ $(kdedefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdedefaultdir)/$$f"; \
+ done
+
+uninstall-kdedefaultDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdedefault_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(kdedefaultdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdedefaultdir)/$$f"; \
+ done
install-kdeimgDATA: $(kdeimg_DATA)
@$(NORMAL_INSTALL)
test -z "$(kdeimgdir)" || $(mkdir_p) "$(DESTDIR)$(kdeimgdir)"
@@ -225,9 +270,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(DATA)
+all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(kdeimgdir)"; do \
+ for dir in "$(DESTDIR)$(Xsessiondir)" "$(DESTDIR)$(kdedefaultdir)" "$(DESTDIR)$(kdeimgdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -272,7 +317,8 @@ info: info-am
info-am:
-install-data-am: install-data-local install-kdeimgDATA
+install-data-am: install-XsessionSCRIPTS install-data-local \
+ install-kdedefaultDATA install-kdeimgDATA
install-exec-am:
@@ -298,21 +344,26 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am uninstall-kdeimgDATA
+uninstall-am: uninstall-XsessionSCRIPTS uninstall-info-am \
+ uninstall-kdedefaultDATA uninstall-kdeimgDATA
.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-exec install-exec-am install-info \
- install-info-am install-kdeimgDATA install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
- uninstall-kdeimgDATA
+ install install-XsessionSCRIPTS install-am install-data \
+ install-data-am install-data-local install-exec \
+ install-exec-am install-info install-info-am \
+ install-kdedefaultDATA install-kdeimgDATA install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-XsessionSCRIPTS uninstall-am uninstall-info-am \
+ uninstall-kdedefaultDATA 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.
.NOEXPORT:
diff --git a/art/kde/kdesktoprc b/art/kde/kdesktoprc
new file mode 100644
index 0000000..c445e61
--- /dev/null
+++ b/art/kde/kdesktoprc
@@ -0,0 +1,4 @@
+[Desktop0]
+MultiWallpaperMode=NoMulti
+Wallpaper=/usr/share/wallpapers/debian-edu-wallpaper.png
+WallpaperMode=Scaled
diff --git a/debian/changelog b/debian/changelog
index e1448ce..fbf3ba6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
debian-edu-artwork (0.0.6) UNRELEASED; urgency=low
- * Add kdm theme based on the kubuntu kdm theme. Depend on
- debian-edu-config to have /usr/bin/update-ini-file available
- for kdmrc editing. Recommend kdm.
+ * Add kdm theme based on the kubuntu kdm theme by editing
+ /etc/kde3/kdm/kdmrc. Depend on debian-edu-config to have
+ /usr/bin/update-ini-file available for kdmrc editing. Recommend kdm.
+ * Enable our KDE wallpaper by default, by setting KDEDIRS in
+ Xsession.d/.
-- Petter Reinholdtsen <pere at debian.org> Sun, 3 Sep 2006 11:11:26 +0200
diff --git a/debian/debian-edu-artwork.install b/debian/debian-edu-artwork.install
index 92e080a..6925c31 100644
--- a/debian/debian-edu-artwork.install
+++ b/debian/debian-edu-artwork.install
@@ -1,2 +1,3 @@
+debian/tmp/etc
debian/tmp/usr/share
debian/tmp/boot
diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index a2399e7..61b441c 100644
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -9,18 +9,6 @@ change_ldm_background() {
ldm-theme /usr/share/ldm/themes/debian-edu 80
}
-# Insert our background image for kdm and kde unless we already have
-# done so.
-# Might use /usr/share/config/kdesktoprc to set KDE background instead.
-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
-}
-
change_kdm_theme() {
# switch kdm theme to debian-edu
kdmrc=/etc/kde3/kdm/kdmrc
@@ -40,10 +28,6 @@ change_kdm_theme() {
case "$1" in
configure)
change_ldm_background
-
change_kdm_theme
-
- # Need to get this working
- #change_kde_background
;;
esac
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index 8117ca8..7e25377 100644
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -3,18 +3,23 @@ set -e
#DEBHELPER#
-case "$1" in
- remove|deconfigure|failed-upgrade)
- # switch kdm theme away from debian-edu
+# switch kdm theme away from debian-edu
+restore_kdm_theme() {
kdmrc=/etc/kde3/kdm/kdmrc
+ defaulttheme=/usr/share/apps/kdm/themes/circles
if grep -q '^Theme=/usr/share/apps/kdm/themes/debian-edu' $kdmrc &&
grep -q '^UseTheme=true' $kdmrc; then
echo "Removing and disabling Debian Edu KDM theme ..."
- /usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Greeter' Theme /usr/share/apps/kdm/themes/circles
- /usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Greeter' UseTheme false
+ /usr/bin/update-ini-file $kdmrc 'X-*-Greeter' Theme $defaulttheme
+ /usr/bin/update-ini-file $kdmrc 'X-*-Greeter' UseTheme false
else
echo "KDM theme customised or not enabled, not touching kdmrc ..."
fi
+}
+
+case "$1" in
+ remove|deconfigure|failed-upgrade)
+ restore_kdm_theme
;;
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