From 59df25d9febddf1c40e8350af1d73eeb3d1db54c Mon Sep 17 00:00:00 2001
From: Fathi Boudra <fabo@debian.org>
Date: Wed, 9 Jan 2008 14:09:29 +0000
Subject: [PATCH]   * Update kdm theme for KDE 4.   * Use zoom option instead
 of scaled option in gnome background.     (Closes: #439838)   * Update
 Makefile to fix wrong permissions on    
 /usr/share/gnome-background-properties. (Closes: #452425)

---
 Makefile                                      |  2 +-
 debian/changelog                              |  7 ++-
 debian/copyright                              |  2 +-
 gnome-backgrounds.xml                         |  2 +-
 kdm-theme/debian-moreblue/debian-moreblue.xml | 44 +++++++++++++++++++
 5 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 4fdccd2..45f6290 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,6 @@ install:
 	mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4-session
 	$(INSTALL) $(wildcard profiles/xdg-config/xfce4-session/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4-session
 	# GNOME background descriptor
-	$(INSTALL) -d $(DESTDIR)/usr/share/gnome-background-properties
+	mkdir -p $(DESTDIR)/usr/share/gnome-background-properties
 	$(INSTALL) gnome-backgrounds.xml $(DESTDIR)/usr/share/gnome-background-properties/debian.xml
 
diff --git a/debian/changelog b/debian/changelog
index b40eea8..81c9943 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-desktop-base (4.0.5) UNRELEASED; urgency=low
+desktop-base (4.0.5) unstable; urgency=low
 
   * Bump Standards-Version to 3.7.3.
   * Add Homepage field.
   * Remove DM-Upload-Allowed: yes; All Uploaders are DD.
+  * Update kdm theme for KDE 4.
+  * Use zoom option instead of scaled option in gnome background.
+    (Closes: #439838)
+  * Update Makefile to fix wrong permissions on
+    /usr/share/gnome-background-properties. (Closes: #452425)
   * Provide 640x480 TGA version of debian-blueish-wallpaper.svg for GRUB 2.
     Thanks to Robert Millan (Closes: #459352)
 
diff --git a/debian/copyright b/debian/copyright
index 5b20de3..990146c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -61,7 +61,7 @@ splash/gnome-debian-sid-splash.png, wallpapers/gnome-debian-sid-wp.xcf.gz
 and wallpapers/gnome-debian-sid-wp.png were made by Josselin Mouette 
 <joss@debian.org> and Gustavo Franco <stratus@debian.org>.
 
-The following files are Copyright 2006 André Luiz Rodrigues Ferreira and
+The following files are Copyright 2006 André Luiz Rodrigues Ferreira and
 licensed under the GPL.
     - SVG background, backgrounds/debian-blueish-wallpaper.svg.
     - PNG splash, splash/gnome-splash-curves.png.
diff --git a/gnome-backgrounds.xml b/gnome-backgrounds.xml
index d10858d..daff250 100644
--- a/gnome-backgrounds.xml
+++ b/gnome-backgrounds.xml
@@ -5,7 +5,7 @@
     <!-- don't include words such as "wallpaper" (avoids translations) -->
     <name>Debian Etch</name>
     <filename>/usr/share/images/desktop-base/desktop-background</filename>
-    <options>scaled</options>
+    <options>zoom</options>
     <shade_type>horizontal-gradient</shade_type>
     <pcolor>#0099cc</pcolor>
     <scolor>#006699</scolor>
diff --git a/kdm-theme/debian-moreblue/debian-moreblue.xml b/kdm-theme/debian-moreblue/debian-moreblue.xml
index 959b9e8..c8f135d 100644
--- a/kdm-theme/debian-moreblue/debian-moreblue.xml
+++ b/kdm-theme/debian-moreblue/debian-moreblue.xml
@@ -3,100 +3,133 @@
 <greeter>
 
 <!-- main pic, login pic -->
+<fixed>
 <item type="svg">
 	<normal file="background.svg"/>
 	<pos x="0" y="0" width="100%" height="100%"/>
 
 	<!-- swirl -->
+	<fixed>
 	<item type="svg">
 		<normal file="swirl.svg"/>
 		<pos x="-300" y="-320" width="250" height="290"/>
 	</item>
+	</fixed>
 
+	<fixed>
 	<item type="pixmap">
 		<normal file="boundingbox.png"/>
 		<pos anchor="c" x="50%" y="50%" width="400" height="282"/>
 
 		<!-- Welcome -->
+		<fixed>
 		<item type="label">
 			<pos anchor="nc" x="50%" y="18%"/>
 			<normal color="#000000" font="Sans Bold 18"/>
 			<stock type="welcome-label"/>
 		</item>
+		</fixed>
 
+		<fixed>
 		<item type="rect">
 			<normal color="#ffff00" alpha="0.0"/>
 			<pos anchor="e" x="50%" y="50%" width="190" height="180"/>
 
 			<!-- username-label -->
+			<fixed>
 			<item type="label">
 				<pos anchor="ne" x="90%" y="40%"/>
 				<normal color="#000000" font="Sans Bold 10"/>
 				<stock type="username-label"/>
 			</item>
+			</fixed>
 			
 			<!-- password-label -->
+			<fixed>
 			<item type="label">
 				<pos anchor="ne" x="90%" y="60%"/>
 				<normal color="#000000" font="Sans Bold 10"/>
 				<stock type="password-label"/>
 			</item>
+			</fixed>
 		</item>
+		</fixed>
 
+		<fixed>
 		<item type="rect">
 			<normal color="#00ffff" alpha="0.0"/>
 			<pos anchor="w" x="50%" y="50%" width="190" height="180"/>
 			
 			<!-- username-entry -->
+			<fixed>
 			<item type="entry" id="user-entry">
 				<pos anchor="n" x="30%" y="35%" height="25" width="150"/>
 			</item>
+			</fixed>
 			
 			<!-- password-entry -->
+			<fixed>
 			<item type="entry" id="pw-entry">
 				<pos anchor="n" x="30%" y="55%" height="25" width="150"/>
 			</item>
+			</fixed>
 		</item>
+		</fixed>
 	</item>
+	</fixed>
 
 	<!-- capslock-warning -->
+	<fixed>
 	<item type="rect" id="caps-lock-warning">
 		<pos anchor="c" x="50%" y="50%" width="box" height="box"/>
 		<box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+			<fixed>
 			<item type="label">
 				<normal color="#000000" font="Sans 12"/>
 				<pos anchor="n" x="50%" y="90"/>
 				<stock type="caps-lock-warning"/>
 			</item>
+			</fixed>
 		</box>
 	</item>
+	</fixed>
 
 	<!-- Login-Error -->
+	<fixed>
 	<item type="rect" id="pam-error">
 		<pos anchor="c" x="50%" y="50%" width="box" height="box"/>
 		<box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+			<fixed>
 			<item type="label">
 				<normal color="#000000" font="Sans 12"/>
 				<pos anchor="n" x="50%" y="60"/>
 				<text>Login failed.</text>
 			</item>
+			</fixed>
 		</box>
 	</item>
+	</fixed>
 
 </item>
+</fixed>
 
 <!-- icons and text in bottom bar -->
+<fixed>
 <item type="rect">
 	<pos x="0" y="-60" width="100%" height="60"/>
 
+	<fixed>
 	<item type="pixmap" id="session_button" button="true">
 		<normal file="icon-session.png"/>
 		<pos x="20" y="20"/>
 	</item>
+	</fixed>
 
 	<!-- session-button -->
+	<fixed>
 	<item type="rect" id="session_button" button="true">
 		<pos x="60" y="30" width="110" height="100%"/>
+		<fixed>
 		<item type="label">
 			<normal color="#ffffff" font="Sans Bold 12"/>
 			<prelight color="#bbbbbb" font="Sans Bold 12"/>
@@ -104,17 +137,23 @@
 			<pos y="0" x="0"/>
 			<stock type="session"/>
 		</item>
+		</fixed>
 	</item>
+	</fixed>
 
+	<fixed>
 	<item type="pixmap" id="system_button" button="true">
 		<normal file="icon-reboot.png"/>
 		<pos x="180" y="20"/>
 	</item>
+	</fixed>
 
 	<!-- menu-button -->
+	<fixed>
 	<item type="rect" id="system_button" button="true">
 		<show modes="console" type="system"/>
 		<pos x="215" y="30" width="50" height="100%"/>
+		<fixed>
 		<item type="label">
 			<normal color="#ffffff" font="Sans Bold 12"/>
 			<prelight color="#bbbbbb" font="Sans Bold 12"/>
@@ -122,13 +161,18 @@
 			<pos y="0" x="0"/>
 			<stock type="system"/>
 		</item>
+		</fixed>
 	</item>
+	</fixed>
 
 	<!-- clock -->
+	<fixed>
 	<item type="label" id="clock">
 		<normal color="#ffffff" font="Sans Bold 11"/>
 		<pos anchor="se" x="-20" y="-10"/>
 		<text>%c</text>
 	</item>
+	</fixed>
 </item>
+</fixed>
 </greeter>