Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Factory checked in at Thu Sep 29 12:49:17 CEST 2011. -------- --- openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes 2011-09-28 14:02:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/branding-openSUSE/branding-openSUSE.changes 2011-09-28 15:50:07.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Sep 28 13:49:55 UTC 2011 - coolo@suse.com + +- use jpg as kdm background + +------------------------------------------------------------------- +Wed Sep 28 13:16:24 UTC 2011 - coolo@suse.com + +- add kdm theme from Marcus + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- sysconfig.displaymanager-kdm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.Pe8Ppy/_old 2011-09-29 12:49:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Pe8Ppy/_new 2011-09-29 12:49:00.000000000 +0200 @@ -30,6 +30,7 @@ Source10: wallpaper-branding-openSUSE.xml.in Source11: wallpaper-openSUSE-default-static.xml Source20: sysconfig.bootsplash-branding-openSUSE +Source21: sysconfig.displaymanager-kdm Source100: %{name}-COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-build %ifarch x86_64 %ix86 @@ -121,6 +122,21 @@ %description -n ksplashx-branding-openSUSE openSUSE branding for KDE splash +%package -n kdm-branding-openSUSE +Summary: KDE login and display manager +Group: System/GUI/KDE +PreReq: %fillup_prereq +Supplements: packageand(kdm:branding-openSUSE) +Provides: kdm-branding = %{version} +Provides: kde4-kdm-branding-openSUSE = %{version} +Obsoletes: kde4-kdm-branding-openSUSE < %{version} +Conflicts: otherproviders(kdm-branding) +BuildArch: noarch +Requires: wallpaper-branding-openSUSE + +%description -n kdm-branding-openSUSE +This package contains openSUSE branding for kdm, the login and session manager for KDE. + %prep %setup -c @@ -155,7 +171,7 @@ cp -a %{SOURCE100} %{buildroot}/etc/bootsplash/themes/openSUSE/LICENSE mkdir -p %{buildroot}/var/adm/fillup-templates -cp %{SOURCE20} %{buildroot}/var/adm/fillup-templates/ +cp %{SOURCE20} %{SOURCE21} %{buildroot}/var/adm/fillup-templates/ %if 0%{?package_gfxboot} > 0 install -d -m 755 %{buildroot}/etc/bootsplash/themes/openSUSE/{bootloader,cdrom} @@ -215,6 +231,11 @@ cp openSUSE/kde-workspace/metadata.desktop %{buildroot}/usr/share/wallpapers/openSUSEdefault/metadata.desktop %suse_update_desktop_file %{buildroot}/usr/share/wallpapers/openSUSEdefault/metadata.desktop +mkdir -p %{buildroot}%{_kde4_appsdir} +cp -a openSUSE/kdm %{buildroot}%{_kde4_appsdir}/kdm +ln -s /usr/share/wallpapers/default-1600x1200.jpg %{buildroot}/usr/share/kde4/apps/kdm/themes/SUSE/background-1600x1200.jpg +ln -s /usr/share/wallpapers/default-1920x1200.jpg %{buildroot}/usr/share/kde4/apps/kdm/themes/SUSE/background-1920x1200.jpg + %post -n bootsplash-branding-openSUSE %{fillup_only -ns bootsplash branding-openSUSE } perl -pi -e 's/^(THEME=).*/$1"openSUSE"/' /etc/sysconfig/bootsplash @@ -237,6 +258,9 @@ update-alternatives --remove openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-static.xml fi +%post -n kdm-branding-openSUSE +%{fillup_only -n displaymanager -s kdm} + %files %defattr(-,root,root) %doc COPYING @@ -290,4 +314,10 @@ %dir /usr/share/kde4/apps/ksplash /usr/share/kde4/apps/ksplash/Themes +%files -n kdm-branding-openSUSE +%defattr(-,root,root) +%doc COPYING +%{_kde4_appsdir}/kdm +%{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager-kdm + %changelog ++++++ openSUSE.tar.gz ++++++ Files old/openSUSE/kde-workspace/screenshot.jpg and new/openSUSE/kde-workspace/screenshot.jpg differ Files old/openSUSE/kdelibs/body-background.jpg and new/openSUSE/kdelibs/body-background.jpg differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE/kdm/pics/.randomlist new/openSUSE/kdm/pics/.randomlist --- old/openSUSE/kdm/pics/.randomlist 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSE/kdm/pics/.randomlist 2011-09-22 13:44:08.000000000 +0200 @@ -0,0 +1 @@ +person Files old/openSUSE/kdm/pics/kdelogo.png and new/openSUSE/kdm/pics/kdelogo.png differ Files old/openSUSE/kdm/pics/shutdown.jpg and new/openSUSE/kdm/pics/shutdown.jpg differ Files old/openSUSE/kdm/pics/users/default1.png and new/openSUSE/kdm/pics/users/default1.png differ Files old/openSUSE/kdm/pics/users/root1.png and new/openSUSE/kdm/pics/users/root1.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE/kdm/themes/SUSE/KdmGreeterTheme.desktop new/openSUSE/kdm/themes/SUSE/KdmGreeterTheme.desktop --- old/openSUSE/kdm/themes/SUSE/KdmGreeterTheme.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSE/kdm/themes/SUSE/KdmGreeterTheme.desktop 2011-09-28 14:45:41.000000000 +0200 @@ -0,0 +1,8 @@ +# This is not really a .desktop file like the rest, but it is useful to treat +# it as such + +[KdmGreeterTheme] +Greeter=openSUSE.xml +Name=openSUSE KDM Theme +Author=Marcus Moeller +Copyright=GPL 2011 Files old/openSUSE/kdm/themes/SUSE/lineedit_normal.png and new/openSUSE/kdm/themes/SUSE/lineedit_normal.png differ Files old/openSUSE/kdm/themes/SUSE/lock.png and new/openSUSE/kdm/themes/SUSE/lock.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE/kdm/themes/SUSE/openSUSE.xml new/openSUSE/kdm/themes/SUSE/openSUSE.xml --- old/openSUSE/kdm/themes/SUSE/openSUSE.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSE/kdm/themes/SUSE/openSUSE.xml 2011-09-28 15:54:32.000000000 +0200 @@ -0,0 +1,139 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE greeter SYSTEM "greeter.dtd"> + +<greeter id="theme"> + <style font="Sans 12" window-text-color="#323232" + base-color="#bfd9ff" alternate-base-color="#666666" + text-color="#323232" disabled-text-color="#333333" + 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="background.jpg" scalemode="crop"/> + <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="rect" id="system-session"> + <pos anchor="c" x="50%" y="50%" width="416" height="262"/> + + <fixed> + <item type="label" id="welcome"> + <pos anchor="c" x="50%" y="45"/> + <normal alpha="0.75" font="Sans Bold 14" color="#ffffff"/> + <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"/> + </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"/> + </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="-40" y="-37"/> + <normal alpha="0.75" font="Sans Bold 10" color="#FFFFFF"/> + <text>%c</text> + </item> + + <item type="pixmap" id="session_button" button="true"> + <normal alpha="0.8" file="session_normal.png"/> + <prelight file="session_normal.png"/> + <active file="session_normal.png"/> + <pos anchor="sw" x="40" y="-30"/> + </item> + + <item type="pixmap" id="system_button" button="true"> + <normal alpha="0.8" file="system_normal.png"/> + <prelight file="system_normal.png"/> + <active file="system_normal.png"/> + <pos anchor="sw" x="80" y="-30"/> + </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="message"> + <normal color="#323232" font="Sans Bold 10"/> + <pos anchor="s" x="50%" y="75%"/> + <stock type="caps-lock-warning"/> + </item> + </fixed> + </item> + + <item type="rect" id="pam-error-placeholder"> + <pos anchor="c" x="50%" y="98%" width="615" height="200"/> + + <item type="label" id="dummy1"> + <normal alpha="0" color="#323232" font="Sans Bold 10"/> + <!-- </text> --> + </item> + + <item type="label" id="pam-error"> + <pos anchor="c" x="50%" y="50%" expand="true"/> + <normal alpha="0" color="#323232" font="Sans Bold 10"/> + <!-- </text> --> + </item> + + </item> + +</greeter> Files old/openSUSE/kdm/themes/SUSE/rectangle.png and new/openSUSE/kdm/themes/SUSE/rectangle.png differ Files old/openSUSE/kdm/themes/SUSE/session_normal.png and new/openSUSE/kdm/themes/SUSE/session_normal.png differ Files old/openSUSE/kdm/themes/SUSE/system_normal.png and new/openSUSE/kdm/themes/SUSE/system_normal.png differ Files old/openSUSE/kdm/themes/SUSE/user_icon.png and new/openSUSE/kdm/themes/SUSE/user_icon.png differ Files old/openSUSE/ksplashx/1600x1200/opensuse-logo.png and new/openSUSE/ksplashx/1600x1200/opensuse-logo.png differ Files old/openSUSE/ksplashx/Preview.png and new/openSUSE/ksplashx/Preview.png differ Files old/openSUSE/wallpapers/openSUSE121-1600x1200.jpg and new/openSUSE/wallpapers/openSUSE121-1600x1200.jpg differ Files old/openSUSE/wallpapers/openSUSE121-1920x1200.jpg and new/openSUSE/wallpapers/openSUSE121-1920x1200.jpg differ Files old/openSUSE/yast_wizard/background.png and new/openSUSE/yast_wizard/background.png differ ++++++ sysconfig.displaymanager-kdm ++++++ ## Path: Desktop/Display manager ## Description: settings to generate a proper displaymanager config ## Config: kdm3 ## Type: string ## Default: # # space separated list of users for which icons should be shown in KDM # if empty, then take system defaults # KDM_USERS="" ## Type: string ## Default: # # Special greeting words in kdm # KDM_GREETSTRING="" ## Type: string ## Default: # # Defines extra Server Arguments given to the kdm display manager when # starting a local display. Useful to override e.g. the -dpi setting. # DISPLAYMANAGER_KDM_LOCALARGS="" ## Type: string ## Default: SUSE # # Define the theme to be used by kdm. If empty, the traditional login # window is used (which lacks some features) # DISPLAYMANAGER_KDM_THEME="SUSE" ## Type: yesno ## Default: yes # # Allow local access of the user root to your display manager. Note # that root can never login if DISPLAYMANAGER_SHUTDOWN is "auto" and # System/Security/Permissions/PERMISSION_SECURITY is "paranoid". # This settings currently works only with KDM. # DISPLAYMANAGER_ROOT_LOGIN_LOCAL="yes" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org