[debian-edu-commits] r80920 - in branches/wheezy/debian-edu-artwork: art/kde art/kdm-theme debian

schweer-guest at alioth.debian.org schweer-guest at alioth.debian.org
Tue Jun 18 16:08:59 UTC 2013


Author: schweer-guest
Date: 2013-06-18 16:08:59 +0000 (Tue, 18 Jun 2013)
New Revision: 80920

Added:
   branches/wheezy/debian-edu-artwork/art/kdm-theme/joy.xml
Modified:
   branches/wheezy/debian-edu-artwork/art/kde/Makefile.am
   branches/wheezy/debian-edu-artwork/art/kdm-theme/Makefile.am
   branches/wheezy/debian-edu-artwork/debian/changelog
   branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm
   branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst
Log:
Use default joy theme with Debian Edu background for kdm. To achieve
that a modified joy.xml file containing the path to the background
image /usr/share/wallpapers/debian-edu-wallpaper02_1600x1200.svg is 
provided.

Modified: branches/wheezy/debian-edu-artwork/art/kde/Makefile.am
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kde/Makefile.am	2013-06-18 16:03:04 UTC (rev 80919)
+++ branches/wheezy/debian-edu-artwork/art/kde/Makefile.am	2013-06-18 16:08:59 UTC (rev 80920)
@@ -14,11 +14,11 @@
 kdeimgdir = $(datadir)/wallpapers/
 kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
 
-Xsessiondir      = /etc/X11/Xsession.d/
-Xsession_DATA    = 25debian-edu-artwork
+#Xsessiondir      = /etc/X11/Xsession.d/
+#Xsession_DATA    = 25debian-edu-artwork
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(kdeimgdir)
-	$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
+#	$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
 
-EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA)
+#EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA)

Modified: branches/wheezy/debian-edu-artwork/art/kdm-theme/Makefile.am
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kdm-theme/Makefile.am	2013-06-18 16:03:04 UTC (rev 80919)
+++ branches/wheezy/debian-edu-artwork/art/kdm-theme/Makefile.am	2013-06-18 16:08:59 UTC (rev 80920)
@@ -1,4 +1,4 @@
-KDMTHEME = debian-edu.xml \
+#KDMTHEME = debian-edu.xml \
 	KdmGreeterTheme.desktop \
 	caps.png \
 	icon-language.png \
@@ -13,12 +13,16 @@
 	pw-entry-li.png \
 	win-login.png
 
-kdmthemedir = $(datadir)/kde4/apps/kdm/themes/debian-edu
-kdmtheme_DATA = $(KDMTHEME)
+KDMJOYTHEME = joy.xml
 
+#kdmthemedir = $(datadir)/kde4/apps/kdm/themes/debian-edu
+kdmjoythemedir = $(datadir)/kde4/apps/kdm/themes/joy
+#kdmtheme_DATA = $(KDMTHEME)
+kdmjoytheme_DATA = $(KDMJOYTHEME)
+
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(kdmthemedir)
+	$(mkinstalldirs) $(DESTDIR)$(kdmjoythemedir)
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/default/kdm.d
-	$(INSTALL_DATA) kdm-default $(DESTDIR)$(sysconfdir)/default/kdm.d/20_debian-edu
+#	$(INSTALL_DATA) kdm-default $(DESTDIR)$(sysconfdir)/default/kdm.d/20_debian-edu
 
-EXTRA_DIST = $(kdmtheme_DATA) gpl.txt
+#EXTRA_DIST = $(kdmtheme_DATA) gpl.txt

