[debian-edu-commits] debian-edu/ 284/437: Fit kdm/gdm better with new debian-edu-wallpaper.

[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 9f666c9a27bf2e47e35769ea63d1463bb0aad485
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Sat Jun 18 13:57:10 2011 +0000

    Fit kdm/gdm better with new debian-edu-wallpaper.
---
 art/gdm-theme/debian-edu.xml | 14 ++++++--------
 art/kdm-theme/debian-edu.xml | 14 ++++++--------
 debian/changelog             |  1 +
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/art/gdm-theme/debian-edu.xml b/art/gdm-theme/debian-edu.xml
index cb413ce..7354bbd 100644
--- a/art/gdm-theme/debian-edu.xml
+++ b/art/gdm-theme/debian-edu.xml
@@ -3,9 +3,7 @@
 <greeter>
   <!-- background (use default wallpaper) -->
   <item type="pixmap" id="background" background="true">
-    <normal file="/usr/share/wallpapers/debian-edu-wallpaper.png" />
-    <!-- <normal file="debian-edu-wallpaper.png" /> -->
-    <!-- <pos width="100%" x="0" y="0" height="100%" /> -->
+    <normal file="/usr/share/wallpapers/debian-edu-wallpaper01_1600x1200.png" />
     <pos width="100%" x="0" y="0" height="100%" />
   </item>
   <!-- hostname and clock -->
@@ -123,17 +121,17 @@
   <item type="rect">
     <pos x="50%" y="50%" width="474" height="334" anchor="c"/>
     <box orientation="vertical">
-      <!-- skolelinux label -->
+      <!-- skolelinux label
       <item type="pixmap">
         <normal file="slx-small.png"/>
         <pos anchor="c" x="50%" y="60%"/>
-      </item>
+      </item> -->
       <!-- welcome -->
-      <!-- <item type="label" id="welcome-label">
-        <pos x="50%" y="95" anchor="c"/>
+      <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"/>
-      </item> -->
+      </item>
       <!-- username label -->
       <item type="label" id="pam-prompt">
         <pos x="50%" y="80" anchor="c"/>
diff --git a/art/kdm-theme/debian-edu.xml b/art/kdm-theme/debian-edu.xml
index 0dcf1d1..2b1ee03 100644
--- a/art/kdm-theme/debian-edu.xml
+++ b/art/kdm-theme/debian-edu.xml
@@ -3,9 +3,7 @@
 <greeter>
   <!-- background (use default wallpaper) -->
   <item type="pixmap" id="background" background="true">
-    <normal file="/usr/share/wallpapers/debian-edu-wallpaper.png" />
-    <!-- <normal file="debian-edu-wallpaper.png" /> -->
-    <!-- <pos width="100%" x="0" y="0" height="100%" /> -->
+    <normal file="/usr/share/wallpapers/debian-edu-wallpaper01_1600x1200.png" />
     <pos width="100%" x="0" y="0" height="100%" />
   </item>
   <!-- hostname and clock -->
@@ -123,17 +121,17 @@
   <item type="rect">
     <pos x="50%" y="50%" width="474" height="334" anchor="c"/>
     <box orientation="vertical">
-      <!-- skolelinux label -->
+      <!-- skolelinux label
       <item type="pixmap">
         <normal file="slx-small.png"/>
         <pos anchor="c" x="50%" y="60%"/>
-      </item>
+      </item> -->
       <!-- welcome -->
-      <!-- <item type="label" id="welcome-label">
-        <pos x="50%" y="95" anchor="c"/>
+      <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"/>
-      </item> -->
+      </item>
       <item type="rect" id="user-field">
         <pos anchor="c" x="50%" y="160%" width="400" height="80"/>
         <style font="Sans 11" window-text-color="#bfd9ff"
diff --git a/debian/changelog b/debian/changelog
index a9c4d4c..1bc424a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ debian-edu-artwork (0.0.32-3) UNRELEASED; urgency=low
   * Clean art/splash/ from magic needed for GRUB legacy. It is not needed
     for GRUB2.  Remove imagemagick from builddeps.
   * Add all available resolutions of the debian-edu-wallpaper.
+  * Fit kdm/gdm better with new debian-edu-wallpaper.
 
  -- 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