[SCM] kwindowsystem packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-20-g49a225a
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Tue Jul 28 09:45:33 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwindowsystem.git;a=commitdiff;h=49a225a
The following commit has been merged in the kubuntu_unstable branch:
commit 49a225ae07598000c5515873a4b799900d446df9
Author: Jonathan Riddell <jr at jriddell.org>
Date: Tue Jul 28 11:45:21 2015 +0200
Revert "Update installed files."
This reverts commit 83ce2657379fd083193087f6bf05077dd20b966a.
# Conflicts:
# debian/changelog
---
debian/changelog | 5 +----
debian/libkf5windowsystem5.install | 2 ++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cd6f5d3..ec5c942 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,10 @@
kwindowsystem (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
- [ Scarlett Clark ]
- * New upstream release
-
[ José Manuel Santamaría Lema ]
* Update installed files.
[ Scarlett Clark ]
- * Vivid backport.
+ * New upstream release
-- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 08:27:52 -0700
diff --git a/debian/libkf5windowsystem5.install b/debian/libkf5windowsystem5.install
index 8ac1dcf..91e4134 100644
--- a/debian/libkf5windowsystem5.install
+++ b/debian/libkf5windowsystem5.install
@@ -1,2 +1,4 @@
usr/lib/*/libKF5WindowSystem.so.5
usr/lib/*/libKF5WindowSystem.so.5.*
+usr/lib/*/qt5/plugins/kf5/org.kde.kwindowsystem.platforms/KF5WindowSystemWaylandPlugin.so
+usr/lib/*/qt5/plugins/kf5/org.kde.kwindowsystem.platforms/KF5WindowSystemX11Plugin.so
--
kwindowsystem packaging
More information about the pkg-kde-commits
mailing list