[debian-edu-commits] debian-edu/ 38/437: [ Petter Reinholdtsen ] * Copy debian-edu theme for ldm from the ltsp package to try to collect all artwork for Debian Edu in one location.
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:22 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 436c48961c30123a03f9428a88ddf4524570a2dd
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Wed Aug 9 21:24:50 2006 +0000
[ Petter Reinholdtsen ]
* Copy debian-edu theme for ldm from the ltsp package to try to collect
all artwork for Debian Edu in one location.
---
art/Makefile.am | 2 +-
art/Makefile.in | 2 +-
art/ldm/Makefile.am | 7 ++
art/{ => ldm}/Makefile.in | 262 +++++++++++++---------------------------------
art/ldm/background.png | Bin 0 -> 13771 bytes
art/ldm/colors | 25 +++++
art/ldm/icon-language.png | Bin 0 -> 582 bytes
art/ldm/icon-session.png | Bin 0 -> 900 bytes
art/ldm/shutdown.png | Bin 0 -> 1528 bytes
configure | 3 +-
configure.in | 1 +
debian/changelog | 8 ++
12 files changed, 116 insertions(+), 194 deletions(-)
diff --git a/art/Makefile.am b/art/Makefile.am
index e069c30..bdfa8a4 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -1 +1 @@
-SUBDIRS = splash splashy usplash
+SUBDIRS = ldm splash splashy usplash
diff --git a/art/Makefile.in b/art/Makefile.in
index b535309..38c1da9 100644
--- a/art/Makefile.in
+++ b/art/Makefile.in
@@ -134,7 +134,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = splash splashy usplash
+SUBDIRS = ldm splash splashy usplash
all: all-recursive
.SUFFIXES:
diff --git a/art/ldm/Makefile.am b/art/ldm/Makefile.am
new file mode 100644
index 0000000..bd66fb8
--- /dev/null
+++ b/art/ldm/Makefile.am
@@ -0,0 +1,7 @@
+ldmdir = $(datadir)/ldm/themes/debian-edu
+ldm_DATA = background.png colors icon-language.png icon-session.png shutdown.png
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(ldmdir)
+
+EXTRA_DIST = $(ldm_DATA)
diff --git a/art/Makefile.in b/art/ldm/Makefile.in
similarity index 51%
copy from art/Makefile.in
copy to art/ldm/Makefile.in
index b535309..677a925 100644
--- a/art/Makefile.in
+++ b/art/ldm/Makefile.in
@@ -13,13 +13,14 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -33,7 +34,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-subdir = art
+subdir = art/ldm
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -43,15 +44,15 @@ mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+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 = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(ldmdir)"
+ldmDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(ldm_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
@@ -134,8 +135,10 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = splash splashy usplash
-all: all-recursive
+ldmdir = $(datadir)/ldm/themes/debian-edu
+ldm_DATA = background.png colors icon-language.png icon-session.png shutdown.png
+EXTRA_DIST = $(ldm_DATA)
+all: all-am
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@@ -147,9 +150,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu art/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu art/ldm/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu art/Makefile
+ $(AUTOMAKE) --gnu art/ldm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -168,138 +171,29 @@ $(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
uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+install-ldmDATA: $(ldm_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(ldmdir)" || $(mkdir_p) "$(DESTDIR)$(ldmdir)"
+ @list='$(ldm_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(ldmDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ldmdir)/$$f'"; \
+ $(ldmDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ldmdir)/$$f"; \
done
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
+uninstall-ldmDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(ldm_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(ldmdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(ldmdir)/$$f"; \
+ done
tags: TAGS
+TAGS:
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+CTAGS:
+
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -328,35 +222,22 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
- done
check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(ldmdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-recursive
+installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -372,66 +253,65 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+clean: clean-am
clean-am: clean-generic mostlyclean-am
-distclean: distclean-recursive
+distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
+distclean-am: clean-am distclean-generic
-dvi: dvi-recursive
+dvi: dvi-am
dvi-am:
-html: html-recursive
+html: html-am
-info: info-recursive
+info: info-am
info-am:
-install-data-am:
+install-data-am: install-data-local install-ldmDATA
install-exec-am:
-install-info: install-info-recursive
+install-info: install-info-am
install-man:
installcheck-am:
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-am
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-pdf: pdf-recursive
+pdf: pdf-am
pdf-am:
-ps: ps-recursive
+ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-ldmDATA
-uninstall-info: uninstall-info-recursive
+.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-exec install-exec-am install-info \
+ install-info-am install-ldmDATA install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
+ uninstall-ldmDATA
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-recursive ctags ctags-recursive \
- distclean distclean-generic distclean-recursive distclean-tags \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(ldmdir)
# 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:
diff --git a/art/ldm/background.png b/art/ldm/background.png
new file mode 100644
index 0000000..42b7a74
Binary files /dev/null and b/art/ldm/background.png differ
diff --git a/art/ldm/colors b/art/ldm/colors
new file mode 100644
index 0000000..57326eb
--- /dev/null
+++ b/art/ldm/colors
@@ -0,0 +1,25 @@
+######################## ldm colortheme file ############################
+#
+# (c) 2006 Petter Reinholdtsen
+# (c) 2005 Canoical Ltd.
+# Oliver Grawert <ogra at ubuntu.com>
+#
+#########################################################################
+# Theme: Debian Edu, based on the Edubuntu theme by Oliver Grawert
+#########################################################################
+#
+# Values known by ldm:
+#
+# frame_color = the color of the small frame around the username/password
+# entry
+# foreground = the color of text and bottom bar
+# clockforeground = the color of the clock string
+# loginwin_color = the background of the centered login window
+#
+#########################################################################
+
+frame_color = "#000000"
+foreground = "#523921"
+background = "#ffffde"
+clockforeground = "#ffffff"
+loginwin_color = "#f7ebd6"
diff --git a/art/ldm/icon-language.png b/art/ldm/icon-language.png
new file mode 100644
index 0000000..6b8cfa3
Binary files /dev/null and b/art/ldm/icon-language.png differ
diff --git a/art/ldm/icon-session.png b/art/ldm/icon-session.png
new file mode 100644
index 0000000..5d47fcb
Binary files /dev/null and b/art/ldm/icon-session.png differ
diff --git a/art/ldm/shutdown.png b/art/ldm/shutdown.png
new file mode 100644
index 0000000..f11779a
Binary files /dev/null and b/art/ldm/shutdown.png differ
diff --git a/configure b/configure
index 6493a70..38ce9bb 100755
--- a/configure
+++ b/configure
@@ -3431,7 +3431,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-ac_config_files="$ac_config_files Makefile art/Makefile art/splash/Makefile art/splashy/Makefile art/usplash/Makefile"
+ac_config_files="$ac_config_files Makefile art/Makefile art/ldm/Makefile art/splash/Makefile art/splashy/Makefile art/usplash/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -4021,6 +4021,7 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"art/Makefile") CONFIG_FILES="$CONFIG_FILES art/Makefile" ;;
+ "art/ldm/Makefile") CONFIG_FILES="$CONFIG_FILES art/ldm/Makefile" ;;
"art/splash/Makefile") CONFIG_FILES="$CONFIG_FILES art/splash/Makefile" ;;
"art/splashy/Makefile") CONFIG_FILES="$CONFIG_FILES art/splashy/Makefile" ;;
"art/usplash/Makefile") CONFIG_FILES="$CONFIG_FILES art/usplash/Makefile" ;;
diff --git a/configure.in b/configure.in
index 36bb7b1..734ea18 100644
--- a/configure.in
+++ b/configure.in
@@ -24,6 +24,7 @@ AC_PROG_INSTALL
AC_OUTPUT([
Makefile
art/Makefile
+art/ldm/Makefile
art/splash/Makefile
art/splashy/Makefile
art/usplash/Makefile
diff --git a/debian/changelog b/debian/changelog
index aeeb868..e9bad67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu-artwork (0.0.5) UNRELEASED; urgency=low
+
+ [ Petter Reinholdtsen ]
+ * Copy debian-edu theme for ldm from the ltsp package to try to collect
+ all artwork for Debian Edu in one location.
+
+ -- Petter Reinholdtsen <pere at debian.org> Wed, 9 Aug 2006 23:22:25 +0200
+
debian-edu-artwork (0.0.4) unstable; urgency=low
[ Morten Werner Olsen ]
--
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