[SCM] marble packaging branch, kubuntu_unstable, updated. ubuntu/15.08.0-0ubuntu4-11-gc5615d6

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable branch:
commit c5615d60b1debe15c3255cd23085e4b174c32690
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Sep 14 17:01:23 2015 +0100

    update to master and add marble-maps package
---
 debian/changelog              |  6 ++++++
 debian/control                | 21 +--------------------
 debian/marble-maps.install    |  2 ++
 debian/marble-mobile.install  |  2 --
 debian/marble-plugins.install |  1 +
 debian/marble-qt.install      |  2 ++
 debian/marble-touch.install   |  2 --
 debian/rules                  |  1 +
 8 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3a7372..25315f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+marble (4:15.11.80-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Build with MARBLE_INSTALL_ANDROID_APPS
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 14 Sep 2015 13:20:57 +0100
+
 marble (4:15.08.0-0ubuntu5) wily; urgency=medium
 
   * Add libqt5extserialport-dev build-depends
diff --git a/debian/control b/debian/control
index 1be19cb..7b9eb8b 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,7 @@ Description: globe and map widget
  .
  This package is part of the KDE education module.
 
-Package: marble-mobile
+Package: marble-maps
 Architecture: any
 Section: misc
 Depends: marble-data (>= ${source:Version}),
@@ -84,25 +84,6 @@ Description: globe and map widget (no KDE dependencies)
  .
  This package is part of the KDE education module.
 
-Package: marble-touch
-Architecture: any
-Section: misc
-Depends: marble-data (>= ${source:Version}),
-         marble-plugins (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: marble (<< 4:4.13)
-Replaces: marble (<< 4:4.13)
-Description: globe and map widget for tablets
- Marble is a generic geographical map widget and framework for KDE
- applications. The Marble widget shows the earth as a sphere but does not
- require hardware acceleration.  A minimal set of geographical data is
- included, so it can be used without an internet connection.
- .
- This versions of marble is designed for use on tablet computers.
- .
- This package is part of the KDE education module.
-
 Package: marble-data
 Architecture: all
 Section: misc
diff --git a/debian/marble-maps.install b/debian/marble-maps.install
new file mode 100644
index 0000000..e150cd5
--- /dev/null
+++ b/debian/marble-maps.install
@@ -0,0 +1,2 @@
+usr/bin/marble-maps
+usr/share/applications/org.kde.marble.maps.desktop
diff --git a/debian/marble-mobile.install b/debian/marble-mobile.install
deleted file mode 100644
index 910d579..0000000
--- a/debian/marble-mobile.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/marble-mobile
-usr/share/applications/marble-mobile.desktop
diff --git a/debian/marble-plugins.install b/debian/marble-plugins.install
index 4ef5c20..1b72f2c 100644
--- a/debian/marble-plugins.install
+++ b/debian/marble-plugins.install
@@ -1 +1,2 @@
+usr/lib/*/libmarbledeclarative.so
 usr/lib/*/marble/plugins/lib*
diff --git a/debian/marble-qt.install b/debian/marble-qt.install
new file mode 100644
index 0000000..d8dbd44
--- /dev/null
+++ b/debian/marble-qt.install
@@ -0,0 +1,2 @@
+usr/bin/marble-qt
+usr/share/applications/marble-qt.desktop
diff --git a/debian/marble-touch.install b/debian/marble-touch.install
deleted file mode 100644
index c8da4d4..0000000
--- a/debian/marble-touch.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/marble-touch
-usr/share/applications/marble-touch.desktop
diff --git a/debian/rules b/debian/rules
index d84a8fa..7b14a0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ endif
 override_dh_auto_configure:
 	$(overridden_command) -- -DWITH_DESIGNER_PLUGIN=ON \
 				 -DWITH_KF5=TRUE \
+				 -DMARBLE_INSTALL_ANDROID_APPS=ON \
 				 $(conf_args)
 
 override_dh_auto_build:

-- 
marble packaging