[SCM] KDE Development Platform Libraries module packaging branch, kde4.8, updated. debian/4.7.4-4-13-g3f94d51
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Sun Mar 18 02:11:59 UTC 2012
The following commit has been merged in the kde4.8 branch:
commit 856c95bb5a8efae522557feb82c5fc428eb60271
Merge: 2e0aedc7da1106c10c428e7ae0d7afa8aa9e4100 362e8c1023470d67f926116ad52980231c8c5d0f
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Fri Mar 16 23:24:48 2012 +0100
Merge branch 'master' into kde4.8
Conflicts:
debian/changelog
debian/changelog | 27 ++++++++++++++++++
debian/control | 2 +-
debian/libkde3support4.symbols | 3 +-
debian/libkfile4.symbols | 6 ++--
debian/libkhtml5.symbols | 5 ++-
debian/patches/series | 1 +
...ck-for-return-values-of-m_protocols.value.patch | 30 ++++++++++++++++++++
debian/rules | 3 +-
8 files changed, 69 insertions(+), 8 deletions(-)
diff --cc debian/changelog
index 5ce0d11,e395aae..b2583ca
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,30 +1,41 @@@
+kde4libs (4:4.8.1-0r0) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ [ Eshat Cakar ]
+ * Add myself to uploaders.
+ * Update installed files.
+ * Update not-installed files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 08 Mar 2012 17:23:21 +0100
+
+ kde4libs (4:4.7.4-4) unstable; urgency=low
+
+ * Team upload.
+ * Backport the upstream commit d1edc0f038818a073488f6a1822cfb01d43d67e4 to fix
+ a crash in KIO in some situations, like with proxies with kmail or akonadi
+ (patch upstream_better-check-for-return-values-of-m_protocols.value.patch).
+ (Closes: #663528)
+
+ -- Pino Toscano <pino at debian.org> Mon, 12 Mar 2012 20:45:47 +0100
+
+ kde4libs (4:4.7.4-3) unstable; urgency=low
+
+ * Team upload.
+ * Do not export libkactivities library targets in the cmake configuration
+ of kdelibs. Also do not install libkactivities's headers.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Mon, 05 Mar 2012 14:32:02 +0100
+
+ kde4libs (4:4.7.4-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ [ José Manuel Santamaría Lema ]
+ * Confirm symbols files on all architectures.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 22 Dec 2011 22:33:37 +0100
+
kde4libs (4:4.7.4-1) experimental; urgency=low
* New upstream release.
diff --cc debian/control
index 9462333,1002a45..fa93391
--- a/debian/control
+++ b/debian/control
@@@ -2,9 -2,9 +2,9 @@@ Source: kde4lib
Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>, Armin Berres <armin+debian at space-based.de>,
+ Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>,
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: debhelper (>= 7.3.16), cmake (>= 2.6.4), pkg-kde-tools (>= 0.14), libdlrestrictions-dev (>= 0.14),
shared-mime-info (>= 0.30), dpkg-dev (>= 1.15.5), libphonon-dev (>= 4:4.6.0really4.3.80),
libqt4-dev (>= 4:4.7.0), libqt4-opengl-dev (>= 4:4.7.0), libqtwebkit-dev,
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list