[SCM] qtlocation packaging branch, experimental, updated. debian/5.2.1-3-4-gc755a88

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit c755a885d1ddf3473e0a680c388a92a9362cb0f1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue May 27 15:32:23 2014 -0300

    Headers in m-a path, dev is now M-A: same.
---
 debian/changelog                  |  2 ++
 debian/control                    |  1 +
 debian/qtpositioning5-dev.install | 66 +++++++++++++++++++--------------------
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d02554c..975229f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtlocation-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Bump Qt build dependencies.
+  * Install headers in their new m-a path. Mark development package as
+    Multi-Arch: same.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 May 2014 15:28:31 -0300
 
diff --git a/debian/control b/debian/control
index 54bd1b7..67a1f28 100644
--- a/debian/control
+++ b/debian/control
@@ -72,6 +72,7 @@ Description: Qt Positioning QML module
 
 Package: qtpositioning5-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libqt5positioning5 (= ${binary:Version}),
          libqt5positioning5-plugins (= ${binary:Version}),
diff --git a/debian/qtpositioning5-dev.install b/debian/qtpositioning5-dev.install
index 87efb4c..b5a351f 100644
--- a/debian/qtpositioning5-dev.install
+++ b/debian/qtpositioning5-dev.install
@@ -1,36 +1,36 @@
-usr/include/qt5/QtPositioning/QGeoAddress
-usr/include/qt5/QtPositioning/QGeoAreaMonitorInfo
-usr/include/qt5/QtPositioning/QGeoAreaMonitorSource
-usr/include/qt5/QtPositioning/QGeoCircle
-usr/include/qt5/QtPositioning/QGeoCoordinate
-usr/include/qt5/QtPositioning/QGeoLocation
-usr/include/qt5/QtPositioning/QGeoPositionInfo
-usr/include/qt5/QtPositioning/QGeoPositionInfoSource
-usr/include/qt5/QtPositioning/QGeoPositionInfoSourceFactory
-usr/include/qt5/QtPositioning/QGeoRectangle
-usr/include/qt5/QtPositioning/QGeoSatelliteInfo
-usr/include/qt5/QtPositioning/QGeoSatelliteInfoSource
-usr/include/qt5/QtPositioning/QGeoShape
-usr/include/qt5/QtPositioning/QNmeaPositionInfoSource
-usr/include/qt5/QtPositioning/QtPositioning
-usr/include/qt5/QtPositioning/QtPositioningDepends
-usr/include/qt5/QtPositioning/QtPositioningVersion
-usr/include/qt5/QtPositioning/qgeoaddress.h
-usr/include/qt5/QtPositioning/qgeoareamonitorinfo.h
-usr/include/qt5/QtPositioning/qgeoareamonitorsource.h
-usr/include/qt5/QtPositioning/qgeocircle.h
-usr/include/qt5/QtPositioning/qgeocoordinate.h
-usr/include/qt5/QtPositioning/qgeolocation.h
-usr/include/qt5/QtPositioning/qgeopositioninfo.h
-usr/include/qt5/QtPositioning/qgeopositioninfosource.h
-usr/include/qt5/QtPositioning/qgeopositioninfosourcefactory.h
-usr/include/qt5/QtPositioning/qgeorectangle.h
-usr/include/qt5/QtPositioning/qgeosatelliteinfo.h
-usr/include/qt5/QtPositioning/qgeosatelliteinfosource.h
-usr/include/qt5/QtPositioning/qgeoshape.h
-usr/include/qt5/QtPositioning/qnmeapositioninfosource.h
-usr/include/qt5/QtPositioning/qpositioningglobal.h
-usr/include/qt5/QtPositioning/qtpositioningversion.h
+usr/include/*/qt5/QtPositioning/QGeoAddress
+usr/include/*/qt5/QtPositioning/QGeoAreaMonitorInfo
+usr/include/*/qt5/QtPositioning/QGeoAreaMonitorSource
+usr/include/*/qt5/QtPositioning/QGeoCircle
+usr/include/*/qt5/QtPositioning/QGeoCoordinate
+usr/include/*/qt5/QtPositioning/QGeoLocation
+usr/include/*/qt5/QtPositioning/QGeoPositionInfo
+usr/include/*/qt5/QtPositioning/QGeoPositionInfoSource
+usr/include/*/qt5/QtPositioning/QGeoPositionInfoSourceFactory
+usr/include/*/qt5/QtPositioning/QGeoRectangle
+usr/include/*/qt5/QtPositioning/QGeoSatelliteInfo
+usr/include/*/qt5/QtPositioning/QGeoSatelliteInfoSource
+usr/include/*/qt5/QtPositioning/QGeoShape
+usr/include/*/qt5/QtPositioning/QNmeaPositionInfoSource
+usr/include/*/qt5/QtPositioning/QtPositioning
+usr/include/*/qt5/QtPositioning/QtPositioningDepends
+usr/include/*/qt5/QtPositioning/QtPositioningVersion
+usr/include/*/qt5/QtPositioning/qgeoaddress.h
+usr/include/*/qt5/QtPositioning/qgeoareamonitorinfo.h
+usr/include/*/qt5/QtPositioning/qgeoareamonitorsource.h
+usr/include/*/qt5/QtPositioning/qgeocircle.h
+usr/include/*/qt5/QtPositioning/qgeocoordinate.h
+usr/include/*/qt5/QtPositioning/qgeolocation.h
+usr/include/*/qt5/QtPositioning/qgeopositioninfo.h
+usr/include/*/qt5/QtPositioning/qgeopositioninfosource.h
+usr/include/*/qt5/QtPositioning/qgeopositioninfosourcefactory.h
+usr/include/*/qt5/QtPositioning/qgeorectangle.h
+usr/include/*/qt5/QtPositioning/qgeosatelliteinfo.h
+usr/include/*/qt5/QtPositioning/qgeosatelliteinfosource.h
+usr/include/*/qt5/QtPositioning/qgeoshape.h
+usr/include/*/qt5/QtPositioning/qnmeapositioninfosource.h
+usr/include/*/qt5/QtPositioning/qpositioningglobal.h
+usr/include/*/qt5/QtPositioning/qtpositioningversion.h
 usr/lib/*/cmake/Qt5Positioning/Qt5PositioningConfig.cmake
 usr/lib/*/cmake/Qt5Positioning/Qt5PositioningConfigVersion.cmake
 usr/lib/*/libQt5Positioning.prl

-- 
qtlocation packaging