[SCM] KDE Bindings module packaging branch, master, updated. debian/4.4.5-4-4-g6737d2c
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Fri Mar 11 22:13:35 UTC 2011
The following commit has been merged in the master branch:
commit 6737d2ccaa00a301724651cd34ad79833916e70d
Merge: aa6a3c0ff9d23414b599cc840d3bbdd058ccbde4 0f42d92e36fcd18a27f459a08b04763d7b7575bc
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Fri Mar 11 21:27:18 2011 +0100
Merge branches 'master' and 'kde4.5'
Conflicts:
debian/changelog
debian/changelog | 9 +++++++
debian/control | 52 ++++++++++++++++++++++++++++-----------
debian/libqyoto2.install | 1 +
debian/libqyotoshared1.install | 1 -
debian/libqyotoshared2.install | 1 +
debian/libsmokebase3.install | 2 +
debian/libsmokeqt4-dev.install | 26 +++++++++++++++++--
7 files changed, 73 insertions(+), 19 deletions(-)
diff --cc debian/changelog
index aa13a6f,7342d3b..8eb0ce4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,12 +1,24 @@@
+ kdebindings (4:4.5.1-0r1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ [ Sune Vuorela ]
+ * Make kio-monodoc depend on monodoc-manual.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 09 Aug 2010 22:43:03 +0200
+
+kdebindings (4:4.4.5-4) unstable; urgency=low
+
+ [ Pino Toscano ]
+ * Backport some upstream revisions to fix compilation: (Closes: #616139)
+ - r1150375 for SIP > 4.10.
+ - r1170602, r1209688, and r1211266 for PyQt4 4.8.x.
+ - r1184022 to fix a smokegen segfault when parsing QtOpenGL headers.
+ * Few touches to the packages descriptions.
+ - ... including the proper capitalization of "SMOKE". (Closes: #596875)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 06 Mar 2011 23:58:09 +0100
+
kdebindings (4:4.4.5-3) unstable; urgency=low
[ Pino Toscano ]
--
KDE Bindings module packaging
More information about the pkg-kde-commits
mailing list