[debian-edu-commits] debian-edu/ 53/437: Install kdm theme and adjust kde wallpaper name to match it.
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:23 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 d8db20b637e9a716f753cdee81751a0dff57613a
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Sun Sep 3 09:30:42 2006 +0000
Install kdm theme and adjust kde wallpaper name to match it.
---
art/Makefile.am | 2 +-
art/Makefile.in | 2 +-
art/kde/Makefile.am | 4 ++--
art/kde/Makefile.in | 4 ++--
...debian-edu-kde.png => debian-edu-wallpaper.png} | Bin
...ng.desktop => debian-edu-wallpaper.png.desktop} | 0
art/kdm-theme/GdmGreeterTheme.desktop | 8 +++----
art/kdm-theme/{kubuntu.xml => debian-edu.xml} | 4 ++--
art/splash/Makefile.in | 7 ++++--
configure | 25 ++++++++++++---------
configure.in | 1 +
11 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/art/Makefile.am b/art/Makefile.am
index a634821..c4d56bd 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -1 +1 @@
-SUBDIRS = kde ldm splash splashy usplash
+SUBDIRS = kde kdm-theme ldm splash splashy usplash
diff --git a/art/Makefile.in b/art/Makefile.in
index bd08e5a..ab952d9 100644
--- a/art/Makefile.in
+++ b/art/Makefile.in
@@ -134,7 +134,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = kde ldm splash splashy usplash
+SUBDIRS = kde kdm-theme ldm splash splashy usplash
all: all-recursive
.SUFFIXES:
diff --git a/art/kde/Makefile.am b/art/kde/Makefile.am
index 6db9cc0..2e2e223 100644
--- a/art/kde/Makefile.am
+++ b/art/kde/Makefile.am
@@ -1,7 +1,7 @@
-KDEIMG = debian-edu-kde.png
+KDEIMG = debian-edu-wallpaper.png
kdeimgdir = $(datadir)/wallpapers
-kdeimg_DATA = $(KDEIMG) debian-edu-kde.png.desktop
+kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(kdeimgdir)
diff --git a/art/kde/Makefile.in b/art/kde/Makefile.in
index c32e15e..77f5a17 100644
--- a/art/kde/Makefile.in
+++ b/art/kde/Makefile.in
@@ -135,9 +135,9 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-KDEIMG = debian-edu-kde.png
+KDEIMG = debian-edu-wallpaper.png
kdeimgdir = $(datadir)/wallpapers
-kdeimg_DATA = $(KDEIMG) debian-edu-kde.png.desktop
+kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
EXTRA_DIST = $(kdeimg_DATA)
all: all-am
diff --git a/art/kde/debian-edu-kde.png b/art/kde/debian-edu-wallpaper.png
similarity index 100%
rename from art/kde/debian-edu-kde.png
rename to art/kde/debian-edu-wallpaper.png
diff --git a/art/kde/debian-edu-kde.png.desktop b/art/kde/debian-edu-wallpaper.png.desktop
similarity index 100%
rename from art/kde/debian-edu-kde.png.desktop
rename to art/kde/debian-edu-wallpaper.png.desktop
diff --git a/art/kdm-theme/GdmGreeterTheme.desktop b/art/kdm-theme/GdmGreeterTheme.desktop
index dcbca7a..98d3c0a 100644
--- a/art/kdm-theme/GdmGreeterTheme.desktop
+++ b/art/kdm-theme/GdmGreeterTheme.desktop
@@ -3,8 +3,8 @@
[GdmGreeterTheme]
Encoding=UTF-8
-Greeter=kubuntu.xml
-Name=Kubuntu O2
-Description=A sleek and professional looking KDM theme for Kubuntu
-Author=Ken Wimer (wimer at kde.org)
+Greeter=debian-edu.xml
+Name=Debian Edu O1
+Description=A nice KDM theme for Debian Edu
+Author=Petter Reinholdtsen (pere at hungry.com)
Screenshot=preview.png
diff --git a/art/kdm-theme/kubuntu.xml b/art/kdm-theme/debian-edu.xml
similarity index 97%
rename from art/kdm-theme/kubuntu.xml
rename to art/kdm-theme/debian-edu.xml
index 9c22bec..ad96af8 100644
--- a/art/kdm-theme/kubuntu.xml
+++ b/art/kdm-theme/debian-edu.xml
@@ -2,8 +2,8 @@
<!DOCTYPE greeter SYSTEM "greeter.dtd">
<greeter>
<item type="pixmap" >
- <normal file="/usr/share/wallpapers/kubuntu-wallpaper.png" />
- <!-- <normal file="kubuntu-wallpaper.png" /> -->
+ <normal file="/usr/share/wallpapers/debian-edu-wallpaper.png" />
+ <!-- <normal file="debian-edu-wallpaper.png" /> -->
<!-- <pos width="100%" x="0" y="0" height="100%" /> -->
<pos width="100%" x="0" y="0" height="100%" />
</item>
diff --git a/art/splash/Makefile.in b/art/splash/Makefile.in
index 40dc21e..9cbb3b5 100644
--- a/art/splash/Makefile.in
+++ b/art/splash/Makefile.in
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = art/splash
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -141,7 +141,7 @@ splash_DATA = $(SPLASH)
grubdir = /boot/grub
grubsplashdir = $(grubdir)/splashimages
EXTRA_DIST = $(splash_DATA)
-CLEANFILES = debian-edu-splash.xpm.gz
+CLEANFILES = debian-edu-splash.xpm.gz debian-edu-splash.rle
all: all-am
.SUFFIXES:
@@ -327,6 +327,9 @@ install-data-local: debian-edu-splash.xpm.gz
debian-edu-splash.xpm.gz: debian-edu-splash.png
convert debian-edu-splash.png debian-edu-splash.xpm
gzip -9 debian-edu-splash.xpm
+
+debian-edu-splash.rle: debian-edu-splash.png
+ pngtopnm < $^ | ppmquant 16 | ppmtolss16 "#ffffff=7" "#000000=0" > $@
# 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/configure b/configure
index 60377dc..5e33172 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60.
+# Generated by GNU Autoconf 2.60a.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1302,7 +1302,7 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.60a
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1316,7 +1316,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.60a. Invocation command line was
$ $0 $@
@@ -2579,7 +2579,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -2607,6 +2607,12 @@ done
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
+ ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2618,8 +2624,6 @@ See \`config.log' for more details." >&2;}
fi
ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
@@ -3431,7 +3435,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/kde/Makefile art/ldm/Makefile art/splash/Makefile art/splashy/Makefile art/usplash/Makefile"
+ac_config_files="$ac_config_files Makefile art/Makefile art/kde/Makefile art/kdm-theme/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
@@ -3868,7 +3872,7 @@ exec 6>&1
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.60a. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -3896,7 +3900,7 @@ current configuration.
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
- -V, --version print version number, then exit
+ -V, --version print version number and configuration settings, then exit
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
@@ -3915,7 +3919,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.60a,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
@@ -4022,6 +4026,7 @@ do
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"art/Makefile") CONFIG_FILES="$CONFIG_FILES art/Makefile" ;;
"art/kde/Makefile") CONFIG_FILES="$CONFIG_FILES art/kde/Makefile" ;;
+ "art/kdm-theme/Makefile") CONFIG_FILES="$CONFIG_FILES art/kdm-theme/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" ;;
diff --git a/configure.in b/configure.in
index c3799c9..11595ea 100644
--- a/configure.in
+++ b/configure.in
@@ -25,6 +25,7 @@ AC_OUTPUT([
Makefile
art/Makefile
art/kde/Makefile
+art/kdm-theme/Makefile
art/ldm/Makefile
art/splash/Makefile
art/splashy/Makefile
--
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