[debian-edu-commits] debian-edu/ 81/437: * fix the typos in update-artwork * install kdesktoprc as first data into the new kde kiosk mode as an example
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:25 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 cfb34fefb8a150617cf14adc2e4c22a181fe2a7f
Author: Steffen Joeris <white at debian.org>
Date: Fri Sep 15 05:57:42 2006 +0000
* fix the typos in update-artwork
* install kdesktoprc as first data into the new kde kiosk mode
as an example
---
art/kde/Makefile.am | 6 +++++-
art/kde/Makefile.in | 43 +++++++++++++++++++++++++++++++++++--------
debian/update-artwork | 26 +++++---------------------
3 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/art/kde/Makefile.am b/art/kde/Makefile.am
index da3cce0..bb1937a 100644
--- a/art/kde/Makefile.am
+++ b/art/kde/Makefile.am
@@ -9,9 +9,13 @@ Xsession_DATA = 25debian-edu-artwork
kdedefaultdir = /usr/share/debian-edu-artwork/kde-profile/default/share/config
kdedefault_DATA = kdesktoprc
+kdeprofile_debian_edu_pupilsdir = /usr/share/debian-edu-artwork/kde-profile/debian_edu_pupils/share/config
+kdeprofile_debian_edu_pupils_DATA = kdesktoprc
+
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(kdeimgdir)
$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
$(mkinstalldirs) $(DESTDIR)$(kdedefaultdir)
+ $(mkinstalldirs) $(DESTDIR)$(kdeprofile_debian_edu_pupilsdir)
-EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA)
+EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA) $(kde_debian_edu_pupils_DATA)
diff --git a/art/kde/Makefile.in b/art/kde/Makefile.in
index b2a4b6b..8a78c43 100644
--- a/art/kde/Makefile.in
+++ b/art/kde/Makefile.in
@@ -51,11 +51,14 @@ am__vpath_adj = case $$p in \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(Xsessiondir)" \
- "$(DESTDIR)$(kdedefaultdir)" "$(DESTDIR)$(kdeimgdir)"
+ "$(DESTDIR)$(kdedefaultdir)" "$(DESTDIR)$(kdeimgdir)" \
+ "$(DESTDIR)$(kdeprofile_debian_edu_pupilsdir)"
XsessionDATA_INSTALL = $(INSTALL_DATA)
kdedefaultDATA_INSTALL = $(INSTALL_DATA)
kdeimgDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(Xsession_DATA) $(kdedefault_DATA) $(kdeimg_DATA)
+kdeprofile_debian_edu_pupilsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(Xsession_DATA) $(kdedefault_DATA) $(kdeimg_DATA) \
+ $(kdeprofile_debian_edu_pupils_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
@@ -145,7 +148,9 @@ Xsessiondir = /etc/X11/Xsession.d/
Xsession_DATA = 25debian-edu-artwork
kdedefaultdir = /usr/share/debian-edu-artwork/kde-profile/default/share/config
kdedefault_DATA = kdesktoprc
-EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA)
+kdeprofile_debian_edu_pupilsdir = /usr/share/debian-edu-artwork/kde-profile/debian_edu_pupils/share/config
+kdeprofile_debian_edu_pupils_DATA = kdesktoprc
+EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA) $(kde_debian_edu_pupils_DATA)
all: all-am
.SUFFIXES:
@@ -230,6 +235,23 @@ uninstall-kdeimgDATA:
echo " rm -f '$(DESTDIR)$(kdeimgdir)/$$f'"; \
rm -f "$(DESTDIR)$(kdeimgdir)/$$f"; \
done
+install-kdeprofile_debian_edu_pupilsDATA: $(kdeprofile_debian_edu_pupils_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(kdeprofile_debian_edu_pupilsdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprofile_debian_edu_pupilsdir)"
+ @list='$(kdeprofile_debian_edu_pupils_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(kdeprofile_debian_edu_pupilsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdeprofile_debian_edu_pupilsdir)/$$f'"; \
+ $(kdeprofile_debian_edu_pupilsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdeprofile_debian_edu_pupilsdir)/$$f"; \
+ done
+
+uninstall-kdeprofile_debian_edu_pupilsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdeprofile_debian_edu_pupils_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(kdeprofile_debian_edu_pupilsdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdeprofile_debian_edu_pupilsdir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -268,7 +290,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)$(kdedefaultdir)" "$(DESTDIR)$(kdeimgdir)" "$(DESTDIR)$(kdeprofile_debian_edu_pupilsdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -314,7 +336,8 @@ info: info-am
info-am:
install-data-am: install-XsessionDATA install-data-local \
- install-kdedefaultDATA install-kdeimgDATA
+ install-kdedefaultDATA install-kdeimgDATA \
+ install-kdeprofile_debian_edu_pupilsDATA
install-exec-am:
@@ -341,25 +364,29 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-XsessionDATA uninstall-info-am \
- uninstall-kdedefaultDATA uninstall-kdeimgDATA
+ uninstall-kdedefaultDATA uninstall-kdeimgDATA \
+ uninstall-kdeprofile_debian_edu_pupilsDATA
.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-XsessionDATA 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-kdedefaultDATA install-kdeimgDATA \
+ install-kdeprofile_debian_edu_pupilsDATA install-man \
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-info-am \
- uninstall-kdedefaultDATA uninstall-kdeimgDATA
+ uninstall-kdedefaultDATA uninstall-kdeimgDATA \
+ uninstall-kdeprofile_debian_edu_pupilsDATA
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(kdeimgdir)
$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
$(mkinstalldirs) $(DESTDIR)$(kdedefaultdir)
+ $(mkinstalldirs) $(DESTDIR)$(kdeprofile_debian_edu_pupilsdir)
# 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/debian/update-artwork b/debian/update-artwork
index 603c752..3130eb5 100644
--- a/debian/update-artwork
+++ b/debian/update-artwork
@@ -71,30 +71,14 @@ activate_kiosk_profiles() {
# Install the file kde-user-profile if it does not exist to ensure
# we can use our kiosk modes
if [ ! -e "$KIOSK_MAP_FILE" ] ; then
- $editini $KIOSK_MAP_FILE '[General]' 'groups=' 'students'
- $editini $KIOSK_MAP_FILE '[Groups]' 'students=' 'debian_edu_pupils'
-
-# cat >> $KIOSK_MAP_FILE << EOT
-#[General]
-#groups=students
-#
-#[Groups]
-#students=debian_edu_pupils
-#EOT
+ $editini $KIOSK_MAP_FILE 'General' 'groups' 'students'
+ $editini $KIOSK_MAP_FILE 'Groups' 'students' 'debian_edu_pupils'
fi
if [ ! -e "$KIOSK_CONFIG_FILE" ] ; then
- $editini $KIOSK_CONFIG_FILE '[Directories]' 'userProfileMapFile=' '/etc/kde-user-profile'
- $editini $KIOSK_CONFIG_FILE '[Directories-debian_edu_pupils]' 'ProfileDescription=' 'Debian-Edu Profile for pupils'
- $editini $KIOSK_CONFIG_FILE '[Directories-debian_edu_pupils]' 'prefixes=' '/usr/share/debian-edu-artwork/kde-profile/debian_edu_pupils'
-# cat >> $KIOSK_CONFIG_FILE << EOT
-#[Directories]
-#userProfileMapFile=/etc/kde-user-profile
-#
-#[Directories-debian_edu_pupils]
-#ProfileDescription=Debian-Edu Profile for pupils
-#prefixes=/usr/share/debian-edu-artwork/kde-profile/debian_edu_pupils
-#EOT
+ $editini $KIOSK_CONFIG_FILE 'Directories' 'userProfileMapFile' '/etc/kde-user-profile'
+ $editini $KIOSK_CONFIG_FILE 'Directories-debian_edu_pupils' 'ProfileDescription' 'Debian-Edu Profile for pupils'
+ $editini $KIOSK_CONFIG_FILE 'Directories-debian_edu_pupils' 'prefixes' '/usr/share/debian-edu-artwork/kde-profile/debian_edu_pupils'
fi
}
--
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