Rik Mills has proposed merging ~acheron/kubuntu-packaging/+git/akonadi:kubuntu_xenial_backports into ~kubuntu-packagers/kubuntu-packaging/+git/akonadi:kubuntu_xenial_backports.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~acheron/kubuntu-packaging/+git/akonadi/+merge/299076 Moves binaries into correct packages, mirroring debian choices. Also drops breaks/replaces on libakonadi-kde4, as this causes knode and ktimetracker in debian and kgpg, calligra-libs and some other packages to not be installable in kubuntu. Ref: https://anonscm.debian.org/cgit/pkg-kde/applications/akonadi.git/commit/?id=0a9933f86814e1ddb3a3f7d68ca37498e9d7d3fa Should also be OK for yakkety AFAIK -- Your team Kubuntu Packagers is requested to review the proposed merge of ~acheron/kubuntu-packaging/+git/akonadi:kubuntu_xenial_backports into ~kubuntu-packagers/kubuntu-packaging/+git/akonadi:kubuntu_xenial_backports.
diff --git a/debian/akonadi-server.install b/debian/akonadi-server.install index 31d0234..e46b954 100644 --- a/debian/akonadi-server.install +++ b/debian/akonadi-server.install @@ -1,5 +1,12 @@ etc/xdg/akonadi.categories -usr/share/config.kcfg/resourcebase.kcfg +usr/bin/akonadi_agent_launcher +usr/bin/akonadi_agent_server +usr/bin/akonadi_control +usr/bin/akonadi_rds +usr/bin/akonadictl +usr/bin/akonadiserver +usr/bin/asapcat usr/share/dbus-1/services/org.freedesktop.Akonadi.Control.service -usr/share/kf5/akonadi/akonadi-xml.xsd usr/share/mime/packages/akonadi-mime.xml +usr/share/config.kcfg/resourcebase.kcfg +usr/share/kf5/akonadi/akonadi-xml.xsd diff --git a/debian/changelog b/debian/changelog index 25bce4d..26ab77c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,11 @@ akonadi (4:16.04.2-0ubuntu1) UNRELEASED; urgency=medium * Temporarily disabled patch * New upstream release (16.04.2) + [ Rik Mills ] + * Install binaries in correct packages + * Drop libakonadi-kde4 breaks/replaces - fixes installing kgpg + calligra-libs & other packages + -- Clive Johnston <[email protected]> Fri, 24 Jun 2016 22:09:13 +0100 akonadi (4:16.04.0-1~2.gbp37a307) UNRELEASED; urgency=medium diff --git a/debian/control b/debian/control index f024236..b010cef 100644 --- a/debian/control +++ b/debian/control @@ -47,8 +47,8 @@ Architecture: any Depends: akonadi-backend-mysql (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} -Breaks: kdepimlibs-data (<< 4:16.04), libakonadi-kde4 -Replaces: kdepimlibs-data (<< 4:16.04), libakonadi-kde4 +Breaks: kdepimlibs-data (<< 4:16.04) +Replaces: kdepimlibs-data (<< 4:16.04) Suggests: akonadi-backend-postgresql (= ${source:Version}), akonadi-backend-sqlite (= ${binary:Version}) Description: Akonadi PIM storage service diff --git a/debian/libkf5akonadi-dev-bin.install b/debian/libkf5akonadi-dev-bin.install index 2df4030..7648de0 100644 --- a/debian/libkf5akonadi-dev-bin.install +++ b/debian/libkf5akonadi-dev-bin.install @@ -1,8 +1,4 @@ -usr/bin/akonadi_agent_launcher -usr/bin/akonadi_control usr/bin/akonadi_knut_resource -usr/bin/akonadi_rds -usr/bin/akonadictl usr/lib/*/qt5/plugins/akonadi/akonadi_test_searchplugin.so usr/share/akonadi/agents/knutresource.desktop usr/share/kf5/akonadi_knut_resource/knut-template.xml diff --git a/debian/libkf5akonadiserver-dev.install b/debian/libkf5akonadiserver-dev.install index 4c827d3..8166459 100644 --- a/debian/libkf5akonadiserver-dev.install +++ b/debian/libkf5akonadiserver-dev.install @@ -1,5 +1,3 @@ -usr/bin/akonadi_agent_server -usr/bin/akonadiserver usr/include/KF5/akonadi/ usr/lib/*/libKF5AkonadiPrivate.so usr/share/dbus-1/interfaces/
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
