[debian-edu-commits] debian-edu/ 381/437: diff after run of autoreconf
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:54 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 b5923f7f54c7a0ffbbf3b1db7cc9846cb9b16c45
Author: Wolfgang Schweer <w.schweer at gmx.de>
Date: Tue Jun 18 16:10:33 2013 +0000
diff after run of autoreconf
---
art/kde/Makefile.in | 59 +++++++++++----------------------
art/kdm-theme/Makefile.in | 84 +++++++++++++++++++++++++----------------------
2 files changed, 64 insertions(+), 79 deletions(-)
diff --git a/art/kde/Makefile.in b/art/kde/Makefile.in
index 1180152..52484c2 100644
--- a/art/kde/Makefile.in
+++ b/art/kde/Makefile.in
@@ -92,8 +92,8 @@ 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)$(kdeimgdir)"
+DATA = $(kdeimg_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -197,9 +197,6 @@ KDEIMG = debian-edu-wallpaper01_1600x1200.png \
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:
@@ -233,27 +230,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(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=; \
@@ -316,7 +292,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)$(kdeimgdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -369,8 +345,7 @@ info: info-am
info-am:
-install-data-am: install-XsessionDATA install-data-local \
- install-kdeimgDATA
+install-data-am: install-data-local install-kdeimgDATA
install-dvi: install-dvi-am
@@ -414,26 +389,30 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-XsessionDATA uninstall-kdeimgDATA
+uninstall-am: 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-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
+ 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
+
+#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.
diff --git a/art/kdm-theme/Makefile.in b/art/kdm-theme/Makefile.in
index d310598..89b9f08 100644
--- a/art/kdm-theme/Makefile.in
+++ b/art/kdm-theme/Makefile.in
@@ -92,8 +92,8 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(kdmthemedir)"
-DATA = $(kdmtheme_DATA)
+am__installdirs = "$(DESTDIR)$(kdmjoythemedir)"
+DATA = $(kdmjoytheme_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -182,24 +182,27 @@ target_alias = @target_alias@
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
-
-kdmthemedir = $(datadir)/kde4/apps/kdm/themes/debian-edu
-kdmtheme_DATA = $(KDMTHEME)
-EXTRA_DIST = $(kdmtheme_DATA) gpl.txt
+
+#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)
all: all-am
.SUFFIXES:
@@ -233,27 +236,27 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-install-kdmthemeDATA: $(kdmtheme_DATA)
+install-kdmjoythemeDATA: $(kdmjoytheme_DATA)
@$(NORMAL_INSTALL)
- @list='$(kdmtheme_DATA)'; test -n "$(kdmthemedir)" || list=; \
+ @list='$(kdmjoytheme_DATA)'; test -n "$(kdmjoythemedir)" || list=; \
if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(kdmthemedir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(kdmthemedir)" || exit 1; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(kdmjoythemedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(kdmjoythemedir)" || 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)$(kdmthemedir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(kdmthemedir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(kdmjoythemedir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(kdmjoythemedir)" || exit $$?; \
done
-uninstall-kdmthemeDATA:
+uninstall-kdmjoythemeDATA:
@$(NORMAL_UNINSTALL)
- @list='$(kdmtheme_DATA)'; test -n "$(kdmthemedir)" || list=; \
+ @list='$(kdmjoytheme_DATA)'; test -n "$(kdmjoythemedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(kdmthemedir)'; $(am__uninstall_files_from_dir)
+ dir='$(DESTDIR)$(kdmjoythemedir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -295,7 +298,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(kdmthemedir)"; do \
+ for dir in "$(DESTDIR)$(kdmjoythemedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -348,7 +351,7 @@ info: info-am
info-am:
-install-data-am: install-data-local install-kdmthemeDATA
+install-data-am: install-data-local install-kdmjoythemeDATA
install-dvi: install-dvi-am
@@ -392,7 +395,7 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-kdmthemeDATA
+uninstall-am: uninstall-kdmjoythemeDATA
.MAKE: install-am install-strip
@@ -401,17 +404,20 @@ uninstall-am: uninstall-kdmthemeDATA
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-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-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-data-local:
- $(mkinstalldirs) $(DESTDIR)$(kdmthemedir)
+ $(mkinstalldirs) $(DESTDIR)$(kdmjoythemedir)
$(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.
--
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