[SCM] marble packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-37-gf731dac

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit f731dac96298c40dcb9ee07d4da26d64e8e5b860
Author: Philip Muškovac <yofel at gmx.net>
Date:   Sun Aug 16 15:05:29 2015 +0200

    drop marble-qt now that we have a kf5 build
---
 debian/control           | 12 ++++--------
 debian/marble-qt.install |  2 --
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index e587192..13be91c 100644
--- a/debian/control
+++ b/debian/control
@@ -66,14 +66,10 @@ Description: globe and map widget for mobile form factors
 Package: marble-qt
 Architecture: any
 Section: misc
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: marble (<< 4:4.13)
-Replaces: marble (<< 4:4.13)
-Description: globe and map widget (no KDE dependencies)
- 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.
+Depends: ${misc:Depends}, marble (>= 4:15.07.90~)
+Description: transitional package for marble kf5
+ This is a dummy transitional package for marble and can be safely
+ removed after the installation is complete.
  .
  This package is part of the KDE education module.
 
diff --git a/debian/marble-qt.install b/debian/marble-qt.install
deleted file mode 100644
index 746557d..0000000
--- a/debian/marble-qt.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/marble-qt
-usr/share/applications/kde4/marble-qt.desktop

-- 
marble packaging