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

Tue Jun 25 10:58:15 UTC 2013

Author: schweer-guest
Date: 2013-06-25 10:58:14 +0000 (Tue, 25 Jun 2013)
New Revision: 81163

Modified:
   branches/wheezy/debian-edu-artwork/art/kde/Makefile.in
   branches/wheezy/debian-edu-artwork/art/kdm-theme/Makefile.in
Log:
Revert commit 80921

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

--- branches/wheezy/debian-edu-artwork/art/kde/Makefile.in	2013-06-25 10:56:53 UTC (rev 81162)
+++ branches/wheezy/debian-edu-artwork/art/kde/Makefile.in	2013-06-25 10:58:14 UTC (rev 81163)
@@ -92,8 +92,8 @@
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(kdeimgdir)"
-DATA = $(kdeimg_DATA)
+am__installdirs = "$(DESTDIR)$(Xsessiondir)" "$(DESTDIR)$(kdeimgdir)"
+DATA = $(Xsession_DATA) $(kdeimg_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -197,6 +197,9 @@
 
 kdeimgdir = $(datadir)/wallpapers/
 kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
+Xsessiondir = /etc/X11/Xsession.d/
+Xsession_DATA = 25debian-edu-artwork
+EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -230,6 +233,27 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+install-XsessionDATA: $(Xsession_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(Xsession_DATA)'; test -n "$(Xsessiondir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(Xsessiondir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(Xsessiondir)" || 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)$(Xsessiondir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(Xsessiondir)" || exit $$?; \
+	done
+
+uninstall-XsessionDATA:
+	@$(NORMAL_UNINSTALL)
+	@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-kdeimgDATA: $(kdeimg_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(kdeimg_DATA)'; test -n "$(kdeimgdir)" || list=; \
@@ -292,7 +316,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(kdeimgdir)"; do \
+	for dir in "$(DESTDIR)$(Xsessiondir)" "$(DESTDIR)$(kdeimgdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -345,7 +369,8 @@
 
 info-am:
 
-install-data-am: install-data-local install-kdeimgDATA
+install-data-am: install-XsessionDATA install-data-local \
+	install-kdeimgDATA
 
 install-dvi: install-dvi-am
 
@@ -389,31 +414,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-kdeimgDATA
+uninstall-am: uninstall-XsessionDATA uninstall-kdeimgDATA
 
 .MAKE: install-am install-strip
 
 .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-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-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-am uninstall-kdeimgDATA
+	install install-XsessionDATA 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-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
 
 
-#Xsessiondir      = /etc/X11/Xsession.d/
-#Xsession_DATA    = 25debian-edu-artwork
-
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(kdeimgdir)
-#	$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
+	$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
 
-#EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA)
-
 # 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:

Modified: branches/wheezy/debian-edu-artwork/art/kdm-theme/Makefile.in
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kdm-theme/Makefile.in	2013-06-25 10:56:53 UTC (rev 81162)
+++ branches/wheezy/debian-edu-artwork/art/kdm-theme/Makefile.in	2013-06-25 10:58:14 UTC (rev 81163)
@@ -92,8 +92,8 @@
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(kdmjoythemedir)"
-DATA = $(kdmjoytheme_DATA)
+am__installdirs = "$(DESTDIR)$(kdmthemedir)"
+DATA = $(kdmtheme_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -182,27 +182,24 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+KDMTHEME = debian-edu.xml \
+	KdmGreeterTheme.desktop \
+	caps.png \
+	icon-language.png \
+	icon-reboot.png \
+	icon-session.png \
+	icon-shutdown.png \
+	screenshot.png \
+	swirl.png \
+	user-entry.png \
+	user-entry-li.png \
+	pw-entry.png \
+	pw-entry-li.png \
+	win-login.png
 
-#KDMTHEME = debian-edu.xml \
-#	KdmGreeterTheme.desktop \
-#	caps.png \
-#	icon-language.png \
-#	icon-reboot.png \
-#	icon-session.png \
-#	icon-shutdown.png \
-#	screenshot.png \
-#	swirl.png \
-#	user-entry.png \
-#	user-entry-li.png \
-#	pw-entry.png \
-#	pw-entry-li.png \
-#	win-login.png
-KDMJOYTHEME = joy.xml
-
-#kdmthemedir = $(datadir)/kde4/apps/kdm/themes/debian-edu
-kdmjoythemedir = $(datadir)/kde4/apps/kdm/themes/joy
-#kdmtheme_DATA = $(KDMTHEME)
-kdmjoytheme_DATA = $(KDMJOYTHEME)
+kdmthemedir = $(datadir)/kde4/apps/kdm/themes/debian-edu
+kdmtheme_DATA = $(KDMTHEME)
+EXTRA_DIST = $(kdmtheme_DATA) gpl.txt
 all: all-am
 
 .SUFFIXES:
@@ -236,27 +233,27 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-kdmjoythemeDATA: $(kdmjoytheme_DATA)
+install-kdmthemeDATA: $(kdmtheme_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(kdmjoytheme_DATA)'; test -n "$(kdmjoythemedir)" || list=; \
+	@list='$(kdmtheme_DATA)'; test -n "$(kdmthemedir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(kdmjoythemedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(kdmjoythemedir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(kdmthemedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(kdmthemedir)" || 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)$(kdmjoythemedir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(kdmjoythemedir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(kdmthemedir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(kdmthemedir)" || exit $$?; \
 	done
 
-uninstall-kdmjoythemeDATA:
+uninstall-kdmthemeDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(kdmjoytheme_DATA)'; test -n "$(kdmjoythemedir)" || list=; \
+	@list='$(kdmtheme_DATA)'; test -n "$(kdmthemedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(kdmjoythemedir)'; $(am__uninstall_files_from_dir)
+	dir='$(DESTDIR)$(kdmthemedir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -298,7 +295,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(kdmjoythemedir)"; do \
+	for dir in "$(DESTDIR)$(kdmthemedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -351,7 +348,7 @@
 
 info-am:
 
-install-data-am: install-data-local install-kdmjoythemeDATA
+install-data-am: install-data-local install-kdmthemeDATA
 
 install-dvi: install-dvi-am
 
@@ -395,7 +392,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-kdmjoythemeDATA
+uninstall-am: uninstall-kdmthemeDATA
 
 .MAKE: install-am install-strip
 
@@ -404,21 +401,18 @@
 	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-kdmjoythemeDATA 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-kdmjoythemeDATA
+	install-info-am install-kdmthemeDATA 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-kdmthemeDATA
 
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(kdmjoythemedir)
+	$(mkinstalldirs) $(DESTDIR)$(kdmthemedir)
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/default/kdm.d
-#	$(INSTALL_DATA) kdm-default $(DESTDIR)$(sysconfdir)/default/kdm.d/20_debian-edu
+	$(INSTALL_DATA) kdm-default $(DESTDIR)$(sysconfdir)/default/kdm.d/20_debian-edu
 
-#EXTRA_DIST = $(kdmtheme_DATA) gpl.txt
-
 # 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:


