[SCM] KDE PIM Libraries module packaging branch, kde4.10, updated. debian/4.8.4-1-32-gee7e22a

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Thu Feb 14 15:15:46 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepimlibs.git;a=commitdiff;h=9167515

The following commit has been merged in the kde4.10 branch:
commit 916751566553559019f77d215618890e6970e40a
Author: Josep Febrer Salord <jfebrer at gmail.com>
Date:   Sun Feb 10 03:05:53 2013 +0100

    Drop 03_hide_akonadi_progressbar.diff, no longer needed.
---
 debian/changelog                                |    4 ++++
 debian/patches/03_hide_akonadi_progressbar.diff |   18 ------------------
 debian/patches/series                           |    1 -
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 132ba2e..7be4a44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,10 @@ kdepimlibs (4:4.10.0-0r0) UNRELEASED; urgency=low
   * Update installed files using wildcards.
   * Update symbols.
 
+  [ Josep Febrer ]
+  * Update patches
+    - drop 03_hide_akonadi_progressbar.diff, no longer needed
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 15 Nov 2012 23:10:43 +0100
 
 kdepimlibs (4:4.8.4-1) unstable; urgency=low
diff --git a/debian/patches/03_hide_akonadi_progressbar.diff b/debian/patches/03_hide_akonadi_progressbar.diff
deleted file mode 100644
index c276e8d..0000000
--- a/debian/patches/03_hide_akonadi_progressbar.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Hide start/stop progressbar as done in KDE trunk
- The patch stolen from Kubuntu
-Origin: vendor, http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/lucid/kdepimlibs/lucid/download/head:/kubuntu_02_hide_akon-20100413181428-vr64cd6ivtkqbzhp-1/kubuntu_02_hide_akonadi_progressbar.patch
-Bug-Kubuntu: https://launchpad.net/bugs/562420
-
---- a/akonadi/control.cpp
-+++ b/akonadi/control.cpp
-@@ -130,8 +130,8 @@ class Control::Private
- 
- bool Control::Private::exec()
- {
--  if ( mProgressIndicator )
--    mProgressIndicator->show();
-+//  if ( mProgressIndicator )
-+//    mProgressIndicator->show();
- 
-   kDebug() << "Starting/Stopping Akonadi (using an event loop).";
-   mEventLoop = new QEventLoop( mParent );
diff --git a/debian/patches/series b/debian/patches/series
index bba1e97..a2cfaac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-03_hide_akonadi_progressbar.diff
 dont_verify_akonadi_id.diff

-- 
KDE PIM Libraries module packaging



More information about the pkg-kde-commits mailing list