[SCM] qtserialport packaging branch, experimental, updated. debian/5.2.1-2-5-g6997cd0

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtserialport.git;a=commitdiff;h=613c4de

The following commit has been merged in the experimental branch:
commit 613c4deb489db99eb63783e0c2067f8635d14bb9
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun May 25 13:38:00 2014 +0400

    Update for Multi-Arch headers location.
---
 debian/changelog                     |  1 +
 debian/libqt5serialport5-dev.install | 26 +++++++++++++-------------
 debian/rules                         |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50427bc..3667c9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtserialport-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies.
+  * Update for Multi-Arch headers location.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 25 May 2014 12:56:31 +0400
 
diff --git a/debian/libqt5serialport5-dev.install b/debian/libqt5serialport5-dev.install
index c7c250e..8a8ef3d 100644
--- a/debian/libqt5serialport5-dev.install
+++ b/debian/libqt5serialport5-dev.install
@@ -1,16 +1,16 @@
-usr/include/qt5/QtSerialPort/QLockFile
-usr/include/qt5/QtSerialPort/QSerialPort
-usr/include/qt5/QtSerialPort/QSerialPortInfo
-usr/include/qt5/QtSerialPort/QWinEventNotifier
-usr/include/qt5/QtSerialPort/QtSerialPort
-usr/include/qt5/QtSerialPort/QtSerialPortDepends
-usr/include/qt5/QtSerialPort/QtSerialPortVersion
-usr/include/qt5/QtSerialPort/qlockfile.h
-usr/include/qt5/QtSerialPort/qserialport.h
-usr/include/qt5/QtSerialPort/qserialportglobal.h
-usr/include/qt5/QtSerialPort/qserialportinfo.h
-usr/include/qt5/QtSerialPort/qtserialportversion.h
-usr/include/qt5/QtSerialPort/qwineventnotifier.h
+usr/include/*/qt5/QtSerialPort/QLockFile
+usr/include/*/qt5/QtSerialPort/QSerialPort
+usr/include/*/qt5/QtSerialPort/QSerialPortInfo
+usr/include/*/qt5/QtSerialPort/QWinEventNotifier
+usr/include/*/qt5/QtSerialPort/QtSerialPort
+usr/include/*/qt5/QtSerialPort/QtSerialPortDepends
+usr/include/*/qt5/QtSerialPort/QtSerialPortVersion
+usr/include/*/qt5/QtSerialPort/qlockfile.h
+usr/include/*/qt5/QtSerialPort/qserialport.h
+usr/include/*/qt5/QtSerialPort/qserialportglobal.h
+usr/include/*/qt5/QtSerialPort/qserialportinfo.h
+usr/include/*/qt5/QtSerialPort/qtserialportversion.h
+usr/include/*/qt5/QtSerialPort/qwineventnotifier.h
 usr/lib/*/cmake/Qt5SerialPort/Qt5SerialPortConfig.cmake
 usr/lib/*/cmake/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake
 usr/lib/*/libQt5SerialPort.prl
diff --git a/debian/rules b/debian/rules
index dc2723a..004e4fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ override_dh_auto_install-arch:
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
 	# Remove private headers and related files, nothing needs them so far.
-	rm -rfv debian/tmp/usr/include/qt5/QtSerialPort/*/QtSerialPort/private/
+	rm -rfv debian/tmp/usr/include/*/qt5/QtSerialPort/*/QtSerialPort/private/
 	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_serialport_private.pri
 	
 	# Fix wrong path in pkgconfig files

-- 
qtserialport packaging