Added: branches/wheezy/debian-edu-artwork/art/kdm-theme/joy.xml
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kdm-theme/joy.xml	                        (rev 0)
+++ branches/wheezy/debian-edu-artwork/art/kdm-theme/joy.xml	2013-06-18 16:08:59 UTC (rev 80920)
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+
+<greeter id="theme">
+	<style font="Sans 12" window-text-color="#bfd9ff"
+	       base-color="#bfd9ff" alternate-base-color="#666666"
+	       text-color="#555555" disabled-text-color="#999999"
+	       base-alpha="0" 
+	       disabled-base-color="#ff0000"
+	       disabled-base-alpha="0.25" 
+	       disabled-highlight-alpha="0"
+	       frame="false" />
+	       
+	<item type="pixmap" id="background" background="true">
+		<normal file="/usr/share/wallpapers/debian-edu-wallpaper02_1600x1200.svg" scalemode="scale"/>
+		<pos x="0" y="0" width="100%" height="100%"/>
+	</item>
+<!--		
+	<item type="pixmap" id="system-session">
+		<normal file="rectangle.png"/>
+		<pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+	</item>
+
+	<item type="pixmap" id="branding-logo" background="true">
+		<normal file="branding.png" alpha=".4" />
+		<pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+	</item>
+-->
+	<item type="pixmap" id="system-session">
+	  <normal file="rectangle.png"/>
+	  <pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+        
+	  <fixed>
+            <item type="label" id="welcome">
+	      <pos anchor="nw" x="20" y="20"/>
+	      <normal alpha="1.0" font="Sans Bold 14" color="#444444"/>
+	      <text>%h </text>
+            </item>
+	  </fixed>
+	</item>
+    
+	
+	<item type="rect">
+        <pos anchor="c" x="50%" y="50%" width="200" height="100"/>
+		<box orientation="vertical" spacing="10" homogeneous="true">
+            
+			<item type="rect" id="user-field">
+				<pos anchor="c" x="50%" y="50%" width="200" height="box"/>
+				<fixed>
+                    <item type="pixmap">
+                        <pos anchor="w" x="0" y="50%"/>
+                        <normal file="user_icon.png"/>
+                    </item>
+                
+                    <item type="pixmap">
+                        <pos anchor="w" x="42" y="50%"/>
+                        <normal file="lineedit_normal.png"/>
+                        <prelight file="lineedit_active.png"/>
+                        <active file="lineedit_active.png"/>
+                    </item>
+                    
+                    <item type="entry" id="user-entry">
+                        <pos anchor="w" x="49" y="50%" width="140" height="20"/>
+                    </item>
+                </fixed>
+            </item>
+            
+            <item type="rect" id="user-field2">
+                <pos anchor="c" x="50%" y="50%" width="200" height="box"/>
+                <fixed>
+                    <item type="pixmap" button="true">
+                        <pos anchor="w" x="0%" y="50%"/>
+                        <normal file="lock.png"/>
+                    </item>
+                
+                    <item type="pixmap">
+                        <pos anchor="w" x="42" y="50%"/>
+                        <normal file="lineedit_normal.png"/>
+                        <prelight file="lineedit_active.png"/>
+                        <active file="lineedit_active.png"/>
+                    </item>
+                    
+                    <item type="entry" id="pw-entry">
+                        <pos anchor="w" x="49" y="50%" width="140" height="20"/>
+                    </item>
+                </fixed>
+            </item>
+		</box>
+	</item> 
+	
+	<item type="rect" id="system-session">
+        <pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+        <fixed>
+            <item type="label">
+                <pos anchor="se" x="-15" y="-20"/>
+                <normal font="Sans Bold 10" color="#444444"/>
+                <text>%c</text>
+            </item>
+            
+            <item type="pixmap" id="session_button" button="true">
+                <normal alpha="1.0" file="session_normal.png"/>
+                <prelight file="session_normal.png"/>
+                <active file="session_normal.png"/>
+                <pos anchor="sw" x="22" y="-20"/>
+            </item>
+            
+            <item type="pixmap" id="system_button" button="true">
+                <normal alpha="1.0" file="system_normal.png"/>
+                <prelight file="system_normal.png"/>
+                <active file="system_normal.png"/>
+                <pos anchor="sw" x="50" y="-20"/>
+            </item>
+	</fixed>
+    </item>
+
+	<item type="rect" id="caps-lock-warning">
+        <pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+        <fixed>
+            <item type="label" id="mesage">
+                <normal color="#444444" font="Sans Bold 10"/>
+                <pos anchor="s" x="50%" y="80%"/>
+                <stock type="caps-lock-warning"/>
+            </item>	
+        </fixed>
+	</item>
+
+	<item type="rect" id="pam-error-paceholder">
+	<pos anchor="c" x="50%" y="42%" widht="615" height="200"/>
+	<fixed>
+		<item type="label" id="pam-error">
+			<pos anchor="c" x="50%" y="50%" expand="true"/>
+			<normal alpha="1.0" color="#aa4444" font="Sans Bold 10"/>
+			<text/>
+		</item>
+	</fixed>
+	</item>
+
+</greeter>

Modified: branches/wheezy/debian-edu-artwork/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/changelog	2013-06-18 16:03:04 UTC (rev 80919)
+++ branches/wheezy/debian-edu-artwork/debian/changelog	2013-06-18 16:08:59 UTC (rev 80920)
@@ -1,3 +1,12 @@
+debian-edu-artwork (0.0.38-1.1) UNRELEASED; urgency=low
+
+  * Use default joy theme with Debian Edu background for kdm. To achieve
+    that a modified joy.xml file containing the path to the background
+    image /usr/share/wallpapers/debian-edu-wallpaper02_1600x1200.svg is 
+    provided.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 18 Jun 2013 14:47:31 +0200
+
 debian-edu-artwork (0.0.38-1) unstable; urgency=low
 
   * Bump upstream version, appearantly the Debian Edu archive has problems

Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm	2013-06-18 16:03:04 UTC (rev 80919)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm	2013-06-18 16:08:59 UTC (rev 80920)
@@ -5,6 +5,7 @@
 if [ "$1" = remove ]
 then
 	dpkg-divert --package debian-edu-artwork --rename --remove /usr/share/gdm/defaults.conf
+	dpkg-divert --package debian-edu-artwork --rename --remove /usr/share/kde4/apps/kdm/themes/joy/joy.xml
 	dpkg-divert --package debian-edu-artwork --rename \
 	    --remove /usr/share/images/desktop-base/login-background.svg
 fi

Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst	2013-06-18 16:03:04 UTC (rev 80919)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst	2013-06-18 16:08:59 UTC (rev 80920)
@@ -6,6 +6,8 @@
 then
 	dpkg-divert --package debian-edu-artwork --divert \
 		/usr/share/gdm/defaults.conf.orig --rename /usr/share/gdm/defaults.conf
+	dpkg-divert --package debian-edu-artwork --divert \
+		/usr/share/kde4/apps/kdm/themes/joy/joy.xml.orig --rename /usr/share/kde4/apps/kdm/themes/joy/joy.xml
         dpkg-divert --package debian-edu-artwork --rename \
             --divert /usr/share/images/desktop-base/login-background.svg.edu-diverted \
             --add /usr/share/images/desktop-base/login-background.svg




More information about the debian-edu-commits mailing list