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

Sat Jul 13 12:47:49 UTC 2013

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

The following commit has been merged in the master branch:
commit e0fb14315bda21c91b9ffd2f66518608634ad4d2
Merge: f187cf2e95849e665b50d6767a17bcc11c9d9c1c 3848d3d6fb6a6c15d69db759f323d3722d1c76ad
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 10 15:48:37 2012 +0300

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series

 debian/changelog                               |   28 +++++++++++++++++++++++-
 debian/control                                 |   19 +++++++++-------
 debian/patches/debian_set_library_version.diff |   22 +++++++++++++++++++
 debian/patches/hide_akonaditray.diff           |   12 ++++++++++
 4 files changed, 72 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 98b6fc2,3a11012..2c9ffd5

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,38 -1,30 +1,64 @@@
 +kdepim-runtime (4:4.8.4-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 +  [ George Kiagiadakis ]
 +  * Add myself to uploaders.
 +
 +  [ Jan Losinski ]
 +  * Update install files.
 +
 +  [ Modestas Vainius ]
 +  * Wildcardize l10n stuff in kdepim-runtime.install.
-   * Bump Standards-Version to 3.9.2: no changes needed.
 +  * Make kdepim-runtime-dbg depend on kdepim-runtime.
 +  * Require KDE SC 4.8.4 for building.
 +  * Update lintian overrides.
 +  * Drop extra Priority field from kdepim-runtime-dbg control.
 +  * Extend kdepim-runtime-dbg description.
 +  * Capitalize KDE in package descriptions.
 +  * Add kde-l10n, kde-l10n-nopim to kdepim-runtime Conflicts.
 +  * Version kdepim-dbg Breaks/Replaces. Otherwise, kdepim-runtime-dbg is not
 +    co-installable with kdepim-dbg.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Bump shared-desktop-ontologies build depend to 0.6.50.
 +  * Update installed files.
 +
 +  [ Eshat Cakar ]
 +  * Bump kdelibs5-dev and kdepimlibs5-dev build dependencies to 4:4.8.
 +  * Update installed files in 4.8.
 +  * Add watch file.
 +  * Bump libakonadi-dev build dependency version to 1.7.2.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Mar 2012 21:46:29 +0100
 +
+ kdepim-runtime (4:4.4.11.1-4) unstable; urgency=low
+ 
+   * Team upload.
+ 
+   [ Michael Biebl ]
+   * Hide akonaditray to not show up in the menu. (Closes: #613718)
+ 
+   [ Pino Toscano ]
+   * Override GENERIC_LIB_VERSION and KDE_NON_GENERIC_LIB_VERSION to not depend
+     on the kdelibs version. (Closes: #665060)
+   * Add Homepage in control.
+   * Small touches to the descriptions.
+   * Bump Standards-Version to 3.9.3, no changes required.
+ 
+  -- Pino Toscano <pino at debian.org>  Fri, 25 May 2012 14:33:17 +0200
+ 
+ kdepim-runtime (4:4.4.11.1-3) unstable; urgency=low
+ 
+   [ Modestas Vainius ]
+   * Version kdepim-dbg Breaks/Replaces. Otherwise, kdepim-runtime-dbg is not
+     co-installable with kdepim-dbg.
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Bump Standards-Version. No changes required.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 26 Nov 2011 21:43:16 -0300
+ 
  kdepim-runtime (4:4.4.11.1-2) unstable; urgency=low
  
    * Release to unstable.
diff --cc debian/control
index 2e6b37a,07c62fe..51a8695
--- a/debian/control
+++ b/debian/control
@@@ -3,13 -3,14 +3,14 @@@ 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>
 -Build-Depends: kde-sc-dev-latest (>= 4:4.6.2),
 + José Manuel Santamaría Lema <panfaust at gmail.com>,  George Kiagiadakis <kiagiadakis.george at gmail.com>
 +Build-Depends: kde-sc-dev-latest (>= 4:4.8.4),
   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),
 + kdelibs5-dev (>= 4:4.8), kdepimlibs5-dev (>= 4:4.8), libakonadi-dev (>= 1.7.2),
   libxml2-dev, xsltproc, libstrigiqtdbusclient-dev, libboost-dev (>= 1.40.0-2),
 - libstreamanalyzer-dev, shared-mime-info (>= 0.30), shared-desktop-ontologies (>= 0.2)
 + libstreamanalyzer-dev, shared-mime-info (>= 0.30), shared-desktop-ontologies (>= 0.6.50)
- Standards-Version: 3.9.2
+ Standards-Version: 3.9.3
+ Homepage: http://pim.kde.org/
  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
  
@@@ -18,23 -19,24 +19,25 @@@ Architecture: an
  Depends: ${shlibs:Depends}, ${misc:Depends}, kdepimlibs-kio-plugins, akonadi-server (>= 1.3)
  Replaces: akonadi-kde, libmaildir4
  Breaks: akonadi-kde, libmaildir4, kdepimlibs5 (<< 4:4.4)
 +Conflicts: kde-l10n, kde-l10n-nopim
- Description: Runtime components for akonadi-kde
-  This package contains akonadi agents written using kdelibs.
-  Any package that uses akonadi should probably pull this in as a dependency.
+ Description: runtime components for Akonadi KDE
+  This package contains Akonadi agents written using KDE Development Platform
+  libraries.
+  Any package that uses Akonadi should probably pull this in as a dependency.
   The kres-bridges is also parts of this package.
   .
   This package is part of the kdepim-runtime module.
  
  Package: kdepim-runtime-dbg
  Section: debug
+ Priority: extra
  Architecture: any
 -Replaces: kdepim-dbg (<< 4.4)
 -Breaks: kdepim-dbg (<< 4.4)
 -Depends: ${shlibs:Depends}, ${misc:Depends}
 +Replaces: kdepim-dbg (<< 4:4.4)
 +Breaks: kdepim-dbg (<< 4:4.4)
 +Depends: ${misc:Depends}, kdepim-runtime (= ${binary:Version})
- Description: debugging files for akonadi KDE runtime components
-  This package contains debugging symbols. You will want to install this package
-  when you encounter crashes in akonadi KDE runtime components. It will help to
-  produce useful information to developers.
+ Description: debugging files for Akonadi KDE runtime components
+  This package contains debugging symbols associated with kdepim-runtime.
+  They will automatically be used by gdb for debugging issues related to
+  components of kdepim-runtime.
   .
   This package is part of the kdepim-runtime module.

-- 
KDE PIM Runtime module packaging

