[debian-edu-commits] debian-edu/ 387/437: run automake -a -c and autoreconf; add forgotten files.
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:55 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 6494449ca7e0f985e63e8e344b28450fe6f3abf4
Author: Wolfgang Schweer <w.schweer at gmx.de>
Date: Tue Jun 25 17:36:49 2013 +0000
run automake -a -c and autoreconf; add forgotten files.
---
art/Makefile.in | 2 +-
art/kde/1024x768.png | Bin 0 -> 147011 bytes
art/kde/1280x1024.png | Bin 0 -> 241489 bytes
art/kde/1280x800.png | Bin 0 -> 160457 bytes
art/kde/1366x768.png | Bin 0 -> 245196 bytes
art/kde/1600x1200.png | 1 +
art/kde/1920x1080.png | 1 +
art/kde/1920x1200.png | 1 +
art/kde/20-desktop-base-edu.js | 13 ++++
art/kde/800x600.png | Bin 0 -> 119978 bytes
art/kde/Makefile.in | 142 +++++++++++++++++++++++++++++++++++----
art/kde/debian-edu.xml | 11 +++
art/kde/metadata.desktop | 7 ++
art/kde/screenshot.png | Bin 0 -> 24677 bytes
art/kdm-theme/Makefile.in | 22 +++---
art/kdm-theme/rectangle.png | Bin 0 -> 14942 bytes
art/kdm-theme/session_normal.png | Bin 0 -> 1230 bytes
17 files changed, 172 insertions(+), 28 deletions(-)
diff --git a/art/Makefile.in b/art/Makefile.in
index f3a648f..0edd6b9 100644
--- a/art/Makefile.in
+++ b/art/Makefile.in
@@ -192,7 +192,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = g-i kde kdm-theme gdm-theme ksplash-theme ldm splash media-cover
+SUBDIRS = g-i kde kdm-theme gdm-theme ksplash-theme ldm splash media-cover ksplash-bg_1024x768 ksplash-bg_1280x1024 ksplash-bg_1280x800 ksplash-bg_1366x768 ksplash-bg_1920x1080 ksplash-bg_1920x1200
all: all-recursive
.SUFFIXES:
diff --git a/art/kde/1024x768.png b/art/kde/1024x768.png
new file mode 100644
index 0000000..1fc1cd7
Binary files /dev/null and b/art/kde/1024x768.png differ
diff --git a/art/kde/1280x1024.png b/art/kde/1280x1024.png
new file mode 100644
index 0000000..cb21eb1
Binary files /dev/null and b/art/kde/1280x1024.png differ
diff --git a/art/kde/1280x800.png b/art/kde/1280x800.png
new file mode 100644
index 0000000..a4a7264
Binary files /dev/null and b/art/kde/1280x800.png differ
diff --git a/art/kde/1366x768.png b/art/kde/1366x768.png
new file mode 100644
index 0000000..3949d6e
Binary files /dev/null and b/art/kde/1366x768.png differ
diff --git a/art/kde/1600x1200.png b/art/kde/1600x1200.png
new file mode 120000
index 0000000..2753ad5
--- /dev/null
+++ b/art/kde/1600x1200.png
@@ -0,0 +1 @@
+debian-edu-wallpaper01_1600x1200.png
\ No newline at end of file
diff --git a/art/kde/1920x1080.png b/art/kde/1920x1080.png
new file mode 120000
index 0000000..b72e507
--- /dev/null
+++ b/art/kde/1920x1080.png
@@ -0,0 +1 @@
+debian-edu-wallpaper01_1920x1080.png
\ No newline at end of file
diff --git a/art/kde/1920x1200.png b/art/kde/1920x1200.png
new file mode 120000
index 0000000..bae2276
--- /dev/null
+++ b/art/kde/1920x1200.png
@@ -0,0 +1 @@
+debian-edu-wallpaper01_1920x1200.png
\ No newline at end of file
diff --git a/art/kde/20-desktop-base-edu.js b/art/kde/20-desktop-base-edu.js
new file mode 100644
index 0000000..9de7179
--- /dev/null
+++ b/art/kde/20-desktop-base-edu.js
@@ -0,0 +1,13 @@
+// Placed in /usr/share/kde4/apps/plasma-desktop/init/
+// This script is run for new users, which do not have a .kde directory
+// and it set's the default wallpaper for all activities
+
+a = activities()
+
+for (i in a) {
+ a[i].wallpaperPlugin = 'image'
+ a[i].wallpaperMode = 'SingleImage'
+ a[i].currentConfigGroup = Array('Wallpaper', 'image')
+ a[i].writeConfig('wallpaper', 'Debian-Edu') //change this in wheezy+1
+ a[i].writeConfig('wallpaperposition', '1') //enables croping
+}
diff --git a/art/kde/800x600.png b/art/kde/800x600.png
new file mode 100644
index 0000000..55b5474
Binary files /dev/null and b/art/kde/800x600.png differ
diff --git a/art/kde/Makefile.in b/art/kde/Makefile.in
index 1180152..1cf6731 100644
--- a/art/kde/Makefile.in
+++ b/art/kde/Makefile.in
@@ -92,8 +92,11 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(Xsessiondir)" "$(DESTDIR)$(kdeimgdir)"
-DATA = $(Xsession_DATA) $(kdeimg_DATA)
+am__installdirs = "$(DESTDIR)$(Xsessiondir)" "$(DESTDIR)$(edudir)" \
+ "$(DESTDIR)$(educontentsdir)" "$(DESTDIR)$(eduimgdir)" \
+ "$(DESTDIR)$(kdeimgdir)" "$(DESTDIR)$(kdeplasmadir)"
+DATA = $(Xsession_DATA) $(edu_DATA) $(educontents_DATA) $(eduimg_DATA) \
+ $(kdeimg_DATA) $(kdeplasma_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -195,11 +198,28 @@ KDEIMG = debian-edu-wallpaper01_1600x1200.png \
debian-edu-wallpaper02_1920x1080.svg \
debian-edu-wallpaper02_1920x1200.svg
-kdeimgdir = $(datadir)/wallpapers/
-kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
+EDUIMG = 1024x768.png \
+ 1280x1024.png \
+ 1280x800.png \
+ 1366x768.png \
+ 1600x1200.png \
+ 1920x1080.png \
+ 1920x1200.png \
+ 800x600.png
+
+kdeimgdir = $(datadir)/images/desktop-base
+kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop debian-edu.xml
+kdeplasmadir = $(datadir)/kde4/apps/plasma-desktop/init/
+kdeplasma_DATA = 20-desktop-base-edu.js
+edudir = $(datadir)/wallpapers/Debian-Edu/
+edu_DATA = metadata.desktop
+educontentsdir = $(datadir)/wallpapers/Debian-Edu/contents/
+educontents_DATA = screenshot.png
+eduimgdir = $(datadir)/wallpapers/Debian-Edu/contents/images/
+eduimg_DATA = $(EDUIMG)
Xsessiondir = /etc/X11/Xsession.d/
Xsession_DATA = 25debian-edu-artwork
-EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA)
+EXTRA_DIST = $(kdeimg_DATA) $(edu_DATA) $(educontents_DATA) $(eduimg_DATA) $(Xsession_DATA)
all: all-am
.SUFFIXES:
@@ -254,6 +274,69 @@ uninstall-XsessionDATA:
@list='$(Xsession_DATA)'; test -n "$(Xsessiondir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(Xsessiondir)'; $(am__uninstall_files_from_dir)
+install-eduDATA: $(edu_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(edu_DATA)'; test -n "$(edudir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(edudir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(edudir)" || exit 1; \
+ fi; \
+ 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)$(edudir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(edudir)" || exit $$?; \
+ done
+
+uninstall-eduDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(edu_DATA)'; test -n "$(edudir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(edudir)'; $(am__uninstall_files_from_dir)
+install-educontentsDATA: $(educontents_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(educontents_DATA)'; test -n "$(educontentsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(educontentsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(educontentsdir)" || exit 1; \
+ fi; \
+ 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)$(educontentsdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(educontentsdir)" || exit $$?; \
+ done
+
+uninstall-educontentsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(educontents_DATA)'; test -n "$(educontentsdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(educontentsdir)'; $(am__uninstall_files_from_dir)
+install-eduimgDATA: $(eduimg_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(eduimg_DATA)'; test -n "$(eduimgdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(eduimgdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(eduimgdir)" || exit 1; \
+ fi; \
+ 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)$(eduimgdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(eduimgdir)" || exit $$?; \
+ done
+
+uninstall-eduimgDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(eduimg_DATA)'; test -n "$(eduimgdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(eduimgdir)'; $(am__uninstall_files_from_dir)
install-kdeimgDATA: $(kdeimg_DATA)
@$(NORMAL_INSTALL)
@list='$(kdeimg_DATA)'; test -n "$(kdeimgdir)" || list=; \
@@ -275,6 +358,27 @@ uninstall-kdeimgDATA:
@list='$(kdeimg_DATA)'; test -n "$(kdeimgdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(kdeimgdir)'; $(am__uninstall_files_from_dir)
+install-kdeplasmaDATA: $(kdeplasma_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(kdeplasma_DATA)'; test -n "$(kdeplasmadir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(kdeplasmadir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(kdeplasmadir)" || exit 1; \
+ fi; \
+ 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)$(kdeplasmadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(kdeplasmadir)" || exit $$?; \
+ done
+
+uninstall-kdeplasmaDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdeplasma_DATA)'; test -n "$(kdeplasmadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(kdeplasmadir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -316,7 +420,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(Xsessiondir)" "$(DESTDIR)$(kdeimgdir)"; do \
+ for dir in "$(DESTDIR)$(Xsessiondir)" "$(DESTDIR)$(edudir)" "$(DESTDIR)$(educontentsdir)" "$(DESTDIR)$(eduimgdir)" "$(DESTDIR)$(kdeimgdir)" "$(DESTDIR)$(kdeplasmadir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -370,7 +474,8 @@ info: info-am
info-am:
install-data-am: install-XsessionDATA install-data-local \
- install-kdeimgDATA
+ install-eduDATA install-educontentsDATA install-eduimgDATA \
+ install-kdeimgDATA install-kdeplasmaDATA
install-dvi: install-dvi-am
@@ -414,7 +519,9 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-XsessionDATA uninstall-kdeimgDATA
+uninstall-am: uninstall-XsessionDATA uninstall-eduDATA \
+ uninstall-educontentsDATA uninstall-eduimgDATA \
+ uninstall-kdeimgDATA uninstall-kdeplasmaDATA
.MAKE: install-am install-strip
@@ -422,17 +529,24 @@ uninstall-am: uninstall-XsessionDATA uninstall-kdeimgDATA
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-dvi install-dvi-am \
+ install-eduDATA install-educontentsDATA install-eduimgDATA \
install-exec install-exec-am install-html install-html-am \
- 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-info install-info-am install-kdeimgDATA \
+ install-kdeplasmaDATA 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-eduDATA uninstall-educontentsDATA \
+ uninstall-eduimgDATA uninstall-kdeimgDATA \
+ uninstall-kdeplasmaDATA
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(kdeimgdir)
+ $(mkinstalldirs) $(DESTDIR)$(edudir)
+ $(mkinstalldirs) $(DESTDIR)$(educontentsdir)
+ $(mkinstalldirs) $(DESTDIR)$(eduimgdir)
$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/art/kde/debian-edu.xml b/art/kde/debian-edu.xml
new file mode 100644
index 0000000..2f1646c
--- /dev/null
+++ b/art/kde/debian-edu.xml
@@ -0,0 +1,11 @@
+<background>
+ <static>
+ <duration>8640000.0</duration>
+ <file>
+ <size width="1280" height="1024">/usr/share/images/desktop-base/debian-edu-wallpaper01_1280x1024.svg</size>
+ <size width="1600" height="1200">/usr/share/images/desktop-base/debian-edu-wallpaper01_1600x1200.svg</size>
+ <size width="1920" height="1080">/usr/share/images/desktop-base/debian-edu-wallpaper01_1920x1080.svg</size>
+ <size width="1920" height="1200">/usr/share/images/desktop-base/debian-edu-wallpaper01_1920x1200.svg</size>
+ </file>
+ </static>
+</background>
diff --git a/art/kde/metadata.desktop b/art/kde/metadata.desktop
new file mode 100644
index 0000000..60221b0
--- /dev/null
+++ b/art/kde/metadata.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Debian-Edu
+
+X-KDE-PluginInfo-Name=Debian-Edu
+X-KDE-PluginInfo-Author=Wolfgang Schweer
+X-KDE-PluginInfo-Email=debian-edu at lists.debian.org
+X-KDE-PluginInfo-License=GPLv2+
diff --git a/art/kde/screenshot.png b/art/kde/screenshot.png
new file mode 100644
index 0000000..3fe1fee
Binary files /dev/null and b/art/kde/screenshot.png differ
diff --git a/art/kdm-theme/Makefile.in b/art/kdm-theme/Makefile.in
index d310598..783022e 100644
--- a/art/kdm-theme/Makefile.in
+++ b/art/kdm-theme/Makefile.in
@@ -183,23 +183,20 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
KDMTHEME = debian-edu.xml \
+ background.svg \
KdmGreeterTheme.desktop \
- caps.png \
- icon-language.png \
- icon-reboot.png \
- icon-session.png \
- icon-shutdown.png \
+ lineedit_active.png \
+ lineedit_normal.png \
+ lock.png \
+ rectangle.png \
screenshot.png \
- swirl.png \
- user-entry.png \
- user-entry-li.png \
- pw-entry.png \
- pw-entry-li.png \
- win-login.png
+ session_normal.png \
+ system_normal.png \
+ user_icon.png
kdmthemedir = $(datadir)/kde4/apps/kdm/themes/debian-edu
kdmtheme_DATA = $(KDMTHEME)
-EXTRA_DIST = $(kdmtheme_DATA) gpl.txt
+EXTRA_DIST = $(kdmtheme_DATA)
all: all-am
.SUFFIXES:
@@ -409,7 +406,6 @@ uninstall-am: uninstall-kdmthemeDATA
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(kdmthemedir)
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/default/kdm.d
$(INSTALL_DATA) kdm-default $(DESTDIR)$(sysconfdir)/default/kdm.d/20_debian-edu
diff --git a/art/kdm-theme/rectangle.png b/art/kdm-theme/rectangle.png
new file mode 100644
index 0000000..b9a13b1
Binary files /dev/null and b/art/kdm-theme/rectangle.png differ
diff --git a/art/kdm-theme/session_normal.png b/art/kdm-theme/session_normal.png
new file mode 100644
index 0000000..a970bf1
Binary files /dev/null and b/art/kdm-theme/session_normal.png differ
--
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