[SCM] qtlocation packaging branch, master, updated. bc867114240ac99a3d76ae1a038e75e22a49d990

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Wed Feb 26 22:49:18 UTC 2014 

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

The following commit has been merged in the master branch:
commit bc867114240ac99a3d76ae1a038e75e22a49d990
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Feb 26 19:48:24 2014 -0300

    Remove location stuff.
    
    We still don't have Qt3D around. We can re add it back later.
---
 debian/control                      | 49 ++------------------
 debian/qtlocation5-dev.install      | 92 -------------------------------------
 debian/qtlocation5-examples.install |  1 -
 3 files changed, 4 insertions(+), 138 deletions(-)

diff --git a/debian/control b/debian/control
index 293cd76..6d5348b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 9.0.0),
                libgeoclue-dev,
                libqt5opengl5-dev,
                pkg-kde-tools,
-               qt3d5-dev,
                qtbase5-private-dev (>= 5.2.1~),
                qtdeclarative5-private-dev (>= 5.2.1~),
                qtdeclarative5-qtquick2-plugin (>= 5.2.1~),
@@ -18,18 +17,6 @@ Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtlocation.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtlocation.git;a=summary
 
-Package: libqt5location5
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Qt Location module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains Qt Location module.
-
 Package: libqt5positioning5
 Architecture: any
 Multi-Arch: same
@@ -42,19 +29,6 @@ Description: Qt Positioning module
  .
  This package contains Qt Positioning module.
 
-Package: libqt5location5-plugins
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: libqt5location5 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: Qt Location module - geolocation plugins
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains Qt Location position and geolocation plugins.
-
 Package: libqt5positioning5-plugins
 Architecture: any
 Multi-Arch: same
@@ -68,19 +42,6 @@ Description: Qt Positioning module - position plugins
  .
  This package contains Qt Positioning plugins.
 
-Package: qtdeclarative5-qtlocation-plugin
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: libqt5location5-plugins,
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: Qt Location module - QML plugin
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the Qt Location QML plugin for Qt Declarative.
-
 Package: qtdeclarative5-qtpositioning-plugin
 Architecture: any
 Multi-Arch: same
@@ -115,11 +76,10 @@ Package: qtlocation5-examples
 Architecture: any
 Multi-Arch: same
 Section: x11
