Hello community,
here is the log from the commit of package kdepimlibs4
checked in at Wed Mar 5 23:07:49 CET 2008.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2008-02-15 11:46:49.000000000 +0100
+++ kdepimlibs4/kdepimlibs4.changes 2008-03-03 23:14:35.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Mar 3 23:14:28 CET 2008 - stbinner@suse.de
+
+- update to 4.0.64 snapshot
+
+-------------------------------------------------------------------
Old:
----
4_0_BRANCH.diff
kdepimlibs-4.0.1.tar.bz2
New:
----
4_1_BRANCH.diff
kdepimlibs-4.0.64.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.j20038/_old 2008-03-05 23:07:03.000000000 +0100
+++ /var/tmp/diff_new_pack.j20038/_new 2008-03-05 23:07:03.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdepimlibs4 (Version 4.0.1)
+# spec file for package kdepimlibs4 (Version 4.0.64)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,12 +16,12 @@
Group: System/GUI/KDE
Summary: KDE PIM Libraries
Url: http://www.kde.org
-Version: 4.0.1
-Release: 8
-%define rversion 4.0.1
+Version: 4.0.64
+Release: 1
+%define rversion 4.0.64
Source0: kdepimlibs-%rversion.tar.bz2
Source1: _upstream
-Patch0: 4_0_BRANCH.diff
+Patch0: 4_1_BRANCH.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libkdepimlibs4 >= %version
@@ -36,7 +36,7 @@
%prep
%setup -q -n kdepimlibs-%rversion
-%patch0
+%patch
%build
%cmake_kde4 -d build
@@ -69,10 +69,10 @@
The KDE Team
%post -n libkdepimlibs4
-%run_ldconfig
+/sbin/ldconfig
%postun -n libkdepimlibs4
-%run_ldconfig
+/sbin/ldconfig
%files -n libkdepimlibs4
%defattr(-,root,root)
@@ -156,6 +156,8 @@
%_kde_share_dir/config.kcfg/mailtransport.kcfg
%changelog
+* Tue Mar 04 2008 stbinner@suse.de
+- update to 4.0.64 snapshot
* Fri Feb 15 2008 dmueller@suse.de
- update 4_0_BRANCH.diff
* Thu Jan 31 2008 dmueller@suse.de
++++++ 4_0_BRANCH.diff -> 4_1_BRANCH.diff ++++++
--- KDE/kdepimlibs4/4_0_BRANCH.diff 2008-02-13 23:07:33.000000000 +0100
+++ kdepimlibs4/4_1_BRANCH.diff 2008-03-03 23:13:29.000000000 +0100
@@ -1,36 +1,85 @@
-package: kdepimlibs-4.0.1.tar.bz2
+package: kdepimlibs-4.0.64.tar.bz2
kdemod: kdepimlibs
-current HEAD: 774697
-svn di between /tags/KDE/4.0.1 and /branches/KDE//branches/KDE/4.0
---- kresources/kresources.desktop (revision 774739)
-+++ kresources/kresources.desktop (revision 774739)
-@@ -82,7 +82,7 @@
- Keywords[el]=πόροι,πόροι του konnector,πόρος επαφής,πόρος ημερολογίου,πόρος σημειώσεων,πόρος ειδοποίησης,imap
- Keywords[es]=recursos,recursos de konnector,recursos de contacto,recursos de calendario,recursos de notas,recurso de alarma,imap
- Keywords[et]=ressursid,konnektori ressurss,kontakti ressurss,kalendri ressurss,märkmete ressurss,häire ressurss,imap
--Keywords[fr]=ressources,konnector, ressource contact calendrier, agenda, notes resource,alarme, imap
-+Keywords[fr]=ressources, konnector, ressource contact calendrier, agenda, notes ressource, alarme, imap
- Keywords[ga]=acmhainní,acmhainn konnector,acmhainn teagmhála,acmhainn fhéilire,acmhainn nótaí,acmhainn aláraim,imap
- Keywords[gl]=recursos,recurso de konnector,recurso de contactos,recurso de axenda, recurso de notas, recurso de alarma, imap
- Keywords[hu]=erőforrások,Konnector-erőforrás,névjegy,naptár,feljegyzés,emlékeztető,imap
---- kcal/tests/data/RecurrenceRule/RFC2445/RFC2445_RRULETest06.ics.recurson.ref (revision 774739)
-+++ kcal/tests/data/RecurrenceRule/RFC2445/RFC2445_RRULETest06.ics.recurson.ref (revision 774739)
-@@ -90,5 +90,4 @@
- 2000-01-28
- 2000-01-29
- 2000-01-30
--2000-01-31
+--- BRANCH_STATUS
++++ BRANCH_STATUS
+@@ -0,0 +1,2 @@
++current HEAD: 780976
++svn di between //trunk/KDE/kdepimlibs@780325 and //trunk/KDE/kdepimlibs
+--- kcal/calendarlocal.cpp
++++ kcal/calendarlocal.cpp
+@@ -223,7 +223,7 @@
+ void CalendarLocal::Private::insertTodo( Todo *todo )
+ {
+ QString uid = todo->uid();
+- if ( mTodos.value( uid ) == 0 ) {
++ if ( !mTodos.contains( uid ) ) {
+ mTodos.insert( uid, todo );
+ if ( todo->hasDueDate() ) {
+ mTodosForDate.insert( todo->dtDue().date().toString(), todo );
+@@ -339,7 +339,7 @@
+ void CalendarLocal::Private::insertEvent( Event *event )
+ {
+ QString uid = event->uid();
+- if ( mEvents.value( uid ) == 0 ) {
++ if ( !mEvents.contains( uid ) ) {
+ mEvents.insert( uid, event );
+ if ( !event->recurs() ) {
+ mEventsForDate.insert( event->dtStart().date().toString(), event );
+@@ -516,7 +516,7 @@
+ void CalendarLocal::Private::insertJournal( Journal *journal )
+ {
+ QString uid = journal->uid();
+- if ( mJournals.value( uid ) == 0 ) {
++ if ( !mJournals.contains( uid ) ) {
+ mJournals.insert( uid, journal );
+ mJournalsForDate.insert( journal->dtStart().date().toString(), journal );
+ } else {
+--- kabc/resourceabc.h
++++ kabc/resourceabc.h
+@@ -97,13 +97,13 @@
+ /**
+ * This signal is emitted when a subresource is added.
+ */
+- void signalSubresourceAdded( ResourceABC *, const QString &type,
++ void signalSubresourceAdded( KABC::ResourceABC *, const QString &type,
+ const QString &subResource );
---- kcal/tests/data/RecurrenceRule/RFC2445/RFC2445_RRULETest05.ics.recurson.ref (revision 774739)
-+++ kcal/tests/data/RecurrenceRule/RFC2445/RFC2445_RRULETest05.ics.recurson.ref (revision 774739)
-@@ -90,5 +90,4 @@
- 2000-01-28
- 2000-01-29
- 2000-01-30
--2000-01-31
+ /**
+ * This signal is emitted when a subresource is removed.
+ */
+- void signalSubresourceRemoved( ResourceABC *, const QString &type,
++ void signalSubresourceRemoved( KABC::ResourceABC *, const QString &type,
+ const QString &subResource );
-
-Property changes on: .
-___________________________________________________________________
-Deleted: svn:mergeinfo
-
+ };
+--- kabc/lock.cpp
++++ kabc/lock.cpp
+@@ -42,11 +42,16 @@
+ public:
+ Private( const QString &identifier )
+ : mIdentifier( identifier )
++ , mOrigIdentifier( identifier )
+ {
+ mIdentifier.replace( "/", "_" );
++#ifdef Q_WS_WIN
++ mIdentifier.replace( ":", "_" );
++#endif
+ }
+
+ QString mIdentifier;
++ QString mOrigIdentifier;
+ QString mLockUniqueName;
+ QString mError;
+ };
+@@ -118,10 +123,7 @@
+ QFile::remove( lockName );
+ kWarning() << "Removed stale lock file from process '" << app << "'";
+ } else {
+- QString identifier( d->mIdentifier );
+- identifier.replace( '_', '/' );
+-
+- d->mError = i18n( "The resource '%1' is locked by application '%2'.", identifier, app );
++ d->mError = i18n( "The resource '%1' is locked by application '%2'.", d->mOrigIdentifier, app );
+ return false;
+ }
+ }
++++++ kdepimlibs-4.0.1.tar.bz2 -> kdepimlibs-4.0.64.tar.bz2 ++++++
++++ 32720 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org