Mailinglist Archive: opensuse-commit (2092 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kdepim4
checked in at Thu Aug 9 16:54:29 CEST 2007.

--------
--- KDE/kdepim4/kdepim4.changes 2007-08-06 18:46:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepim4/kdepim4.changes        2007-08-07 14:55:34.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Aug  7 14:55:16 CEST 2007 - wstephenson@xxxxxxx
+
+- Resolve file conflict between kdepim4 and kdepim4-knotes
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ kdepim4.spec ++++++
--- /var/tmp/diff_new_pack.Ez2641/_old  2007-08-09 16:53:53.000000000 +0200
+++ /var/tmp/diff_new_pack.Ez2641/_new  2007-08-09 16:53:53.000000000 +0200
@@ -20,10 +20,10 @@
 %endif
 License:        LGPL v2 or later
 Group:          System/GUI/KDE
-Summary:        kdepim base package
+Summary:        Base package of kdepim
 URL:            http://www.kde.org
 Version:        3.92.0
-Release:        8
+Release:        10
 Source0:        kdepim.tar.bz2
 Source1:        _upstream
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -48,7 +48,7 @@
 Suggests: kde4-kmobiletools
 
 %description
-This packages contains the core files of the kdepim module.
+This package contains the core files of the kdepim module.
 
 
 
@@ -545,6 +545,8 @@
 
 %_kde_share_dir/services/kresources/knotes
 
+%_kde_share_dir/services/kresources/knotes_manager.desktop
+
 %_kde_share_dir/config.kcfg/knoteconfig.kcfg
 %package -n kde4-kontact
 Group:          Productivity/Other
@@ -1261,8 +1263,15 @@
 %_kde_share_dir/services/kleopatra_config_dirserv.desktop
 
 %_kde_share_dir/services/kleopatra_config_dnorder.desktop
+%dir %_kde_share_dir/services/kresources
+
+%_kde_share_dir/services/kresources/kabc
+
+%_kde_share_dir/services/kresources/kcal
+
+%_kde_share_dir/services/kresources/alarms
 
-%_kde_share_dir/services/kresources
+%_kde_share_dir/services/kresources/kalarm_manager.desktop
 
 %_kde_share_dir/services/mbox.protocol
 
@@ -1281,6 +1290,8 @@
 /usr/%_lib/kde4/plugins/sqldrivers
 
 %changelog
+* Tue Aug 07 2007 - wstephenson@xxxxxxx
+- Resolve file conflict between kdepim4 and kdepim4-knotes
 * Mon Aug 06 2007 - wstephenson@xxxxxxx
 - remove kitchensync temporarily, not compatible with our
   libopensync



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



Remember to have fun...

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