[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Fri Jan 31 15:35:28 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=4b872c5

The following commit has been merged in the master branch:
commit 4b872c55f54e4c6d772b3ef47f684c544152f626
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Nov 22 12:24:36 2013 -0300

    Install the QEvdev CMake related files only in Linux.
---
 debian/changelog                  | 2 ++
 debian/qtbase5-dev.install-common | 2 --
 debian/qtbase5-dev.install-linux  | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b7ae5a..802f454 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtbase-opensource-src (5.2.0~beta1+dfsg-3) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Also install KSM/EGL CMake's configuration files for armel:
     - Create debian/qtbase5-dev.install-armel.
+  * Install the QEvdev CMake related files only in Linux, as they are not
+    present in Hurd.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 22 Nov 2013 12:09:45 -0300
 
diff --git a/debian/qtbase5-dev.install-common b/debian/qtbase5-dev.install-common
index d52fdc1..5c9f431 100644
--- a/debian/qtbase5-dev.install-common
+++ b/debian/qtbase5-dev.install-common
@@ -1506,8 +1506,6 @@ usr/lib/*/cmake/Qt5Gui/Qt5GuiConfig.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEvdevMousePlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEvdevKeyboardPlugin.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
diff --git a/debian/qtbase5-dev.install-linux b/debian/qtbase5-dev.install-linux
new file mode 100644
index 0000000..677df4d
--- /dev/null
+++ b/debian/qtbase5-dev.install-linux
@@ -0,0 +1,2 @@
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEvdevMousePlugin.cmake
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEvdevKeyboardPlugin.cmake

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list