[debian-edu-commits] debian-edu/ 288/437: Replace unused logo by a Debian swirl and switch it on.

[Mike Gabriel]

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 cb9f0fb2ffae5e782061cefd33a915a3c2531d70
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Sat Jun 18 21:53:05 2011 +0000

    Replace unused logo by a Debian swirl and switch it on.
---
 art/kdm-theme/Makefile.am    |   2 +-
 art/kdm-theme/Makefile.in    |   2 +-
 art/kdm-theme/debian-edu.xml |  27 +++++++++++++++++----------
 art/kdm-theme/slx-small.png  | Bin 9634 -> 0 bytes
 art/kdm-theme/swirl.png      | Bin 0 -> 2692 bytes
 debian/changelog             |   1 +
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/art/kdm-theme/Makefile.am b/art/kdm-theme/Makefile.am
index de3dc01..11a6214 100644
--- a/art/kdm-theme/Makefile.am
+++ b/art/kdm-theme/Makefile.am
@@ -6,7 +6,7 @@ KDMTHEME = debian-edu.xml \
 	icon-session.png \
 	icon-shutdown.png \
 	screenshot.png \
-	slx-small.png \
+	swirl.png \
 	user-entry.png \
 	user-entry-li.png \
 	pw-entry.png \
diff --git a/art/kdm-theme/Makefile.in b/art/kdm-theme/Makefile.in
index 8948344..c3dec69 100644
--- a/art/kdm-theme/Makefile.in
+++ b/art/kdm-theme/Makefile.in
@@ -162,7 +162,7 @@ KDMTHEME = debian-edu.xml \
 	icon-session.png \
 	icon-shutdown.png \
 	screenshot.png \
-	slx-small.png \
+	swirl.png \
 	user-entry.png \
 	user-entry-li.png \
 	pw-entry.png \
diff --git a/art/kdm-theme/debian-edu.xml b/art/kdm-theme/debian-edu.xml
index 2b1ee03..0a3f7de 100644
--- a/art/kdm-theme/debian-edu.xml
+++ b/art/kdm-theme/debian-edu.xml
@@ -121,16 +121,23 @@
   <item type="rect">
     <pos x="50%" y="50%" width="474" height="334" anchor="c"/>
     <box orientation="vertical">
-      <!-- skolelinux label
-      <item type="pixmap">
-        <normal file="slx-small.png"/>
-        <pos anchor="c" x="50%" y="60%"/>
-      </item> -->
-      <!-- welcome -->
-      <item type="label" id="welcome-label">
-        <pos x="50%" y="95" anchor="c" height="80"/>
-        <normal font="Sans Bold 18" color="#000000"/>
-        <stock type="welcome-label"/>
+      <!-- container for the welcome message -->
+      <item type="rect">
+        <pos anchor="c" x="50%" y="80%" width="400" height="80"/>
+	<!-- container for labels etc. -->
+	<box orientation="horizontal">
+	  <!-- Debian swirl -->
+	  <item type="pixmap"> 
+	    <normal file="swirl.png"/>
+	    <pos anchor="e" x="0%" y="20%" />
+	  </item>
+	  <!-- welcome -->
+	  <item type="label" id="welcome-label">
+	    <pos x="45%" y="50%" anchor="c" />
+	    <normal font="Sans Bold 18" color="#000000"/>
+	    <stock type="welcome-label"/>
+	  </item>
+	</box>
       </item>
       <item type="rect" id="user-field">
         <pos anchor="c" x="50%" y="160%" width="400" height="80"/>
diff --git a/art/kdm-theme/slx-small.png b/art/kdm-theme/slx-small.png
deleted file mode 100644
index 491a5a7..0000000
Binary files a/art/kdm-theme/slx-small.png and /dev/null differ
diff --git a/art/kdm-theme/swirl.png b/art/kdm-theme/swirl.png
new file mode 100644
index 0000000..b65a143
Binary files /dev/null and b/art/kdm-theme/swirl.png differ
diff --git a/debian/changelog b/debian/changelog
index 3f2cd09..a0a9e06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ debian-edu-artwork (0.0.32-3) UNRELEASED; urgency=low
   * Remove diversion of /usr/share/desktop-base/grub_background.sh as it
     is not needed when using update-alternatives.
   * Update ldm logo to new artwork, add screenshot with new logo in use.
+  * Replace unused logo by a Debian swirl and switch it on.
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 06 Dec 2010 11:12:20 +0100
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git