[debian-edu-commits] r81251 - in branches/wheezy/debian-edu-artwork/art: gdm-theme kde

Sat Jun 29 10:58:22 UTC 2013

Author: schweer-guest
Date: 2013-06-29 10:58:22 +0000 (Sat, 29 Jun 2013)
New Revision: 81251

Modified:
   branches/wheezy/debian-edu-artwork/art/gdm-theme/Makefile.in
   branches/wheezy/debian-edu-artwork/art/kde/Makefile.in
Log:
ran autoreconf


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

--- branches/wheezy/debian-edu-artwork/art/gdm-theme/Makefile.in	2013-06-29 10:57:24 UTC (rev 81250)
+++ branches/wheezy/debian-edu-artwork/art/gdm-theme/Makefile.in	2013-06-29 10:58:22 UTC (rev 81251)
@@ -14,7 +14,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
 am__make_dryrun = \
   { \
@@ -65,35 +64,6 @@
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(gdmthemedir)"
-DATA = $(gdmtheme_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -182,21 +152,6 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-GDMTHEME = debian-edu.xml \
-	GdmGreeterTheme.desktop \
-	caps.png \
-	icon-language.png \
-	icon-reboot.png \
-	icon-session.png \
-	icon-shutdown.png \
-	screenshot.png \
-	swirl.png \
-	userentry.png \
-	win-login.png
-
-gdmthemedir = $(datadir)/gdm/themes/debian-edu
-gdmtheme_DATA = $(GDMTHEME)
-EXTRA_DIST = $(gdmtheme_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -230,27 +185,6 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-gdmthemeDATA: $(gdmtheme_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(gdmtheme_DATA)'; test -n "$(gdmthemedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(gdmthemedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(gdmthemedir)" || 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)$(gdmthemedir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gdmthemedir)" || exit $$?; \
-	done
-
-uninstall-gdmthemeDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(gdmtheme_DATA)'; test -n "$(gdmthemedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(gdmthemedir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -290,11 +224,8 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(DATA)
+all-am: Makefile
 installdirs:
-	for dir in "$(DESTDIR)$(gdmthemedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -345,7 +276,7 @@
 
 info-am:
 
-install-data-am: install-data-local install-gdmthemeDATA
+install-data-am: install-data-local
 
 install-dvi: install-dvi-am
 
@@ -389,7 +320,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-gdmthemeDATA
+uninstall-am:
 
 .MAKE: install-am install-strip
 
@@ -397,18 +328,17 @@
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
 	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-gdmthemeDATA install-html \
-	install-html-am install-info install-info-am 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-gdmthemeDATA
+	install-exec-am install-html install-html-am install-info \
+	install-info-am 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
 
-
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(gdmthemedir)
-	$(INSTALL_DATA) defaults.conf $(DESTDIR)$(datadir)/gdm/defaults.conf
+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gdm3
+	$(INSTALL_DATA) greeter.gsettings \
+		$(DESTDIR)$(sysconfdir)/gdm3/greeter.gsettings
 
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gdm/dconf
 	$(INSTALL_DATA) 20-debian-edu-artwork-settings \

Modified: branches/wheezy/debian-edu-artwork/art/kde/Makefile.in
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kde/Makefile.in	2013-06-29 10:57:24 UTC (rev 81250)
+++ branches/wheezy/debian-edu-artwork/art/kde/Makefile.in	2013-06-29 10:58:22 UTC (rev 81251)
@@ -191,6 +191,7 @@
 	debian-edu-wallpaper02_1600x1200.png \
 	debian-edu-wallpaper02_1920x1080.png \
 	debian-edu-wallpaper02_1920x1200.png \
+	debian-edu-wallpaper01_1280x1024.svg \
 	debian-edu-wallpaper01_1600x1200.svg \
 	debian-edu-wallpaper01_1920x1080.svg \
 	debian-edu-wallpaper01_1920x1200.svg \


