[debian-edu-commits] debian-edu/ 263/437: use our ksplash by default

[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 fd01c8bbd18af0542e6ca1ea5ba7d0d3a007b4e4
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Thu Apr 15 12:31:15 2010 +0000

    use our ksplash by default
---
 art/ksplash-theme/Makefile.am |  6 +++++-
 art/ksplash-theme/Makefile.in | 48 ++++++++++++++++++++++++++++++++-----------
 art/ksplash-theme/ksplashrc   |  3 +++
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/art/ksplash-theme/Makefile.am b/art/ksplash-theme/Makefile.am
index d1b7bfb..4ae01ac 100644
--- a/art/ksplash-theme/Makefile.am
+++ b/art/ksplash-theme/Makefile.am
@@ -15,8 +15,12 @@ KSPLASHTHEME = description.txt \
 ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu/1600x1200
 ksplashtheme_DATA = $(KSPLASHTHEME)
 
+kdedefaultdir    = /usr/share/debian-edu-artwork/kde-profile/share/config
+kdedefault_DATA  = ksplashrc
+
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
 	$(INSTALL_DATA) Preview.png Theme.rc $(DESTDIR)$(ksplashthemedir)/..
+	$(mkinstalldirs) $(DESTDIR)$(kdedefaultdir)
 
-EXTRA_DIST = $(ksplashtheme_DATA)
+EXTRA_DIST = $(ksplashtheme_DATA) $(kdedefault_DATA)
diff --git a/art/ksplash-theme/Makefile.in b/art/ksplash-theme/Makefile.in
index 665d8d6..8d42ecd 100644
--- a/art/ksplash-theme/Makefile.in
+++ b/art/ksplash-theme/Makefile.in
@@ -46,9 +46,11 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(ksplashthemedir)"
+am__installdirs = "$(DESTDIR)$(kdedefaultdir)" \
+	"$(DESTDIR)$(ksplashthemedir)"
+kdedefaultDATA_INSTALL = $(INSTALL_DATA)
 ksplashthemeDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(ksplashtheme_DATA)
+DATA = $(kdedefault_DATA) $(ksplashtheme_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -151,7 +153,9 @@ KSPLASHTHEME = description.txt \
 
 ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu/1600x1200
 ksplashtheme_DATA = $(KSPLASHTHEME)
-EXTRA_DIST = $(ksplashtheme_DATA)
+kdedefaultdir = /usr/share/debian-edu-artwork/kde-profile/share/config
+kdedefault_DATA = ksplashrc
+EXTRA_DIST = $(ksplashtheme_DATA) $(kdedefault_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -184,6 +188,23 @@ $(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-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-ksplashthemeDATA: $(ksplashtheme_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(ksplashthemedir)" || $(MKDIR_P) "$(DESTDIR)$(ksplashthemedir)"
@@ -238,7 +259,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(ksplashthemedir)"; do \
+	for dir in "$(DESTDIR)$(kdedefaultdir)" "$(DESTDIR)$(ksplashthemedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -283,7 +304,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local install-ksplashthemeDATA
+install-data-am: install-data-local install-kdedefaultDATA \
+	install-ksplashthemeDATA
 
 install-dvi: install-dvi-am
 
@@ -317,7 +339,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-ksplashthemeDATA
+uninstall-am: uninstall-kdedefaultDATA uninstall-ksplashthemeDATA
 
 .MAKE: install-am install-strip
 
@@ -326,17 +348,19 @@ uninstall-am: uninstall-ksplashthemeDATA
 	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-ksplashthemeDATA 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-am \
-	uninstall-ksplashthemeDATA
+	install-info-am install-kdedefaultDATA \
+	install-ksplashthemeDATA 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-am \
+	uninstall-kdedefaultDATA uninstall-ksplashthemeDATA
 
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
 	$(INSTALL_DATA) Preview.png Theme.rc $(DESTDIR)$(ksplashthemedir)/..
+	$(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/ksplash-theme/ksplashrc b/art/ksplash-theme/ksplashrc
new file mode 100644
index 0000000..b7eb5e9
--- /dev/null
+++ b/art/ksplash-theme/ksplashrc
@@ -0,0 +1,3 @@
+[KSplash]
+Engine=KSplashX
+Theme=Debian-Edu

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