[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.4.5-2-12-ge9cb714

Modestas Vainius modax at alioth.debian.org
Sun Nov 28 17:32:05 UTC 2010


The following commit has been merged in the master branch:
commit e9cb714a6243e9688a8bba0b624152b092237c4c
Merge: abb535094cfc4ad04402322a1ed343afd59d2f0b c6a70705495309110b5975540653a4828c592235
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Nov 28 19:31:58 2010 +0200

    Merge remote branch 'origin/kde4.5'
    
    Conflicts:
    	debian/changelog

 debian/changelog                                |   17 +++
 debian/control                                  |    7 +-
 debian/kdepimlibs5-dev.install                  |   41 +++++++
 debian/libakonadi-contact4.install              |   25 +++++-
 debian/libakonadi-contact4.symbols              |  127 ++++++++++++++++++++++-
 debian/libakonadi-kabc4.install                 |    2 +-
 debian/libakonadi-kcal4.install                 |    2 +-
 debian/libakonadi-kde4.install                  |    2 +-
 debian/libakonadi-kde4.symbols                  |   62 ++++++++++-
 debian/libakonadi-kmime4.install                |    2 +-
 debian/libakonadi-kmime4.symbols                |    6 +-
 debian/libgpgme++2.install                      |    8 +-
 debian/libgpgme++2.symbols                      |   53 +++++++++-
 debian/libkabc4.install                         |    4 +-
 debian/libkabc4.symbols                         |    8 ++-
 debian/libkblog4.install                        |    2 +-
 debian/libkcal4.install                         |    2 +-
 debian/libkcal4.symbols                         |   17 +++-
 debian/libkholidays4.install                    |    2 +-
 debian/libkholidays4.symbols                    |   90 +++++++++++------
 debian/libkimap4.install                        |    2 +-
 debian/libkimap4.symbols                        |   38 +++++++-
 debian/libkldap4.install                        |    2 +-
 debian/libkmime4.install                        |    2 +-
 debian/libkmime4.symbols                        |   16 +++-
 debian/libkontactinterface4.install             |    2 +-
 debian/libkontactinterface4.symbols             |    3 +-
 debian/libkpimidentities4.install               |    2 +-
 debian/libkpimidentities4.symbols               |    3 +-
 debian/libkpimtextedit4.install                 |    2 +-
 debian/libkpimtextedit4.symbols                 |    7 +-
 debian/libkpimutils4.install                    |    2 +-
 debian/libkresources4.install                   |    2 +-
 debian/libktnef4.install                        |    2 +-
 debian/libkxmlrpcclient4.install                |    2 +-
 debian/libmailtransport4.install                |    2 +-
 debian/libmailtransport4.symbols                |    6 +-
 debian/libmicroblog4.install                    |    2 +-
 debian/libsyndication4.install                  |    2 +-
 debian/patches/01_hurd_support.diff             |   32 ------
 debian/patches/02_increase_fail_timeout.diff    |   18 ---
 debian/patches/03_hide_akonadi_progressbar.diff |    4 +-
 debian/patches/series                           |    2 -
 43 files changed, 503 insertions(+), 131 deletions(-)

diff --cc debian/changelog
index 7900eac,e3e9b5c..3b3ae52
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,23 +1,29 @@@
+ kdepimlibs (4:4.5.1-0r1) UNRELEASED; urgency=low
+ 
+   * New upstream release.
+ 
 -  [ Modestas Vainius ]
 -  * Point debian/control Vcs fields to the new Git repository.
 -
+   [ George Kiagiadakis ]
+   * Change my email address in uploaders.
+   * Refresh patch 03_hide_akonadi_progressbar.diff.
+   * Remove patch 01_hurd_support.diff, no longer needed.
+   * Remove patch 02_increase_fail_timeout.diff, no longer needed.
+   * Update installed files.
+   * Update symbol files.
+   * Bump build dependency on kdelibs5-dev to version 4:4.5.
+   * Bump build dependency on libakonadi-dev to version 1.3.80.
+   * Add build dependencies on shared-desktop-ontologies and libsoprano-dev.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Aug 2010 10:41:56 +0300
+ 
 +kdepimlibs (4:4.4.5-2) unstable; urgency=low
 +
 +  * Point debian/control Vcs fields to the new Git repository.
 +  * Fix POP3 mailcheck aborting because of internal memory errors. The bug was
 +    a cause of POP3 mails not getting deleted from POP3 servers.
 +    (Closes: #600907)
 +
 + -- Modestas Vainius <modax at debian.org>  Sun, 28 Nov 2010 19:17:34 +0200
 +
  kdepimlibs (4:4.4.5-1) unstable; urgency=low
  
    * New upstream release.
diff --cc debian/patches/series
index fc0206f,333e353..0aafd21
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,1 +1,2 @@@
- 01_hurd_support.diff
- 02_increase_fail_timeout.diff
  03_hide_akonadi_progressbar.diff
 +04_backport_fix_abnormal_pop3_aborting.diff

-- 
KDE PIM Libraries module packaging



More information about the pkg-kde-commits mailing list