Hello community,
here is the log from the commit of package kdebase3
checked in at Fri Oct 6 19:26:45 CEST 2006.
--------
--- KDE/kdebase3/kdebase3.changes 2006-10-04 11:50:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-10-06 14:23:23.000000000 +0200
@@ -1,0 +2,22 @@
+Fri Oct 6 14:22:36 CEST 2006 - coolo@suse.de
+
+- update to next 3.5.5 release tarball
+ - kdesu fixes
+ - kicker pager fix
+- fix kdm config reader to only reset changes in kdmrc once
+
+-------------------------------------------------------------------
+Wed Oct 4 15:15:35 CEST 2006 - hmacht@suse.de
+
+- new ksmserver-suspend.diff:
+ - query HAL for suspend capabilities and trigger sleep via HAL
+ - dependency to liblazy instead of powersave-devel for > 10.1
+- renname existing ksmserver-suspend.diff to
+ ksmserver-suspend_legacy-10.1.diff for 10.1
+
+-------------------------------------------------------------------
+Wed Oct 4 14:43:08 CEST 2006 - coolo@suse.de
+
+- let kdm start Xgl if configured so
+
+-------------------------------------------------------------------
Old:
----
kdm-fix-default-kdmrc.diff
use-sudo-for-kdesu.diff
New:
----
ksmserver-suspend_legacy-10.1.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.zADRib/_old 2006-10-06 19:24:24.000000000 +0200
+++ /var/tmp/diff_new_pack.zADRib/_new 2006-10-06 19:24:24.000000000 +0200
@@ -11,7 +11,14 @@
# norootforbuild
Name: kdebase3
-BuildRequires: OpenEXR-devel cups-devel db-devel doxygen graphviz hal-devel kdelibs3-devel krb5-devel libsmbclient libsmbclient-devel mDNSResponder-devel openldap2 openldap2-devel openmotif openmotif-devel openslp-devel openssh pam-devel pcsc-lite powersave-devel qt3-devel-doc samba-client utempter xorg-x11
+BuildRequires: OpenEXR-devel cups-devel db-devel doxygen graphviz hal-devel kdelibs3-devel krb5-devel libsmbclient libsmbclient-devel mDNSResponder-devel openldap2 openldap2-devel openmotif openmotif-devel openslp-devel openssh pam-devel pcsc-lite qt3-devel-doc samba-client utempter xorg-x11
+%if %suse_version > 930
+%if %suse_version > 1010
+BuildRequires: liblazy
+%else
+BuildRequires: powersave-devel
+%endif
+%endif
%if %suse_version > 1010
BuildRequires: libbeagle-devel
%endif
@@ -44,7 +51,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.5
-Release: 2
+Release: 3
%define kde_version 3.5.5
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -109,7 +116,6 @@
# svn diff $BASE/branches/KDE/3.5/kdebase/kdm@583746 $BASE/branches/work/coolos_kdm
Patch75: kdm-make_it_cool.diff
Patch76: kdm-admin-mode.diff
-Patch77: kdm-fix-default-kdmrc.diff
Patch78: kdm-relaxed-auth.diff
Patch79: kdm-wordbreak.diff
Patch80: non-fast-malloc.diff
@@ -117,6 +123,7 @@
Patch82: fix-lockup-from-gnome-apps.diff
Patch83: ksmserver-suspend.diff
Patch983: ksmserver-suspend_legacy.diff
+Patch1083: ksmserver-suspend_legacy-10.1.diff
Patch84: default-kdeprintfax.diff
Patch85: ksmserver-tooltips.diff
Patch86: disable-entries-in-gnome.diff
@@ -158,7 +165,6 @@
Patch164: kdm-path.diff
Patch165: optional-compmgr.diff
Patch166: lowdiskspace.patch
-Patch167: use-sudo-for-kdesu.diff
Provides: kdebase
%description
@@ -348,7 +354,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 131
+Release: 132
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -415,19 +421,20 @@
%patch164
%endif
%patch76
-%patch77
%patch78
%patch79
# default-to-halt
%patch81
%patch82
%ifarch %ix86 x86_64
-%if %suse_version > 930
-%if %suse_version > 1000
-%patch83
-%else
+%if %suse_version == 1000
%patch983
%endif
+%if %suse_version == 1010
+%patch1083
+%endif
+%if %suse_version > 1010
+%patch83
%endif
%endif
%patch84
@@ -482,7 +489,6 @@
%patch162
%patch165
%patch166
-%patch167
tar xvfj %SOURCE20
%endif
%patch163 -p1
@@ -523,6 +529,7 @@
$XINERAMA \
%if %suse_version > 1010
--with-motif-libraries=/usr/%{_lib}/ \
+ --with-sudo-kdesu-backend \
%else
--with-motif-libraries=/usr/X11R6/%{_lib}/ \
%endif
@@ -1433,6 +1440,19 @@
%endif
%changelog -n kdebase3
+* Fri Oct 06 2006 - coolo@suse.de
+- update to next 3.5.5 release tarball
+- kdesu fixes
+- kicker pager fix
+- fix kdm config reader to only reset changes in kdmrc once
+* Wed Oct 04 2006 - hmacht@suse.de
+- new ksmserver-suspend.diff:
+- query HAL for suspend capabilities and trigger sleep via HAL
+- dependency to liblazy instead of powersave-devel for > 10.1
+- renname existing ksmserver-suspend.diff to
+ ksmserver-suspend_legacy-10.1.diff for 10.1
+* Wed Oct 04 2006 - coolo@suse.de
+- let kdm start Xgl if configured so
* Wed Oct 04 2006 - dmueller@suse.de
- update 3_5_BRANCH.diff to include kicker minipager fixlets
* Tue Oct 03 2006 - stbinner@suse.de
++++++ 3_5_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.zADRib/_old 2006-10-06 19:24:24.000000000 +0200
+++ /var/tmp/diff_new_pack.zADRib/_new 2006-10-06 19:24:24.000000000 +0200
@@ -1,8 +1,7 @@
-package: kdebase-3.5.5.tar.bz2
-kdemod: kdebase
-svn di between /tags/KDE/3.5.5 and /branches/KDE//branches/KDE/3.5
---- pics/wallpapers/aurora.svgz.desktop
-+++ pics/wallpapers/aurora.svgz.desktop
+Index: pics/wallpapers/aurora.svgz.desktop
+===================================================================
+--- pics/wallpapers/aurora.svgz.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ pics/wallpapers/aurora.svgz.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -6,7 +6,7 @@
Name[br]=Sklerijenn an deiz
Name[cs]=Jitřenka
@@ -12,61 +11,49 @@
Name[fr]=Aurore
Name[he]=אאורורה
Name[is]=Norðurljós
---- kicker/applets/minipager/pagerapplet.cpp
-+++ kicker/applets/minipager/pagerapplet.cpp
-@@ -124,7 +124,7 @@
- desktopLayoutY = -1;
+Index: kicker/libkicker/kickerSettings.kcfg
+===================================================================
+--- kicker/libkicker/kickerSettings.kcfg (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ kicker/libkicker/kickerSettings.kcfg (.../branches/KDE/3.5/kdebase) (Revision 592985)
+@@ -307,7 +307,7 @@
- QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
-- m_useViewports = s.width() + s.height() > 1;
-+ m_useViewports = s.width() * s.height() > 1;
+ <entry name="MouseOversHideDelay" type="UInt" >
+ <label>Mouse over effects are hidden after the defined time (in milliseconds)</label>
+- <default>2000</default>
++ <default>200</default>
+ </entry>
- drawButtons();
-
-@@ -223,7 +223,8 @@
-
- void KMiniPager::slotButtonSelected( int desk )
- {
-- if (m_kwin->numberOfViewports(0).width()+m_kwin->numberOfViewports(0).height() > 1)
-+ if (m_kwin->numberOfViewports(m_kwin->currentDesktop()).width() *
-+ m_kwin->numberOfViewports(m_kwin->currentDesktop()).height() > 1)
- {
- QPoint p;
-
-@@ -435,7 +436,7 @@
- {
- int newDesk;
- int desktops = KWin::numberOfDesktops();
-- if (m_kwin->numberOfViewports(0).width() + m_kwin->numberOfViewports(0).height() > 1 )
-+ if (m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height() > 1 )
- desktops = m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height();
- if (e->delta() < 0)
- {
---- kicker/applets/minipager/pagerbutton.cpp
-+++ kicker/applets/minipager/pagerbutton.cpp
-@@ -116,12 +116,17 @@
- return false;
-
- if (m_useViewports) {
-- QPoint windowSpot = info->frameGeometry().topLeft();
-+ QPoint windowTopLeft = info->frameGeometry().topLeft();
-+ QPoint windowBottomRight = info->frameGeometry().bottomRight();
-
-- windowSpot += QPoint((m_desktop - m_pager->kwin()->currentViewport(0).x()) *
-+ windowTopLeft += QPoint((m_desktop - m_pager->kwin()->currentViewport(0).x()) *
-+ QApplication::desktop()->width(), 0);
-+ windowBottomRight += QPoint((m_desktop - m_pager->kwin()->currentViewport(0).x()) *
- QApplication::desktop()->width(), 0);
-
-- if (!QApplication::desktop()->screenGeometry().contains(windowSpot))
-+ if (!(info->state() & NET::Sticky) &&
-+ !QApplication::desktop()->geometry().contains(windowTopLeft) &&
-+ !QApplication::desktop()->geometry().contains(windowBottomRight))
- return false;
- }
-
---- l10n/ch/entry.desktop
-+++ l10n/ch/entry.desktop
+ <entry name="EnableTileBackground" type="Bool" >
+Index: kicker/libkicker/kickertip.cpp
+===================================================================
+--- kicker/libkicker/kickertip.cpp (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ kicker/libkicker/kickertip.cpp (.../branches/KDE/3.5/kdebase) (Revision 592985)
+@@ -451,7 +451,7 @@
+ // a button then out of kicker
+ if (isVisible())
+ {
+- m_timer.start(KickerSettings::mouseOversShowDelay() / 3, true);
++ m_timer.start(QMAX(50, KickerSettings::mouseOversShowDelay() / 10), true);
+ }
+ else
+ {
+Index: applnk/compat/email.desktop
+===================================================================
+--- applnk/compat/email.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ applnk/compat/email.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
+@@ -162,7 +162,7 @@
+ Keywords[cy]=EBost,Post,E-Bost,Cyfeiriad,Gweinydd ebost,IMAP,POP3,Blwch e-bost lleol,blwch e-bost,Gwybodaeth Defnyddiwr,Cyfeiriad Ateb,Gwybodaeth gweinydd,Enw Defnyddiwr,Cyfrineiriau,Gwesteiwr,Proffil Cyffredol,Proffil,Corff,Gwesteiwr Mewn,Gwesteiwr Allan,Dibynnydd Ebost
+ Keywords[da]=E-mail,Post,Adresse,Postserver,IMAP,POP3,Lokal postkasse,postkasse,Brugerinformation,Svaradresse,Serverinformation,Brugernavn,Kodeord,Vært, Denne profil,Profil,Organisation,Indkommende vært,Udgående vært, E-mail-klient
+ Keywords[de]=Email,Mail,E-Mail,Adresse,E-Mail-Server,IMAP,POP3,Lokale Mailbox,Mailbox,Postfach,Benutzerinformationen,Antwortadresse,Serverinformation,Benutzername,Passwörter,Rechner,Profil,Organisation,Posteingang,Postausgang,E-Mail-Programm
+-Keywords[el]=EMail,Mail,E-Mail,Διεύθυνση,Διακομιστής email,IMAP,POP3,Τοπική θυρίδα,θυρίδα,Πληροφορίες χρήστη,Διεύθυνση απάντησης,Πληροφορίες διακομιστή,Όνομα χρήστη,Κωδικοί πρόσβασης,Υπολογιστής,Τρέχων προφίλ,Προφίλ,Οργανισμός,Υπολογιστής εισερχομένων,Υπολογιστής εξερχομένων,Πελάτης email
++Keywords[el]=EMail,Mail,E-Mail,Διεύθυνση,Διακομιστής email,IMAP,POP3,Τοπική θυρίδα,θυρίδα,Πληροφορίες χρήστη,Διεύθυνση απάντησης,Πληροφορίες διακομιστή,Όνομα χρήστη,Κωδικοί πρόσβασης,Υπολογιστής,Τρέχον προφίλ,Προφίλ,Οργανισμός,Υπολογιστής εισερχομένων,Υπολογιστής εξερχομένων,Πελάτης email
+ Keywords[en_GB]=EMail,Mail,E-Mail,email,e-mail,Address,Email server,IMAP,POP3,Local mailbox,mailbox,User Information,Reply Address,Server information,User Name,Passwords,Host,Current Profile,Profile,Organisation,Organization,Incoming Host,Outgoing Host,Email Client
+ Keywords[eo]=retpoŝto,poŝto,adreso,servilo,IMAP,POP,poŝtkesto,uzanto, respondadreso,servilo,pasvorto,agordo,organizaĵo,ricevo,sendo
+ Keywords[es]=Correo electrónico,Correo,E-Mail,Dirección,Servidor de correo,IMAP,POP3,Buzón local,buzón,Información del usuario,Dirección de respuesta,Información del servidor,Nombre de usuario,Contraseñas,Máquina,Perfil actual,Perfil,Organización,Máquina entrante,Máquina saliente,Cliente de correo
+Index: l10n/ch/entry.desktop
+===================================================================
+--- l10n/ch/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/ch/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -18,7 +18,7 @@
Name[es]=Suiza
Name[et]=Šveits
@@ -76,8 +63,10 @@
Name[fi]=Sveitsi
Name[fr]=Suisse
Name[fy]=Switserlân
---- l10n/sh/entry.desktop
-+++ l10n/sh/entry.desktop
+Index: l10n/sh/entry.desktop
+===================================================================
+--- l10n/sh/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/sh/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -15,7 +15,7 @@
Name[el]=Αγία Ελένη
Name[eo]=Sent-Heleno
@@ -87,8 +76,10 @@
Name[fr]=Sainte-Hélène
Name[fy]=Sint Helena
Name[ga]=San Héilin
---- l10n/sv/entry.desktop
-+++ l10n/sv/entry.desktop
+Index: l10n/sv/entry.desktop
+===================================================================
+--- l10n/sv/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/sv/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -10,7 +10,7 @@
Name[el]=Ελ Σαλβαντόρ
Name[eo]=Salvadoro
@@ -98,8 +89,10 @@
Name[fr]=Salvador
Name[ga]=An tSalvadóir
Name[gl]=O Salvador
---- l10n/sz/entry.desktop
-+++ l10n/sz/entry.desktop
+Index: l10n/sz/entry.desktop
+===================================================================
+--- l10n/sz/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/sz/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -15,7 +15,7 @@
Name[es]=Swazilandia
Name[et]=Svaasimaa
@@ -109,8 +102,10 @@
Name[fi]=Swazimaa
Name[ga]=An tSuasalainn
Name[gl]=Suacilándia
---- l10n/lc/entry.desktop
-+++ l10n/lc/entry.desktop
+Index: l10n/lc/entry.desktop
+===================================================================
+--- l10n/lc/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/lc/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -10,7 +10,7 @@
Name[el]=Σάντα Λουτσία
Name[eo]=Sent-Lucio
@@ -120,8 +115,10 @@
Name[fo]=Sankta Lusia
Name[fr]=Sainte Lucie
Name[ga]=San Lúisia
---- l10n/tk/entry.desktop
-+++ l10n/tk/entry.desktop
+Index: l10n/tk/entry.desktop
+===================================================================
+--- l10n/tk/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/tk/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -8,7 +8,7 @@
Name[cy]=Tocelaw
Name[el]=Τοκελάου
@@ -131,8 +128,10 @@
Name[ga]=Na hOileáin Tócala
Name[he]=טוקלאו
Name[hi]=तोकेलाऊ
---- l10n/lt/entry.desktop
-+++ l10n/lt/entry.desktop
+Index: l10n/lt/entry.desktop
+===================================================================
+--- l10n/lt/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/lt/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -18,7 +18,7 @@
Name[es]=Lituania
Name[et]=Leedu
@@ -142,8 +141,10 @@
Name[fi]=Liettua
Name[fr]=Lituanie
Name[fy]=Litouwen
---- l10n/tz/entry.desktop
-+++ l10n/tz/entry.desktop
+Index: l10n/tz/entry.desktop
+===================================================================
+--- l10n/tz/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/tz/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -17,7 +17,7 @@
Name[es]=Tanzania, Republica de
Name[et]=Tansaania
@@ -153,8 +154,10 @@
Name[fi]=Tansanian yhdistäytynyt tasavalta
Name[fr]=Tanzanie, République unie de
Name[fy]=Tanzanië, Ferienigd republyk fan
---- l10n/mo/entry.desktop
-+++ l10n/mo/entry.desktop
+Index: l10n/mo/entry.desktop
+===================================================================
+--- l10n/mo/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/mo/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -12,7 +12,7 @@
Name[el]=Μακάο SAR (Κίνα)
Name[et]=Macau
@@ -164,8 +167,10 @@
Name[fi]=Makao SAR(Kiina)
Name[fr]=Macao SAR (Chine)
Name[ga]=Macao SAR(An tSín)
---- l10n/nc/entry.desktop
-+++ l10n/nc/entry.desktop
+Index: l10n/nc/entry.desktop
+===================================================================
+--- l10n/nc/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/nc/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -17,7 +17,7 @@
Name[es]=Nueva Caledonia
Name[et]=Uus-Kaledoonia
@@ -175,8 +180,10 @@
Name[fi]=Uusi-Kaledonia
Name[fr]=Nouvelle Calédonie
Name[fy]=Nij Caledonië
---- l10n/nf/entry.desktop
-+++ l10n/nf/entry.desktop
+Index: l10n/nf/entry.desktop
+===================================================================
+--- l10n/nf/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/nf/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -16,7 +16,7 @@
Name[es]=Isla Norfolk
Name[et]=Norfolki saar
@@ -186,8 +193,10 @@
Name[fi]=Norfolkinsaari
Name[fr]=Île Norfolk
Name[fy]=Norfolk Eilân
---- l10n/va/entry.desktop
-+++ l10n/va/entry.desktop
+Index: l10n/va/entry.desktop
+===================================================================
+--- l10n/va/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/va/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -18,7 +18,7 @@
Name[es]=Vaticano
Name[et]=Vatikan
@@ -197,8 +206,10 @@
Name[fi]=Vatikaani
Name[fr]=Vatican
Name[fy]=Vaticaanstad
---- l10n/vg/entry.desktop
-+++ l10n/vg/entry.desktop
+Index: l10n/vg/entry.desktop
+===================================================================
+--- l10n/vg/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/vg/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -16,7 +16,7 @@
Name[es]=Islas Vírgenes Británicas
Name[et]=Briti Neitsisaared
@@ -208,8 +219,10 @@
Name[fi]=Brittien Neitsytsaaret
Name[fr]=Îles Vierges britanniques
Name[fy]=Virgin Eilannen, Britse
---- l10n/vi/entry.desktop
-+++ l10n/vi/entry.desktop
+Index: l10n/vi/entry.desktop
+===================================================================
+--- l10n/vi/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/vi/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -17,7 +17,7 @@
Name[es]=Islas Vírgenes Americanas
Name[et]=USA Neitsisaared
@@ -219,8 +232,10 @@
Name[fi]=USA:n Neitsytsaaret
Name[fr]=Îles Vierges américaines
Name[fy]=Virgin Eilannen, U.S.
---- l10n/gp/entry.desktop
-+++ l10n/gp/entry.desktop
+Index: l10n/gp/entry.desktop
+===================================================================
+--- l10n/gp/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/gp/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -12,7 +12,7 @@
Name[eo]=Gvadelupo
Name[es]=Guadalupe
@@ -230,8 +245,10 @@
Name[ga]=Guadalúip
Name[gl]=Guadalupe
Name[he]=גאודלופה
---- l10n/wf/entry.desktop
-+++ l10n/wf/entry.desktop
+Index: l10n/wf/entry.desktop
+===================================================================
+--- l10n/wf/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/wf/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -18,7 +18,7 @@
Name[es]=Wallis y Futuna
Name[et]=Wallis ja Futuna
@@ -241,8 +258,10 @@
Name[fi]=Wallis ja Futuna
Name[fr]=Wallis et Futuna
Name[fy]=Wallis en Futuna
---- l10n/hk/entry.desktop
-+++ l10n/hk/entry.desktop
+Index: l10n/hk/entry.desktop
+===================================================================
+--- l10n/hk/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/hk/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -11,7 +11,7 @@
Name[el]=Χονγκ Κονγκ SAR (Κίνα)
Name[et]=Hongkong
@@ -252,8 +271,10 @@
Name[fi]=Hong Kong SAR (Kiina)
Name[fr]=Hong Kong SAR (Chine)
Name[ga]=Hong Cong SAR(An tSín)
---- l10n/pg/entry.desktop
-+++ l10n/pg/entry.desktop
+Index: l10n/pg/entry.desktop
+===================================================================
+--- l10n/pg/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/pg/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -16,7 +16,7 @@
Name[es]=Papua Nueva Guinea
Name[et]=Paapua Uus-Guinea
@@ -263,8 +284,10 @@
Name[fi]=Papua-Uusi-Guinea
Name[fr]=Papouasie-Nouvelle-Guinée
Name[fy]=Papua Nij Guinea
---- l10n/pm/entry.desktop
-+++ l10n/pm/entry.desktop
+Index: l10n/pm/entry.desktop
+===================================================================
+--- l10n/pm/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/pm/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -18,7 +18,7 @@
Name[es]=Saint Pierre y Miquelon
Name[et]=Saint Pierre ja Miquelon
@@ -274,8 +297,10 @@
Name[fi]=Saint-Pierre ja Miquelon
Name[fr]=Saint-Pierre-et-Miquelon
Name[fy]=Saint Pierre en Miquelon
---- l10n/pn/entry.desktop
-+++ l10n/pn/entry.desktop
+Index: l10n/pn/entry.desktop
+===================================================================
+--- l10n/pn/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/pn/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -8,7 +8,7 @@
Name[cy]=Ynys Pitcairn
Name[el]=Πίτκαιρν
@@ -285,8 +310,10 @@
Name[he]=פיטקרן
Name[hi]=पिटकैर्न
Name[ja]=英領ピトケアン諸島
---- l10n/pw/entry.desktop
-+++ l10n/pw/entry.desktop
+Index: l10n/pw/entry.desktop
+===================================================================
+--- l10n/pw/entry.desktop (.../tags/KDE/3.5.5/kdebase) (Revision 592985)
++++ l10n/pw/entry.desktop (.../branches/KDE/3.5/kdebase) (Revision 592985)
@@ -7,7 +7,7 @@
Name[cy]=Palaw
Name[el]=Παλάου
@@ -297,7 +324,7 @@
Name[hi]=पलाऊ
Name[is]=Palá
-Property changes on: .
+Eigenschaftsänderungen: .
___________________________________________________________________
Name: svn:externals
+ admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin
++++++ kdebase-3.5.5.tar.bz2 ++++++
KDE/kdebase3/kdebase-3.5.5.tar.bz2 /mounts/work_src_done/STABLE/kdebase3/kdebase-3.5.5.tar.bz2 differ: char 11, line 1
++++++ kdm-sysconfig-values.diff ++++++
++++ 735 lines (skipped)
++++ between KDE/kdebase3/kdm-sysconfig-values.diff
++++ and /mounts/work_src_done/STABLE/kdebase3/kdm-sysconfig-values.diff
++++++ ksmserver-suspend.diff ++++++
--- /var/tmp/diff_new_pack.zADRib/_old 2006-10-06 19:24:26.000000000 +0200
+++ /var/tmp/diff_new_pack.zADRib/_new 2006-10-06 19:24:26.000000000 +0200
@@ -14,7 +14,7 @@
ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
-ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI)
-+ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI) -lpowersave_dbus -lpowersave $(DBUS_LIBS)
++ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI) -llazy $(DBUS_LIBS)
picsdir = $(kde_datadir)/ksmserver/pics
pics_DATA = shutdownkonq.png
@@ -23,13 +23,13 @@
testsh_SOURCES = test.cpp
testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la
-+testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la -lpowersave_dbus $(DBUS_LIBS)
++testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la -llazy $(DBUS_LIBS)
messages:
$(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot
--- ksmserver/shutdowndlg.cpp
+++ ksmserver/shutdowndlg.cpp
-@@ -38,12 +38,15 @@
+@@ -38,17 +38,23 @@
#include