[SCM] marble packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-24-g18cb32c

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 18cb32c5bfc1723c0e8747d618dfdb88939b051e
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri May 15 19:37:52 2015 -0700

    wrap-and-sort
---
 debian/changelog         |  5 +++--
 debian/control           | 28 ++++++++++++++++------------
 debian/libastro1.install |  2 +-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a84998d..e9f3ebb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-marble (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
+marble (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Jonathan Riddell ]
   * Make kubuntu_disable-MarbleRunnerManagerTest.diff apply with policy
 
   [ Scarlett Clark ]
   * New upstream release
+  * wrap-and-sort 
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 15 Apr 2015 15:00:39 -0700
+ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 13 May 2015 22:59:57 -0700
 
 marble (4:14.12.3-0ubuntu2) vivid; urgency=medium
 
diff --git a/debian/control b/debian/control
index e2a6953..b281944 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends: cmake,
                libqtwebkit-dev,
                libquazip-dev,
                libshp-dev,
-               libx11-dev,
                libwlocate-dev,
+               libx11-dev,
                pkg-config,
                pkg-kde-tools (>= 0.12),
                qtmobility-dev [linux-any],
@@ -44,9 +44,11 @@ Description: globe and map widget
 Package: marble-mobile
 Architecture: any
 Section: misc
-Depends: ${shlibs:Depends}, ${misc:Depends}, marble-data (>= ${source:Version}),
- marble-plugins (= ${binary:Version})
-Suggests: libqt4-sql-sqlite, monav-routing-daemon, routino, gosmore
+Depends: marble-data (>= ${source:Version}),
+         marble-plugins (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Suggests: gosmore, libqt4-sql-sqlite, monav-routing-daemon, routino
 Breaks: marble (<< 4:4.13)
 Replaces: marble (<< 4:4.13)
 Description: globe and map widget for mobile form factors
@@ -60,7 +62,7 @@ Description: globe and map widget for mobile form factors
 Package: marble-qt
 Architecture: any
 Section: misc
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: marble (<< 4:4.13)
 Replaces: marble (<< 4:4.13)
 Description: globe and map widget (no KDE dependencies)
@@ -74,8 +76,10 @@ Description: globe and map widget (no KDE dependencies)
 Package: marble-touch
 Architecture: any
 Section: misc
-Depends: ${shlibs:Depends}, ${misc:Depends}, marble-data (>= ${source:Version}),
- marble-plugins (= ${binary:Version})
+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
@@ -106,7 +110,7 @@ Description: data files for Marble
 Package: marble-plugins
 Architecture: any
 Section: misc
-Depends: ${misc:Depends}, ${shlibs:Depends}, libwlocate0
+Depends: libwlocate0, ${misc:Depends}, ${shlibs:Depends}
 Replaces: libmarble4
 Breaks: libmarble4
 Description: plugins for Marble
@@ -138,7 +142,7 @@ Description: Marble globe widget library
 Package: libastro1
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, marble-data (>= ${source:Version})
+Depends: marble-data (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Marble astronomy library
  Marble is a generic geographical map widget and framework for KDE
  applications. The Marble widget shows the earth as a sphere but does not
@@ -152,8 +156,8 @@ Description: Marble astronomy library
 Package: libmarble-dev
 Architecture: any
 Section: libdevel
-Depends: libmarblewidget21 (= ${binary:Version}),
-         libastro-dev (= ${binary:Version}),
+Depends: libastro-dev (= ${binary:Version}),
+         libmarblewidget21 (= ${binary:Version}),
          ${misc:Depends},
          ${sameVersionDep:libqt4-dev:libmarblewidget21},
          ${shlibs:Depends}
@@ -171,7 +175,7 @@ Description: development files for the Marble globe widget library
 Package: libastro-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libastro1 (= ${binary:Version})
+Depends: libastro1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: development files for the Marble astrononmy library
  Marble is a generic geographical map widget and framework for KDE
  applications. The Marble widget shows the earth as a sphere but does not
diff --git a/debian/libastro1.install b/debian/libastro1.install
index 5384116..0e35fa7 100644
--- a/debian/libastro1.install
+++ b/debian/libastro1.install
@@ -1,2 +1,2 @@
-usr/lib/libastro.so.1
 usr/lib/libastro.so.0.*
+usr/lib/libastro.so.1

-- 
marble packaging