Mailinglist Archive: opensuse-commit (2092 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kdepim3
checked in at Thu Aug 9 15:56:15 CEST 2007.

--------
--- KDE/kdepim3/kdepim3.changes 2007-08-06 22:29:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes        2007-08-09 12:18:33.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug  9 12:18:20 CEST 2007 - wstephenson@xxxxxxx
+
+- Resolve desktop file conflict between kdepim3 and kitchensync
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdepim3.spec ++++++
--- /var/tmp/diff_new_pack.Ob5849/_old  2007-08-09 15:51:12.000000000 +0200
+++ /var/tmp/diff_new_pack.Ob5849/_new  2007-08-09 15:51:12.000000000 +0200
@@ -28,7 +28,7 @@
 Group:          System/GUI/KDE
 Summary:        Personal Information Manager Software for KDE
 Version:        3.5.7.enterprise.0.20070731.694771
-Release:        1
+Release:        3
 %define realversion 3.5.6.enterprise.0.20070731.694771
 URL:            http://www.kde.org/
 Requires:       kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` )
@@ -172,7 +172,7 @@
 Summary:        KDE Synchronization application based on OpenSync.
 Group:          Hardware/PDA
 Version:        0.01svn691344
-Release:        1
+Release:        3
 Provides:       kdepim3-sync
 Obsoletes:      kdepim3-sync
 Requires:       libopensync1 >= 0.31
@@ -765,7 +765,7 @@
 /opt/kde3/%_lib/kde3/libkitchensyncpart.*
 /opt/kde3/%_lib/libkitchensync.*
 /opt/kde3/%_lib/libqopensync.*
-/opt/kde3/share/applications/kde/*.desktop
+/opt/kde3/share/applications/kde/kitchensync.desktop
 %dir /opt/kde3/share/apps/kitchensync
 /opt/kde3/share/apps/kitchensync/kitchensyncui.rc
 /opt/kde3/share/apps/kitchensync/kitchensync_part.rc
@@ -776,6 +776,8 @@
 /opt/kde3/share/icons/*/*/*/kitchensync.*
 
 %changelog
+* Thu Aug 09 2007 - wstephenson@xxxxxxx
+- Resolve desktop file conflict between kdepim3 and kitchensync
 * Mon Aug 06 2007 - wstephenson@xxxxxxx
 - Using kdepim's enterprise branch source tarballs.
   This brings stability and increased QA.




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx