[SCM] marble packaging branch, master, updated. debian/4.14.2-1-21-gbad9522

Maximiliano Curia maxy at moszumanska.debian.org
Thu Mar 26 19:53:51 UTC 2015


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

The following commit has been merged in the master branch:
commit 2952dd21b72492e07ca888d53f4eaafe7673524a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 13:50:16 2015 +0100

    Update build-deps and deps with the info from cmake
---
 debian/control | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 2e167e1..99130ac 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake,
+Build-Depends: cmake (>= 2.4.8~),
                debhelper (>= 9),
                kde-sc-dev-latest (>= 4:4.12),
                kdelibs5-dev,
@@ -16,7 +16,11 @@ Build-Depends: cmake,
                libx11-dev,
                pkg-config,
                pkg-kde-tools (>= 0.12),
+               qtbase5-dev,
+               qtdeclarative5-dev,
                qtmobility-dev [linux-any],
+               qtscript5-dev,
+               qttools5-dev,
                shared-mime-info
 Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest
@@ -43,9 +47,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
@@ -59,7 +65,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)
@@ -73,8 +79,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
@@ -137,7 +145,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
@@ -151,8 +159,8 @@ Description: Marble astronomy library
 Package: libmarble-dev
 Architecture: any
 Section: libdevel
-Depends: libmarblewidget20 (= ${binary:Version}),
-         libastro-dev (= ${binary:Version}),
+Depends: libastro-dev (= ${binary:Version}),
+         libmarblewidget20 (= ${binary:Version}),
          ${misc:Depends},
          ${sameVersionDep:libqt4-dev:libmarblewidget20},
          ${shlibs:Depends}
@@ -170,7 +178,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

-- 
marble packaging



More information about the pkg-kde-commits mailing list