diff -Nru marble-qt4-4.14.2/debian/changelog marble-qt4-4.14.2/debian/changelog --- marble-qt4-4.14.2/debian/changelog 2016-08-21 09:49:40.000000000 +0000 +++ marble-qt4-4.14.2/debian/changelog 2016-08-21 15:05:48.000000000 +0000 @@ -1,3 +1,15 @@ +marble-qt4 (4:4.14.2-1ubuntu0~ppa10) xenial; urgency=medium + + * Use conflicts instead of breaks for the QT5 packages. + + -- Dominik Stadler (Ubuntu key) Sun, 21 Aug 2016 17:05:24 +0200 + +marble-qt4 (4:4.14.2-1ubuntu0~ppa9) xenial; urgency=medium + + * Add dependency on libwlocate-dev. + + -- Dominik Stadler (Ubuntu key) Sun, 21 Aug 2016 15:50:57 +0200 + marble-qt4 (4:4.14.2-1ubuntu0~ppa8) xenial; urgency=medium * Try to fix invalid dependency on libastro1. diff -Nru marble-qt4-4.14.2/debian/control marble-qt4-4.14.2/debian/control --- marble-qt4-4.14.2/debian/control 2016-08-20 13:05:15.000000000 +0000 +++ marble-qt4-4.14.2/debian/control 2016-08-21 15:05:07.000000000 +0000 @@ -8,6 +8,7 @@ kde-sc-dev-latest (>= 4:4.12), kdelibs5-dev (>= 4:4.11), libgps-dev (>= 2.90), + libwlocate-dev, libphonon-dev, libqtwebkit-dev, libquazip-dev, @@ -30,7 +31,7 @@ ${misc:Depends}, ${shlibs:Depends} Suggests: gosmore, libqt4-sql-sqlite, monav-routing-daemon, routino -Breaks: marble +Conflicts: marble Description: globe and map widget Marble is a generic geographical map widget and framework for KDE applications. The Marble widget shows the earth as a sphere but does not @@ -59,7 +60,8 @@ Architecture: any Section: misc Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: marble (<< 4:4.13), marble-qt +Breaks: marble (<< 4:4.13) +Conflicts: marble-qt Replaces: marble (<< 4:4.13), marble-qt Description: globe and map widget (no KDE dependencies) Marble is a generic geographical map widget and framework for KDE @@ -74,7 +76,8 @@ Section: misc Depends: ${shlibs:Depends}, ${misc:Depends}, marble-data-qt4 (>= ${source:Version}), marble-plugins-qt4 (= ${binary:Version}) -Breaks: marble (<< 4:4.13), marble-touch +Breaks: marble (<< 4:4.13) +Conflicts: marble-touch Replaces: marble (<< 4:4.13), marble-touch Description: globe and map widget for tablets Marble is a generic geographical map widget and framework for KDE @@ -90,7 +93,7 @@ Architecture: all Section: misc Depends: ${misc:Depends} -Breaks: marble-data +Conflicts: marble-data Description: data files for Marble Marble is a generic geographical map widget and framework for KDE applications. The Marble widget shows the earth as a sphere but does not @@ -107,7 +110,8 @@ Section: misc Depends: ${misc:Depends}, ${shlibs:Depends} Replaces: libmarble4, marble-plugins -Breaks: libmarble4, marble-plugins +Breaks: libmarble4 +Conflicts: marble-plugins Description: plugins for Marble Marble is a generic geographical map widget and framework for KDE applications. The Marble widget shows the earth as a sphere but does not @@ -138,7 +142,7 @@ Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, marble-data-qt4 (>= ${source:Version}) -Breaks: libastro1 +Conflicts: libastro1 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 @@ -157,7 +161,7 @@ ${misc:Depends}, ${sameVersionDep:libqt4-dev:libmarblewidget19}, ${shlibs:Depends} -Breaks: libmarble-dev +Conflicts: libmarble-dev Description: development files for the Marble globe widget 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 @@ -173,7 +177,7 @@ Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, libastro1-qt4 (= ${binary:Version}) -Breaks: libastro-dev +Conflicts: libastro-dev 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 @@ -190,7 +194,8 @@ Section: debug Priority: extra Depends: marble-qt4 (= ${binary:Version}), ${misc:Depends} -Breaks: kdeedu-dbg (<< 4:4.6.80), marble-dbg +Breaks: kdeedu-dbg (<< 4:4.6.80) +Conflicts: marble-dbg Replaces: kdeedu-dbg (<< 4:4.6.80), marble-dbg Description: debugging symbols for the KDE education module Marble is a generic geographical map widget and framework for KDE