-Pre-Depends: ${misc:Pre-Depends},
-Depends: libqt5location5-plugins (= ${binary:Version}),
-         libqt5positioning5-plugins (= ${binary:Version}),
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libqt5positioning5-plugins (= ${binary:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: Qt 5 Location examples
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -131,8 +91,7 @@ Priority: extra
 Architecture: any
 Multi-Arch: same
 Section: debug
-Depends: libqt5location5 (= ${binary:Version}),
-         ${misc:Depends},
+Depends: libqt5positioning5 (= ${binary:Version}), ${misc:Depends}
 Description: Qt Location library debugging symbols
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/qtlocation5-dev.install b/debian/qtlocation5-dev.install
index 58bb599..87efb4c 100644
--- a/debian/qtlocation5-dev.install
+++ b/debian/qtlocation5-dev.install
@@ -1,89 +1,3 @@
-usr/include/qt5/QtLocation/QGeoCodeReply
-usr/include/qt5/QtLocation/QGeoCodingManager
-usr/include/qt5/QtLocation/QGeoCodingManagerEngine
-usr/include/qt5/QtLocation/QGeoManeuver
-usr/include/qt5/QtLocation/QGeoRoute
-usr/include/qt5/QtLocation/QGeoRouteReply
-usr/include/qt5/QtLocation/QGeoRouteRequest
-usr/include/qt5/QtLocation/QGeoRouteSegment
-usr/include/qt5/QtLocation/QGeoRoutingManager
-usr/include/qt5/QtLocation/QGeoRoutingManagerEngine
-usr/include/qt5/QtLocation/QGeoServiceProvider
-usr/include/qt5/QtLocation/QGeoServiceProviderFactory
-usr/include/qt5/QtLocation/QLocation
-usr/include/qt5/QtLocation/QPlace
-usr/include/qt5/QtLocation/QPlaceAttribute
-usr/include/qt5/QtLocation/QPlaceCategory
-usr/include/qt5/QtLocation/QPlaceContactDetail
-usr/include/qt5/QtLocation/QPlaceContent
-usr/include/qt5/QtLocation/QPlaceContentReply
-usr/include/qt5/QtLocation/QPlaceContentRequest
-usr/include/qt5/QtLocation/QPlaceDetailsReply
-usr/include/qt5/QtLocation/QPlaceEditorial
-usr/include/qt5/QtLocation/QPlaceIcon
-usr/include/qt5/QtLocation/QPlaceIdReply
-usr/include/qt5/QtLocation/QPlaceImage
-usr/include/qt5/QtLocation/QPlaceManager
-usr/include/qt5/QtLocation/QPlaceManagerEngine
-usr/include/qt5/QtLocation/QPlaceMatchReply
-usr/include/qt5/QtLocation/QPlaceMatchRequest
-usr/include/qt5/QtLocation/QPlaceProposedSearchResult
-usr/include/qt5/QtLocation/QPlaceRatings
-usr/include/qt5/QtLocation/QPlaceReply
-usr/include/qt5/QtLocation/QPlaceResult
-usr/include/qt5/QtLocation/QPlaceReview
-usr/include/qt5/QtLocation/QPlaceSearchReply
-usr/include/qt5/QtLocation/QPlaceSearchRequest
-usr/include/qt5/QtLocation/QPlaceSearchResult
-usr/include/qt5/QtLocation/QPlaceSearchSuggestionReply
-usr/include/qt5/QtLocation/QPlaceSupplier
-usr/include/qt5/QtLocation/QPlaceUser
-usr/include/qt5/QtLocation/QtLocation
-usr/include/qt5/QtLocation/QtLocationDepends
-usr/include/qt5/QtLocation/QtLocationVersion
-usr/include/qt5/QtLocation/placemacro.h
-usr/include/qt5/QtLocation/qgeocodereply.h
-usr/include/qt5/QtLocation/qgeocodingmanager.h
-usr/include/qt5/QtLocation/qgeocodingmanagerengine.h
-usr/include/qt5/QtLocation/qgeomaneuver.h
-usr/include/qt5/QtLocation/qgeoroute.h
-usr/include/qt5/QtLocation/qgeoroutereply.h
-usr/include/qt5/QtLocation/qgeorouterequest.h
-usr/include/qt5/QtLocation/qgeoroutesegment.h
-usr/include/qt5/QtLocation/qgeoroutingmanager.h
-usr/include/qt5/QtLocation/qgeoroutingmanagerengine.h
-usr/include/qt5/QtLocation/qgeoserviceprovider.h
-usr/include/qt5/QtLocation/qgeoserviceproviderfactory.h
-usr/include/qt5/QtLocation/qlocation.h
-usr/include/qt5/QtLocation/qlocationglobal.h
-usr/include/qt5/QtLocation/qplace.h
-usr/include/qt5/QtLocation/qplaceattribute.h
-usr/include/qt5/QtLocation/qplacecategory.h
-usr/include/qt5/QtLocation/qplacecontactdetail.h
-usr/include/qt5/QtLocation/qplacecontent.h
-usr/include/qt5/QtLocation/qplacecontentreply.h
-usr/include/qt5/QtLocation/qplacecontentrequest.h
-usr/include/qt5/QtLocation/qplacedetailsreply.h
-usr/include/qt5/QtLocation/qplaceeditorial.h
-usr/include/qt5/QtLocation/qplaceicon.h
-usr/include/qt5/QtLocation/qplaceidreply.h
-usr/include/qt5/QtLocation/qplaceimage.h
-usr/include/qt5/QtLocation/qplacemanager.h
-usr/include/qt5/QtLocation/qplacemanagerengine.h
-usr/include/qt5/QtLocation/qplacematchreply.h
-usr/include/qt5/QtLocation/qplacematchrequest.h
-usr/include/qt5/QtLocation/qplaceproposedsearchresult.h
-usr/include/qt5/QtLocation/qplaceratings.h
-usr/include/qt5/QtLocation/qplacereply.h
-usr/include/qt5/QtLocation/qplaceresult.h
-usr/include/qt5/QtLocation/qplacereview.h
-usr/include/qt5/QtLocation/qplacesearchreply.h
-usr/include/qt5/QtLocation/qplacesearchrequest.h
-usr/include/qt5/QtLocation/qplacesearchresult.h
-usr/include/qt5/QtLocation/qplacesearchsuggestionreply.h
-usr/include/qt5/QtLocation/qplacesupplier.h
-usr/include/qt5/QtLocation/qplaceuser.h
-usr/include/qt5/QtLocation/qtlocationversion.h
 usr/include/qt5/QtPositioning/QGeoAddress
 usr/include/qt5/QtPositioning/QGeoAreaMonitorInfo
 usr/include/qt5/QtPositioning/QGeoAreaMonitorSource
@@ -117,15 +31,9 @@ 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/Qt5Location/Qt5LocationConfig.cmake
-usr/lib/*/cmake/Qt5Location/Qt5LocationConfigVersion.cmake
 usr/lib/*/cmake/Qt5Positioning/Qt5PositioningConfig.cmake
 usr/lib/*/cmake/Qt5Positioning/Qt5PositioningConfigVersion.cmake
-usr/lib/*/libQt5Location.prl
-usr/lib/*/libQt5Location.so
 usr/lib/*/libQt5Positioning.prl
 usr/lib/*/libQt5Positioning.so
-usr/lib/*/pkgconfig/Qt5Location.pc
 usr/lib/*/pkgconfig/Qt5Positioning.pc
-usr/lib/*/qt5/mkspecs/modules/qt_lib_location.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_positioning.pri
diff --git a/debian/qtlocation5-examples.install b/debian/qtlocation5-examples.install
index 659c9f9..9527c90 100644
--- a/debian/qtlocation5-examples.install
+++ b/debian/qtlocation5-examples.install
@@ -1,2 +1 @@
-usr/lib/*/qt5/examples/location/
 usr/lib/*/qt5/examples/positioning/

-- 
qtlocation packaging

More information about the pkg-kde-commits mailing list