Hello community,

here is the log from the commit of package kdepim4 for openSUSE:Factory checked 
in at 2013-03-15 10:39:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdepim4 (Old)
 and      /work/SRC/openSUSE:Factory/.kdepim4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdepim4", Maintainer is "kde-maintain...@suse.de"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kdepim4/kdepim4.changes  2013-02-04 
20:32:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdepim4.new/kdepim4.changes     2013-03-15 
10:39:06.000000000 +0100
@@ -1,0 +2,19 @@
+Mon Mar 11 06:58:56 UTC 2013 - m...@suse.com
+
+- Update desktop-files.diff
+  * Don't removed Icon=kleopatra in kleopatra.desktop (bnc#807946)
+- Added patch akregator-bug305494.diff from upstream to (bko#305494)
+
+-------------------------------------------------------------------
+Mon Mar  4 15:09:11 UTC 2013 - wba...@tmo.at
+
+- Remove "News" from categories in akregator.desktop (bnc#807301)
+
+-------------------------------------------------------------------
+Sat Mar  2 15:34:35 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.10.1
+ * Contains bug fixes. See http://www.kde.org/announcements/ 
+   for more information 
+
+-------------------------------------------------------------------

Old:
----
  kdepim-4.10.0.tar.xz

New:
----
  akregator-bug305494.diff
  kdepim-4.10.1.tar.xz

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

Other differences:
------------------
++++++ kdepim4.spec ++++++
--- /var/tmp/diff_new_pack.Z5a1yS/_old  2013-03-15 10:39:08.000000000 +0100
+++ /var/tmp/diff_new_pack.Z5a1yS/_new  2013-03-15 10:39:08.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           kdepim4
-Version:        4.10.0
+Version:        4.10.1
 Release:        0
 Summary:        Base package of kdepim
 License:        GPL-2.0+ and LGPL-2.1+
@@ -25,8 +25,10 @@
 Url:            http://www.kde.org
 Source0:        kdepim-%{version}.tar.xz
 Patch1:         akregator-useragent.diff
+#TODO desktop-files.diff need an update for upcoming 4.10.2 due to fixed 
kontact-import-wizard icon missing
 Patch2:         desktop-files.diff
 Patch3:         knode-kontact-default.diff
+Patch4:         akregator-bug305494.diff
 BuildRequires:  fdupes
 BuildRequires:  gpgme-devel
 BuildRequires:  grantlee-devel
@@ -64,6 +66,7 @@
 %patch1
 %patch2
 %patch3
+%patch4 -p1
 
 %build
 %ifarch ppc64
@@ -152,7 +155,7 @@
   %suse_update_desktop_file KNode           Network  News
   %suse_update_desktop_file Kjots           Utility TimeUtility
   %suse_update_desktop_file Kontact         Office   Core-Office
-  %suse_update_desktop_file akregator       Network  RSS-News
+  %suse_update_desktop_file -r akregator       Network  RSS-News
   %suse_update_desktop_file kaddressbook    Office   ContactManagement
   %suse_update_desktop_file kalarm          Utility  TimeUtility
   %suse_update_desktop_file kleopatra       Utility Security

++++++ akregator-bug305494.diff ++++++
commit f58fed85c84a268187cbdf58414dbe877190fba5
Author: Frank Osterfeld <osterf...@kde.org>
Date:   Sun Mar 3 11:29:32 2013 +0100

    Do not ask to restore the session each time again
    
    BUG: 305494

diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index dd854cb..50ed3f3 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -795,6 +795,7 @@ bool Part::readCrashProperties()
     switch ( choice ) {
     case KMessageBox::Yes:
         readProperties(configGroup);
+        clearCrashProperties();
         return true;
     case KMessageBox::No:
         clearCrashProperties();
++++++ desktop-files.diff ++++++
--- /var/tmp/diff_new_pack.Z5a1yS/_old  2013-03-15 10:39:08.000000000 +0100
+++ /var/tmp/diff_new_pack.Z5a1yS/_new  2013-03-15 10:39:08.000000000 +0100
@@ -2,7 +2,7 @@
 ===================================================================
 --- akonadiconsole/akonadiconsole.desktop.orig
 +++ akonadiconsole/akonadiconsole.desktop
-@@ -90,4 +90,5 @@ Comment[x-test]=xxAkonadi Management and
+@@ -103,4 +103,5 @@ Comment[x-test]=xxAkonadi Management and
  Comment[zh_CN]=用于管理和调试 Akonadi 的控制台
  Comment[zh_TW]=Akonadi 管理與除錯主控台
  Terminal=false
@@ -13,7 +13,7 @@
 ===================================================================
 --- ktimetracker/support/ktimetracker.desktop.orig
 +++ ktimetracker/support/ktimetracker.desktop
-@@ -111,4 +111,4 @@ Type=Application
+@@ -122,4 +122,4 @@ Type=Application
  Terminal=false
  X-KDE-StartupNotify=true
  X-DBUS-StartupType=Multi
@@ -23,21 +23,19 @@
 ===================================================================
 --- kleopatra/kleopatra.desktop.orig
 +++ kleopatra/kleopatra.desktop
-@@ -1,8 +1,7 @@
+@@ -1,6 +1,6 @@
  [Desktop Entry]
  Type=Application
 -Categories=Qt;KDE;Utility;
 +Categories=Qt;KDE;Utility;Security;X-KDE-Utilities-PIM;
  Exec=kleopatra
--Icon=kleopatra
+ Icon=kleopatra
  Name=Kleopatra
- Name[af]=Kleopatra
- Name[ar]=كليوبترا
 Index: importwizard/importwizard.desktop
 ===================================================================
---- importwizard/importwizard.desktop   2012-10-20 08:49:48.992059048 +0200
-+++ importwizard/importwizard.desktop   2012-10-20 14:47:04.812464894 +0200
-@@ -37,7 +37,6 @@ Name[x-test]=xxImport Wizardxx
+--- importwizard/importwizard.desktop.orig
++++ importwizard/importwizard.desktop
+@@ -39,7 +39,6 @@ Name[zh_CN]=导入向导
  Name[zh_TW]=匯入精靈
  Exec=importwizard
  Type=Application

++++++ kdepim-4.10.0.tar.xz -> kdepim-4.10.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/kdepim4/kdepim-4.10.0.tar.xz 
/work/SRC/openSUSE:Factory/.kdepim4.new/kdepim-4.10.1.tar.xz differ: char 26, 
line 1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to