[SCM] marble packaging branch, master, updated. debian/4.8.4-2-4-gcf82854

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/marble.git;a=commitdiff;h=818842b

The following commit has been merged in the master branch:
commit 818842baab29c6acb9297327a8e048729be0290f
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 25 16:53:49 2012 +0200

    do not install marble-touch and its qtcomponents
    
    they require libraries not available in Debian
---
 debian/changelog              |    2 ++
 debian/marble-plugins.install |   11 -----------
 debian/marble.install         |    1 -
 debian/not-installed          |   14 ++++++++++++++
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a28a22..5cdf293 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ marble (4:4.8.4-3) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Fix the detection of the QML imports directory, and move the QML stuff
     accordingly; patch fix_qmake_fallback.diff. (Closes: #688755)
+  * Do not install marble-touch and its qtcomponents, since they require
+    libraries not available in Debian.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 25 Sep 2012 16:34:27 +0200
 
diff --git a/debian/marble-plugins.install b/debian/marble-plugins.install
index 2e8e3be..b5dfc3f 100644
--- a/debian/marble-plugins.install
+++ b/debian/marble-plugins.install
@@ -1,17 +1,6 @@
 usr/lib/*/qt4/imports/org/kde/edu/marble/MarbleSettings.qml
 usr/lib/*/qt4/imports/org/kde/edu/marble/libMarbleDeclarativePlugin.so
 usr/lib/*/qt4/imports/org/kde/edu/marble/qmldir
-usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/FileDialog.qml
-usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/FileOpenDialog.qml
-usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/FileSaveDialog.qml
-usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/MenuItemSwitch.qml
-usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/RouteEditor.qml
-usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/RoutingDialog.qml
-usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/SearchField.qml
-usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/SearchResultSelectionDialog.qml
-usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/ViaPointEditor.qml
-usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/libQtComponentsPlugin.so
-usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/qmldir
 usr/lib/kde4/plugins/marble/13/AprsPlugin.so
 usr/lib/kde4/plugins/marble/13/CachePlugin.so
 usr/lib/kde4/plugins/marble/13/CompassFloatItem.so
diff --git a/debian/marble.install b/debian/marble.install
index 9480a62..3e2a27a 100644
--- a/debian/marble.install
+++ b/debian/marble.install
@@ -1,5 +1,4 @@
 usr/bin/marble
-usr/bin/marble-touch
 usr/bin/routing-instructions
 usr/bin/tilecreator
 usr/lib/kde4/libmarble_part.so
diff --git a/debian/not-installed b/debian/not-installed
index bfc23a2..ff25838 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +1,16 @@
 # extra license file
 ./usr/share/kde4/apps/marble/data/LICENSE.txt
+
+# marble-touch
+./usr/bin/marble-touch
+./usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/FileDialog.qml
+./usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/FileOpenDialog.qml
+./usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/FileSaveDialog.qml
+./usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/MenuItemSwitch.qml
+./usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/RouteEditor.qml
+./usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/RoutingDialog.qml
+./usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/SearchField.qml
+./usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/SearchResultSelectionDialog.qml
+./usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/ViaPointEditor.qml
+./usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/libQtComponentsPlugin.so
+./usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/qmldir

-- 
marble packaging