[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit c3d8d769dc215f900754a2ad74658451dedcc50a
Merge: c91baf550c3fec5497b744c0d6c8eac48d182522 4eb3624b16c978d1fb2c5ae724ccb882dd574dc8
Author: Modestas Vainius <modax at debian.org>
Date:   Fri Jun 10 10:23:30 2011 +0300

    Merge branch 'kde4.5' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/kdepim-runtime.install
    	debian/not-installed

 debian/changelog                        |   14 ++++++++++
 debian/control                          |    2 +-
 debian/kdepim-runtime.install           |   44 ++++++++++++++++++++++++++++++-
 debian/kdepim-runtime.lintian-overrides |    2 +-
 debian/not-installed                    |    4 ++-
 5 files changed, 62 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 128f472,aad85a4..241375c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,17 +1,51 @@@
+ kdepim-runtime (4:4.4.93-0r1) UNRELEASED; urgency=low
+ 
+   * New upstream beta release.
+ 
+   [ George Kiagiadakis ]
+   * Add myself to uploaders.
+   * Update installed files.
+   * Update lintian overrides.
+   * Bump build dependencies on kdelibs5-dev and
+     kdepimlibs5-dev to version 4:4.5.
+   * Bump build dependency on libakonadi-dev to version 1.3.80.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 04 Sep 2010 23:13:11 +0300
+ 
 +kdepim-runtime (4:4.4.11.1-2) unstable; urgency=low
 +
 +  * Release to unstable.
 +
 + -- Modestas Vainius <modax at debian.org>  Thu, 26 May 2011 22:55:30 +0300
 +
 +kdepim-runtime (4:4.4.11.1-1) experimental; urgency=low
 +
 +  * New upstream release.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Update installed files.
 +  * Bump build dependencies:
 +    - kdelibs5-dev to 4:4.6
 +    - kdepimlibs5-dev  to 4:4.6
 +    - libakonadi-dev to 1.5.0
 +    - kde-sc-dev-latest to 4:4.6.2
 +  * Bump S-V to 3.9.1: add Breaks next to Replaces where needed.
 +  * Refresh patch.
 +  * Add debian/not-installed.
 +  * Add myself to Uploaders.
 +
 +  [ Modestas Vainius ]
 +  * Add abort-on-upstream-changes to debian/source/local-options.
 +  * Switch debian/rules engine to dhmk qt-kde-team/2/*.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 27 Apr 2011 12:23:43 +0300
 +
 +kdepim-runtime (4:4.4.7-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Modestas Vainius <modax at debian.org>  Fri, 22 Oct 2010 21:41:43 +0300
 +
  kdepim-runtime (4:4.4.6-1) unstable; urgency=low
  
    * New upstream bugfix release.
diff --cc debian/control
index c345e8b,d395860..f117225
--- a/debian/control
+++ b/debian/control
@@@ -3,13 -3,13 +3,13 @@@ Section: x1
  Priority: extra
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Modestas Vainius <modax at debian.org>,
-  José Manuel Santamaría Lema <panfaust at gmail.com>
 - George Kiagiadakis <kiagiadakis.george at gmail.com>
 -Build-Depends: kde-sc-dev-latest (>= 4:4.4.5),
 - cdbs, debhelper (>= 7.3), cmake, pkg-kde-tools (>= 0.9),
 - kdelibs5-dev (>= 4:4.5), kdepimlibs5-dev (>= 4:4.5), libakonadi-dev (>= 1.3.80),
++ José Manuel Santamaría Lema <panfaust at gmail.com>,  George Kiagiadakis <kiagiadakis.george at gmail.com>
 +Build-Depends: kde-sc-dev-latest (>= 4:4.6.2),
 + debhelper (>= 7.3.16), cmake, pkg-kde-tools (>= 0.12),
 + kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6), libakonadi-dev (>= 1.5.0),
   libxml2-dev, xsltproc, libstrigiqtdbusclient-dev, libboost-dev (>= 1.40.0-2),
   libstreamanalyzer-dev, shared-mime-info (>= 0.30), shared-desktop-ontologies (>= 0.2)
 -Standards-Version: 3.8.4
 +Standards-Version: 3.9.1
  Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git
  Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdepim-runtime.git
  
diff --cc debian/kdepim-runtime.install
index fc7960d,8001001..ed9fda8
--- a/debian/kdepim-runtime.install
+++ b/debian/kdepim-runtime.install
@@@ -38,20 -46,29 +47,29 @@@ usr/lib/kde4/kcm_akonadi.s
  usr/lib/kde4/kcm_akonadi_resources.so
  usr/lib/kde4/kcm_akonadi_server.so
  usr/lib/kde4/kio_akonadi.so
+ usr/lib/libakonadi-filestore.so.4
 -usr/lib/libakonadi-filestore.so.4.5.0
++usr/lib/libakonadi-filestore.so.4.6.0
  usr/lib/libakonadi-xml.so.4
 -usr/lib/libakonadi-xml.so.4.5.0
 +usr/lib/libakonadi-xml.so.4.6.0
  usr/lib/libkdepim-copy.so.4
 -usr/lib/libkdepim-copy.so.4.5.0
 +usr/lib/libkdepim-copy.so.4.6.0
+ usr/lib/libkmindexreader.so.4
 -usr/lib/libkmindexreader.so.4.5.0
++usr/lib/libkmindexreader.so.4.6.0
  usr/lib/libmaildir.so.4
 -usr/lib/libmaildir.so.4.5.0
 +usr/lib/libmaildir.so.4.6.0
  usr/lib/libmbox.so.4
 -usr/lib/libmbox.so.4.5.0
 +usr/lib/libmbox.so.4.6.0
+ usr/share/akonadi/agents/akonotesresource.desktop
  usr/share/akonadi/agents/birthdaysresource.desktop
+ usr/share/akonadi/agents/calendarsearchagent.desktop
  usr/share/akonadi/agents/contactsresource.desktop
+ usr/share/akonadi/agents/davgroupwareresource.desktop
  usr/share/akonadi/agents/icalresource.desktop
  usr/share/akonadi/agents/imapresource.desktop
+ usr/share/akonadi/agents/invitationsagent.desktop
  usr/share/akonadi/agents/kabcresource.desktop
  usr/share/akonadi/agents/kcalresource.desktop
+ usr/share/akonadi/agents/kdeaccountsresource.desktop
  usr/share/akonadi/agents/knutresource.desktop
  usr/share/akonadi/agents/kolabproxyresource.desktop
  usr/share/akonadi/agents/localbookmarksresource.desktop

-- 
KDE PIM Runtime module packaging