[SCM] qtlocation packaging branch, master, updated. 837c3b67ff71c5c8182104b0b953889dcbfadaf0

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 837c3b67ff71c5c8182104b0b953889dcbfadaf0
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Dec 18 07:51:08 2013 +0000

    Update to final release
---
 debian/changelog                       |  2 +-
 debian/qtlocation5-examples.install    | 74 +++++++++++++++++-----------------
 debian/qtlocation5-private-dev.install |  2 +
 debian/rules                           |  3 ++
 4 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 882b814..bb2d4fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtlocation-opensource-src (5.2.0~beta1-1) UNRELEASED; urgency=low
+qtlocation-opensource-src (5.2.0-1) UNRELEASED; urgency=low
 
   [ Timo Jyrinki ]
   * Initial release. (Closes: #697509)
diff --git a/debian/qtlocation5-examples.install b/debian/qtlocation5-examples.install
index 80556ba..881adef 100644
--- a/debian/qtlocation5-examples.install
+++ b/debian/qtlocation5-examples.install
@@ -1,40 +1,40 @@
-usr/lib/*/qt5/examples/qtlocation/declarative/places/qml_location_places
-usr/lib/*/qt5/examples/qtlocation/declarative/places_list/places_list
-usr/lib/*/qt5/examples/qtlocation/declarative/places_list/places_list.qml
-usr/lib/*/qt5/examples/qtlocation/declarative/places_map/marker.png
-usr/lib/*/qt5/examples/qtlocation/declarative/places_map/places_map
-usr/lib/*/qt5/examples/qtlocation/declarative/places_map/places_map.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickr-90.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickr.pro
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickr.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickr.qrc
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrcommon/Progress.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrcommon/RestModel.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrcommon/ScrollBar.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrcommon/Slider.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/Button.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/GeoTab.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/GridDelegate.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/ImageDetails.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/ListDelegate.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/TitleBar.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/ToolBar.qml
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images/gloss.png
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images/lineedit.png
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images/lineedit.sci
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images/moon.png
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images/quit.png
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images/star.png
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images/stripes.png
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images/sun.png
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images/titlebar.png
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images/titlebar.sci
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images/toolbutton.png
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/images/toolbutton.sci
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/flickrmobile/nmealog.txt
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/qml_position_flickr
-usr/lib/*/qt5/examples/qtpositioning/declarative/flickr/qmllocationflickr.cpp
+usr/lib/*/qt5/examples/qtlocation/places/qml_location_places
+usr/lib/*/qt5/examples/qtlocation/places_list/places_list
+usr/lib/*/qt5/examples/qtlocation/places_list/places_list.qml
+usr/lib/*/qt5/examples/qtlocation/places_map/marker.png
+usr/lib/*/qt5/examples/qtlocation/places_map/places_map
+usr/lib/*/qt5/examples/qtlocation/places_map/places_map.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickr-90.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickr.pro
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickr.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickr.qrc
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrcommon/Progress.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrcommon/RestModel.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrcommon/ScrollBar.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrcommon/Slider.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/Button.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/GeoTab.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/GridDelegate.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/ImageDetails.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/ListDelegate.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/TitleBar.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/ToolBar.qml
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images/gloss.png
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images/lineedit.png
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images/lineedit.sci
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images/moon.png
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images/quit.png
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images/star.png
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images/stripes.png
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images/sun.png
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images/titlebar.png
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images/titlebar.sci
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images/toolbutton.png
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/images/toolbutton.sci
+usr/lib/*/qt5/examples/qtpositioning/flickr/flickrmobile/nmealog.txt
+usr/lib/*/qt5/examples/qtpositioning/flickr/qml_position_flickr
+usr/lib/*/qt5/examples/qtpositioning/flickr/qmllocationflickr.cpp
 usr/lib/*/qt5/examples/qtpositioning/logfilepositionsource/clientapplication.cpp
 usr/lib/*/qt5/examples/qtpositioning/logfilepositionsource/clientapplication.h
 usr/lib/*/qt5/examples/qtpositioning/logfilepositionsource/logfilepositionsource
diff --git a/debian/qtlocation5-private-dev.install b/debian/qtlocation5-private-dev.install
index 37c4fa8..ccc4f0a 100644
--- a/debian/qtlocation5-private-dev.install
+++ b/debian/qtlocation5-private-dev.install
@@ -72,3 +72,5 @@ usr/include/qt5/QtPositioning/*/QtPositioning/private/qgeorectangle_p.h
 usr/include/qt5/QtPositioning/*/QtPositioning/private/qgeoshape_p.h
 usr/include/qt5/QtPositioning/*/QtPositioning/private/qlocationutils_p.h
 usr/include/qt5/QtPositioning/*/QtPositioning/private/qnmeapositioninfosource_p.h
+usr/share/qt5/mkspecs/modules/qt_lib_location_private.pri
+usr/share/qt5/mkspecs/modules/qt_lib_positioning_private.pri
diff --git a/debian/rules b/debian/rules
index e216f02..dbb8639 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,9 @@ override_dh_auto_install:
 	
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+	
+	# Remove binary that includes libtheora in itself
+	rm -f debian/tmp/usr/lib/*/qt5/examples/qtlocation/declarative/mapviewer/qml_location_mapviewer
 
 override_dh_auto_test:
 	export LD_LIBRARY_PATH=$(CURDIR)/lib

-- 
qtlocation packaging