[SCM] KDE PIM Libraries module packaging branch, kde4.5, updated. debian/4.4.5-1-11-g21a2283

[George Kiagiadakis]

The following commit has been merged in the kde4.5 branch:
commit 0247381cc637a878137199164c0973c9fc80c0ff
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sun Aug 1 11:14:36 2010 +0300

    Refresh patches.
    
    * Refresh patches.
    * Remove patch 02_increase_fail_timeout.diff, no longer needed.
---
 debian/changelog                                |    2 ++
 debian/patches/01_hurd_support.diff             |    8 ++++----
 debian/patches/02_increase_fail_timeout.diff    |   18 ------------------
 debian/patches/03_hide_akonadi_progressbar.diff |    4 ++--
 debian/patches/series                           |    1 -
 5 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5895063..3a1cd1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ kdepimlibs (4:4.5.0-0r1) UNRELEASED; urgency=low
 
   [ George Kiagiadakis ]
   * Change my email address in uploaders.
+  * Refresh patches.
+  * Remove patch 02_increase_fail_timeout.diff, no longer needed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Aug 2010 10:41:56 +0300
 
diff --git a/debian/patches/01_hurd_support.diff b/debian/patches/01_hurd_support.diff
index 5d05cf3..ffc740f 100644
--- a/debian/patches/01_hurd_support.diff
+++ b/debian/patches/01_hurd_support.diff
@@ -4,8 +4,8 @@ Description: preliminary GNU/Hurd support
  Not forwarded, better fixes should be done upstream.
 Forwarded: no
 Fixed-For: 4.5.0
---- a/kholidays/parseholiday.c
-+++ b/kholidays/parseholiday.c
+--- a/kholidays/parsers/plan1/parseholiday.c
++++ b/kholidays/parsers/plan1/parseholiday.c
 @@ -170,6 +170,10 @@
  
  #include <limits.h>
@@ -17,8 +17,8 @@ Fixed-For: 4.5.0
  /*** Macro definitions and constants ***/
  /*
   * Before you mail and complain that the following macro is incorrect,
---- a/kholidays/parseholiday.y
-+++ b/kholidays/parseholiday.y
+--- a/kholidays/parsers/plan1/parseholiday.y
++++ b/kholidays/parsers/plan1/parseholiday.y
 @@ -49,6 +49,10 @@
  
  #include <limits.h>
diff --git a/debian/patches/02_increase_fail_timeout.diff b/debian/patches/02_increase_fail_timeout.diff
deleted file mode 100644
index e382336..0000000
--- a/debian/patches/02_increase_fail_timeout.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Harald Sitter
-Description: give more time for akonadi-server to start
- 10 seconds is way too short timeframe. To make things worse, kdepimlibs just
- calls exit() after showing error detection dialog. The patch was stolen from
- Kubuntu.
-Origin: vendor, http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/lucid/kdepimlibs/lucid/download/head:/kubuntu_01_increase_-20100413181428-vr64cd6ivtkqbzhp-2/kubuntu_01_increase_fail_timeout.patch
-
---- a/akonadi/control.cpp
-+++ b/akonadi/control.cpp
-@@ -133,7 +133,7 @@
-   kDebug() << "Starting Akonadi (using an event loop).";
-   mEventLoop = new QEventLoop( mParent );
-   // safety timeout
--  QTimer::singleShot( 10000, mEventLoop, SLOT(quit()) );
-+  QTimer::singleShot( 60000, mEventLoop, SLOT(quit()) );
-   mEventLoop->exec();
-   mEventLoop->deleteLater();
-   mEventLoop = 0;
diff --git a/debian/patches/03_hide_akonadi_progressbar.diff b/debian/patches/03_hide_akonadi_progressbar.diff
index 419fc38..34aceb1 100644
--- a/debian/patches/03_hide_akonadi_progressbar.diff
+++ b/debian/patches/03_hide_akonadi_progressbar.diff
@@ -5,7 +5,7 @@ Bug-Kubuntu: https://launchpad.net/bugs/562420
 
 --- a/akonadi/control.cpp
 +++ b/akonadi/control.cpp
-@@ -127,8 +127,8 @@
+@@ -125,8 +125,8 @@
  
  bool Control::Private::exec()
  {
@@ -14,5 +14,5 @@ Bug-Kubuntu: https://launchpad.net/bugs/562420
 +//  if ( mProgressIndicator )
 +//    mProgressIndicator->show();
  
-   kDebug() << "Starting Akonadi (using an event loop).";
+   kDebug() << "Starting/Stopping Akonadi (using an event loop).";
    mEventLoop = new QEventLoop( mParent );
diff --git a/debian/patches/series b/debian/patches/series
index 62f6b62..007dba2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_hurd_support.diff
-02_increase_fail_timeout.diff
 03_hide_akonadi_progressbar.diff

-- 
KDE PIM Libraries module packaging