[SCM] KDE PIM Libraries module packaging branch, kde4.8, updated. debian/4.7.4-2-18-gb89c626
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Sun Mar 18 20:23:20 UTC 2012
The following commit has been merged in the kde4.8 branch:
commit 6d9842bd5e8e5a7978b12f2f00b83e2612c88f92
Merge: 64aac55e0ea292b7c6be73eb1db04efdd31fa4bb 6992a3a860d435694e136eb90488a88156e52619
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Sun Mar 18 16:37:15 2012 +0100
Merge branch 'master' into kde4.8
Conflicts:
debian/changelog
debian/control
debian/changelog | 10 ++
debian/control | 2 +-
debian/libakonadi-contact4.symbols | 12 ++-
debian/libakonadi-kde4.symbols | 66 ++++++--------
debian/libakonadi-kmime4.symbols | 4 +-
debian/libgpgme++2.symbols | 173 ++++++++++++++++++------------------
debian/libkcal4.symbols | 3 +-
debian/libkcalcore4.symbols | 4 +-
debian/libkholidays4.symbols | 52 +++---------
debian/libkmime4.symbols | 6 +-
debian/libmailtransport4.symbols | 6 +-
debian/libsyndication4.symbols | 11 ++-
12 files changed, 162 insertions(+), 187 deletions(-)
diff --cc debian/changelog
index f1160bb,9688503..d1d85c4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,13 +1,26 @@@
+kdepimlibs (4:4.8.1-0r0) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ [ Eshat Cakar ]
+ * Add myself to uploaders.
+ * Add libakonadi-notes4 and libkalarmcal2 packages.
+ * Update installed files.
+ * Remove kio_imap_append.diff, applied upstream.
+ * Bump kdelibs5-dev version to 4.8.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 08 Mar 2012 21:16:23 +0100
+
+ kdepimlibs (4:4.7.4-2) unstable; urgency=low
+
+ * Team upload. Upload to unstable.
+ * Update uploaders, remove Armin.
+
+ [ José Manuel Santamaría Lema ]
+ * Confirm symbols files on all architectures.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Mon, 05 Mar 2012 10:10:14 +0100
+
kdepimlibs (4:4.7.4-1) experimental; urgency=low
* New upstream release.
diff --cc debian/control
index 02993c1,de17c4f..493880c
--- a/debian/control
+++ b/debian/control
@@@ -3,11 -3,11 +3,11 @@@ Section: lib
Priority: optional
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>,
- Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>,
+ Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>,
- José Manuel Santamaría Lema <panfaust at gmail.com>
+ José Manuel Santamaría Lema <panfaust at gmail.com>, Eshat Cakar <info at eshat.de>
Build-Depends: kde-sc-dev-latest (>= 4:4.7.4),
cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), dpkg-dev (>= 1.15.5),
- kdelibs5-dev (>= 4:4.7), libgpgme11-dev, libldap2-dev, libsasl2-dev,
+ kdelibs5-dev (>= 4:4.8), libgpgme11-dev, libldap2-dev, libsasl2-dev,
libboost-dev, libboost-graph-dev, shared-mime-info,
libakonadi-dev (>= 1.5.52), libical-dev (>= 0.42),
shared-desktop-ontologies (>= 0.8), libsoprano-dev, xsltproc, uuid-dev,
--
KDE PIM Libraries module packaging
More information about the pkg-kde-commits
mailing list