[debian-edu-commits] r81176 - in branches/wheezy/debian-edu-artwork/art: . kde kdm-theme

Tue Jun 25 17:36:49 UTC 2013

Author: schweer-guest
Date: 2013-06-25 17:36:49 +0000 (Tue, 25 Jun 2013)
New Revision: 81176

Added:
   branches/wheezy/debian-edu-artwork/art/kde/1024x768.png
   branches/wheezy/debian-edu-artwork/art/kde/1280x1024.png
   branches/wheezy/debian-edu-artwork/art/kde/1280x800.png
   branches/wheezy/debian-edu-artwork/art/kde/1366x768.png
   branches/wheezy/debian-edu-artwork/art/kde/1600x1200.png
   branches/wheezy/debian-edu-artwork/art/kde/1920x1080.png
   branches/wheezy/debian-edu-artwork/art/kde/1920x1200.png
   branches/wheezy/debian-edu-artwork/art/kde/20-desktop-base-edu.js
   branches/wheezy/debian-edu-artwork/art/kde/800x600.png
   branches/wheezy/debian-edu-artwork/art/kde/debian-edu.xml
   branches/wheezy/debian-edu-artwork/art/kde/metadata.desktop
   branches/wheezy/debian-edu-artwork/art/kde/screenshot.png
   branches/wheezy/debian-edu-artwork/art/kdm-theme/rectangle.png
   branches/wheezy/debian-edu-artwork/art/kdm-theme/session_normal.png
Modified:
   branches/wheezy/debian-edu-artwork/art/Makefile.in
   branches/wheezy/debian-edu-artwork/art/kde/Makefile.in
   branches/wheezy/debian-edu-artwork/art/kdm-theme/Makefile.in
Log:
run automake -a -c and autoreconf; add forgotten files.

Modified: branches/wheezy/debian-edu-artwork/art/Makefile.in
===================================================================

--- branches/wheezy/debian-edu-artwork/art/Makefile.in	2013-06-25 17:18:40 UTC (rev 81175)
+++ branches/wheezy/debian-edu-artwork/art/Makefile.in	2013-06-25 17:36:49 UTC (rev 81176)
@@ -192,7 +192,7 @@
 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:

Added: branches/wheezy/debian-edu-artwork/art/kde/1024x768.png
===================================================================
(Binary files differ)


Property changes on: branches/wheezy/debian-edu-artwork/art/kde/1024x768.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/wheezy/debian-edu-artwork/art/kde/1280x1024.png
===================================================================
(Binary files differ)


Property changes on: branches/wheezy/debian-edu-artwork/art/kde/1280x1024.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/wheezy/debian-edu-artwork/art/kde/1280x800.png
===================================================================
(Binary files differ)


Property changes on: branches/wheezy/debian-edu-artwork/art/kde/1280x800.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/wheezy/debian-edu-artwork/art/kde/1366x768.png
===================================================================
(Binary files differ)


Property changes on: branches/wheezy/debian-edu-artwork/art/kde/1366x768.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/wheezy/debian-edu-artwork/art/kde/1600x1200.png
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kde/1600x1200.png	                        (rev 0)
+++ branches/wheezy/debian-edu-artwork/art/kde/1600x1200.png	2013-06-25 17:36:49 UTC (rev 81176)
@@ -0,0 +1 @@
+link debian-edu-wallpaper01_1600x1200.png
\ No newline at end of file


Property changes on: branches/wheezy/debian-edu-artwork/art/kde/1600x1200.png
___________________________________________________________________
Added: svn:special
   + *

Added: branches/wheezy/debian-edu-artwork/art/kde/1920x1080.png
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kde/1920x1080.png	                        (rev 0)
+++ branches/wheezy/debian-edu-artwork/art/kde/1920x1080.png	2013-06-25 17:36:49 UTC (rev 81176)
@@ -0,0 +1 @@
+link debian-edu-wallpaper01_1920x1080.png
\ No newline at end of file


Property changes on: branches/wheezy/debian-edu-artwork/art/kde/1920x1080.png
___________________________________________________________________
Added: svn:special
   + *

Added: branches/wheezy/debian-edu-artwork/art/kde/1920x1200.png
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kde/1920x1200.png	                        (rev 0)
+++ branches/wheezy/debian-edu-artwork/art/kde/1920x1200.png	2013-06-25 17:36:49 UTC (rev 81176)
@@ -0,0 +1 @@
+link debian-edu-wallpaper01_1920x1200.png
\ No newline at end of file


Property changes on: branches/wheezy/debian-edu-artwork/art/kde/1920x1200.png
___________________________________________________________________
Added: svn:special
   + *

Added: branches/wheezy/debian-edu-artwork/art/kde/20-desktop-base-edu.js
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kde/20-desktop-base-edu.js	                        (rev 0)
+++ branches/wheezy/debian-edu-artwork/art/kde/20-desktop-base-edu.js	2013-06-25 17:36:49 UTC (rev 81176)
@@ -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
+}

Added: branches/wheezy/debian-edu-artwork/art/kde/800x600.png
===================================================================
(Binary files differ)


Property changes on: branches/wheezy/debian-edu-artwork/art/kde/800x600.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: branches/wheezy/debian-edu-artwork/art/kde/Makefile.in
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kde/Makefile.in	2013-06-25 17:18:40 UTC (rev 81175)
+++ branches/wheezy/debian-edu-artwork/art/kde/Makefile.in	2013-06-25 17:36:49 UTC (rev 81176)
@@ -92,8 +92,11 @@
     || { 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 @@
 	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 @@
 	@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 @@
 	@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: 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-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-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 @@
 	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.

Added: branches/wheezy/debian-edu-artwork/art/kde/debian-edu.xml
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kde/debian-edu.xml	                        (rev 0)
+++ branches/wheezy/debian-edu-artwork/art/kde/debian-edu.xml	2013-06-25 17:36:49 UTC (rev 81176)
@@ -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>

Added: branches/wheezy/debian-edu-artwork/art/kde/metadata.desktop
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kde/metadata.desktop	                        (rev 0)
+++ branches/wheezy/debian-edu-artwork/art/kde/metadata.desktop	2013-06-25 17:36:49 UTC (rev 81176)
@@ -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+

Added: branches/wheezy/debian-edu-artwork/art/kde/screenshot.png
===================================================================
(Binary files differ)


Property changes on: branches/wheezy/debian-edu-artwork/art/kde/screenshot.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: branches/wheezy/debian-edu-artwork/art/kdm-theme/Makefile.in
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kdm-theme/Makefile.in	2013-06-25 17:18:40 UTC (rev 81175)
+++ branches/wheezy/debian-edu-artwork/art/kdm-theme/Makefile.in	2013-06-25 17:36:49 UTC (rev 81176)
@@ -183,23 +183,20 @@
 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 @@
 
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(kdmthemedir)
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/default/kdm.d
 	$(INSTALL_DATA) kdm-default $(DESTDIR)$(sysconfdir)/default/kdm.d/20_debian-edu
 

Added: branches/wheezy/debian-edu-artwork/art/kdm-theme/rectangle.png
===================================================================
(Binary files differ)


Property changes on: branches/wheezy/debian-edu-artwork/art/kdm-theme/rectangle.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/wheezy/debian-edu-artwork/art/kdm-theme/session_normal.png
===================================================================
(Binary files differ)


Property changes on: branches/wheezy/debian-edu-artwork/art/kdm-theme/session_normal.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


