[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.8.4-2-6-g1bb8a72
Pino Toscano
pino at alioth.debian.org
Thu Nov 22 18:08:58 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-runtime.git;a=commitdiff;h=1bb8a72
The following commit has been merged in the master branch:
commit 1bb8a7280529a4485d314e88d3a75e10631863e1
Merge: 933192381575d1940f5fc23aef6ac666a48d9f4c c4e98ac11b679f834d3be4d85c23d679362aedb1
Author: Pino Toscano <pino at debian.org>
Date: Thu Nov 22 19:08:29 2012 +0100
Merge remote-tracking branch 'origin/wheezy'
Improve the changelog to consider the removed patches.
Conflicts:
debian/changelog
debian/changelog | 28 ++++++++++++++++++++++++----
debian/control | 3 ++-
2 files changed, 26 insertions(+), 5 deletions(-)
diff --cc debian/changelog
index 4435c0b,c13c830..4e77e87
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,19 +1,30 @@@
+kde-runtime (4:4.8.5-0r0) UNRELEASED; urgency=low
+
- [ Lisandro Damián Nicanor Pérez Meyer ]
- * New upstream release:
- - removes a spammy "FIXME" debug message. (Closes: #677625)
++ * New upstream release.
++
++ [ Lisandro Damián Nicanor Pérez meyer ]
++ * Remove obsolete patches:
++ - upstream_Remove-image-x-wmf-and-image-x-xfig-from-image-thumb.patch
++ - upstream_Remove-a-FIXME-debug-message.patch
++
++ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 24 Oct 2012 17:33:47 -0300
++
+ kde-runtime (4:4.8.4-2) unstable; urgency=low
+
+ * The package rebuild will use xz compression (Closes: #688758).
+
+ [ Pino Toscano ]
+ * Backport upstream commit 9145b51c1cc4e9ecd273e8eb41de1bbcdd607e35 to not
+ claim thumbnail support for the image/x-wmf and image/x-xfig mimetypes;
+ patch upstream_Remove-image-x-wmf-and-image-x-xfig-from-image-thumb.patch.
+ * Backport upstream commit d9234cca36319cb6895d4a7d36030a95923d1373 (from
+ the nepomuk-core repository) to remove a spammy "FIXME" debug message;
+ patch upstream_Remove-a-FIXME-debug-message.patch. (Closes: #677625)
+
+ [ Lisandro Damián Nicanor Pérez meyer ]
+ * Add myself to Uploaders.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 08 Jul 2012 12:04:09 +0200
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Wed, 24 Oct 2012 17:33:47 -0300
kde-runtime (4:4.8.4-1) unstable; urgency=low
--
KDE Base Runtime module packaging
More information about the pkg-kde-commits
mailing list