Walter Lapchynski has proposed merging ~wxl/kubuntu-packaging/+git/kactivitymanagerd:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/discover:kubuntu_unstable.
Requested reviews: Simon Quigley (tsimonq2) For more details, see: https://code.launchpad.net/~wxl/kubuntu-packaging/+git/kactivitymanagerd/+merge/310608 Merge kubuntu_zesty_archive into kubuntu_unstable, fixing http://kci.pangea.pub/job/merger_kactivitymanagerd/257/consoleFull Just needed to do a wee switcheroo on one of José's bulletpoints in the changelog. -- Your team Kubuntu Packagers is subscribed to branch ~kubuntu-packagers/kubuntu-packaging/+git/discover:kubuntu_unstable.
diff --git a/debian/changelog b/debian/changelog index 73b0887..b86f51f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,4 @@ +<<<<<<< debian/changelog plasma-discover (5.8.3-0ubuntu1) UNRELEASED; urgency=medium [ José Manuel Santamaría Lema ] @@ -10,12 +11,21 @@ plasma-discover (5.8.3-0ubuntu1) UNRELEASED; urgency=medium [ Rik Mills ] * Update deps for qml-module-org-kde-kirigami and kirigami-dev +======= +kactivitymanagerd (5.8.3-0ubuntu1) UNRELEASED; urgency=medium + + [ José Manuel Santamaría Lema ] + * Adding lintian overrides + * Update Vcs-Git fields to use https:// instead of git:// + +>>>>>>> debian/changelog [ Simon Quigley ] * New upstream release (5.8.3) * New upstream release (5.8.3) -- José Manuel Santamaría Lema <[email protected]> Sat, 29 Oct 2016 16:48:38 +0200 +<<<<<<< debian/changelog plasma-discover (5.7.5-0ubuntu2) yakkety; urgency=medium * plasma-discover now Conflicts against python3-aptdaemon.pkcompat, without @@ -206,3 +216,42 @@ plasma-discover (5.5.95-1) experimental; urgency=medium * Update debian/copyright -- Matthias Klumpp <[email protected]> Sat, 12 Mar 2016 16:45:56 +0100 +======= +kactivitymanagerd (5.7.5-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.7.4) + * New upstream release (5.7.5) + + -- Rik Mills <[email protected]> Tue, 20 Sep 2016 20:25:23 -0500 + +kactivitymanagerd (5.7.2-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.7.1) + * New upstream release (5.7.2) + + -- Clive Johnston <[email protected]> Thu, 28 Jul 2016 12:03:57 +0000 + +kactivitymanagerd (5.6.5-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.6.5) + + -- Clive Johnston <[email protected]> Fri, 15 Jul 2016 20:42:52 +0100 + +kactivitymanagerd (5.6.4-0ubuntu1) yakkety; urgency=medium + + [ Jonathan Riddell ] + * Initial package + + [ Scarlett Clark ] + * Add missing depend to libboost. + + [ Maximiliano Curia ] + * New upstream release (5.6.2). + * Bump Standards-Version to 3.9.7, no changes needed. + + [ Clive Johnston ] + * New upstream release (5.6.3) + * New upstream release (5.6.4) + + -- Clive Johnston <[email protected]> Wed, 18 May 2016 13:14:00 -0700 +>>>>>>> debian/changelog diff --git a/debian/control b/debian/control index 0601d4c..ede83a2 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,22 @@ +<<<<<<< debian/control Source: plasma-discover Section: kde Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Maintainers <[email protected]> Uploaders: Maximiliano Curia <[email protected]>, Matthias Klumpp <[email protected]> +======= +Source: kactivitymanagerd +Section: kde +Priority: optional +Maintainer: Debian/Kubuntu Qt/KDE Maintainers <[email protected]> +Uploaders: Maximiliano Curia <[email protected]> +>>>>>>> debian/control Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), extra-cmake-modules (>= 5.24.0~), kio-dev (>= 5.24.0~), +<<<<<<< debian/control kirigami-dev, libappstreamqt-dev (>= 0.10), libdebconf-kde-dev (>= 1.0.0), @@ -122,3 +131,29 @@ Depends: plasma-discover, ${misc:Depends} Description: Transitional package (muon-notifier -> plasma-discover) This is a transitional package updating muon-notifier to plasma-discover and can safely be removed. +======= + libboost-dev (>= 1.49~), + libkf5config-dev (>= 5.24.0~), + libkf5coreaddons-dev (>= 5.24.0~), + libkf5dbusaddons-dev (>= 5.24.0~), + libkf5globalaccel-dev (>= 5.24.0~), + libkf5i18n-dev (>= 5.24.0~), + libkf5service-dev (>= 5.24.0~), + libkf5windowsystem-dev (>= 5.24.0~), + libkf5xmlgui-dev (>= 5.24.0~), + pkg-kde-tools (>= 0.15.18~), + qtbase5-dev (>= 5.6.1~) +Standards-Version: 3.9.7 +Homepage: https://projects.kde.org/projects/kde/workspace/kactivitymanagerd +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kactivitymanagerd +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kactivitymanagerd + +Package: kactivitymanagerd +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Breaks: kactivities (<< 5.20~) +Replaces: kactivities (<< 5.20~) +Description: System service to manage user's activities + System service to manage user's activities, track the usage patterns + etc. +>>>>>>> debian/control diff --git a/debian/copyright b/debian/copyright index a10d776..0d5fe92 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,4 @@ +<<<<<<< debian/copyright Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: discover Upstream-Contact: Aleix Pol Gonzalez <[email protected]> @@ -36,17 +37,76 @@ License: LGPL-2.1+ it under the terms of the GNU Lesser General Public License version 2.1, or (at your option) any later version, as published by the Free Software Foundation +======= +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: kactivitymanagerd +Source: https://projects.kde.org/projects/kde/workspace/kactivitymanagerd + +Files: * +Copyright: 2010-2016 Ivan Cukic <[email protected]> +License: GPL-2+3+KDEeV + +Files: po/ca/kactivities5.po + po/ca@valencia/kactivities5.po + po/uk/kactivities5.po +Copyright: 2011-2016, This_file_is_part_of_KDE +License: LGPL-2.1+3+KDEeV + +Files: COPYING.GPL2 + src/service/plugins/activitytemplates/TemplatesPlugin.cpp + src/service/plugins/activitytemplates/TemplatesPlugin.h + src/service/plugins/eventspy/EventSpy.cpp + src/service/plugins/eventspy/EventSpy.h + src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp + src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.h + src/service/plugins/runapplication/RunApplicationPlugin.cpp + src/service/plugins/runapplication/RunApplicationPlugin.h + src/service/plugins/slc/SlcPlugin.cpp + src/service/plugins/slc/SlcPlugin.h + src/service/plugins/sqlite/Database.cpp + src/service/plugins/sqlite/Database.h + src/service/plugins/sqlite/ResourceLinking.cpp + src/service/plugins/sqlite/ResourceLinking.h + src/service/plugins/sqlite/ResourceScoreCache.cpp + src/service/plugins/sqlite/ResourceScoreCache.h + src/service/plugins/sqlite/ResourceScoreMaintainer.cpp + src/service/plugins/sqlite/ResourceScoreMaintainer.h + src/service/plugins/sqlite/StatsPlugin.cpp + src/service/plugins/sqlite/StatsPlugin.h + src/service/plugins/sqlite/Utils.h + src/service/plugins/virtualdesktopswitch/VirtualDesktopSwitchPlugin.cpp + src/service/plugins/virtualdesktopswitch/VirtualDesktopSwitchPlugin.h +Copyright: 1989-1991, Free Software Foundation, Inc + 2011-2015, Ivan Cukic <[email protected]> + 2012, Makis Marimpis <[email protected]> +License: GPL-2+ + +Files: debian/* + 2016 Jonathan Riddell <[email protected]> +License: LGPL-2.1+3+KDEeV + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2, + or (at your option) any later version, as published by the Free + Software Foundation +>>>>>>> debian/copyright . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details . +<<<<<<< debian/copyright You should have received a copy of the GNU Lesser General Public +======= + You should have received a copy of the GNU General Public +>>>>>>> debian/copyright License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. . +<<<<<<< debian/copyright On Debian systems, the full text of the GNU Lesser General Public License version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1`. @@ -172,10 +232,53 @@ License: GPL-3+ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +======= + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +License: GPL-2+3+KDEeV + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + The complete text of the GNU General Public License + version 2 can be found in `/usr/share/common-licenses/GPL-2', likewise, + the complete text fo the GNU General Public License version 3 can be + found in `/usr/share/common-licenses/GPL-3'. + +License: LGPL-2.1+3+KDEeV + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +>>>>>>> debian/copyright GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. . +<<<<<<< debian/copyright On Debian systems, the full text of the GNU General Public License version 3 can be found in the file `/usr/share/common-licenses/GPL-3'. +======= + On Debian systems, the complete text of the GNU Lesser General Public License + version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1', likewise, + the complete text fo the GNU Lesser General Public License version 3 can be + found in `/usr/share/common-licenses/LGPL-3'. +>>>>>>> debian/copyright diff --git a/debian/kactivitymanagerd.install b/debian/kactivitymanagerd.install new file mode 100644 index 0000000..73752c9 --- /dev/null +++ b/debian/kactivitymanagerd.install @@ -0,0 +1 @@ +usr diff --git a/debian/kactivitymanagerd.lintian-overrides b/debian/kactivitymanagerd.lintian-overrides new file mode 100644 index 0000000..59ebf6e --- /dev/null +++ b/debian/kactivitymanagerd.lintian-overrides @@ -0,0 +1,5 @@ +kactivitymanagerd: package-must-activate-ldconfig-trigger usr/lib/*/libkactivitymanagerd_plugin.so +kactivitymanagerd: postinst-must-call-ldconfig usr/lib/*/libkactivitymanagerd_plugin.so +kactivitymanagerd: package-name-doesnt-match-sonames libkactivitymanagerd-plugin +kactivitymanagerd: shlib-without-versioned-soname usr/lib/*/libkactivitymanagerd_plugin.so libkactivitymanagerd_plugin.so + diff --git a/debian/rules b/debian/rules index cee5eee..1f95f52 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,5 @@ #!/usr/bin/make -f +<<<<<<< debian/rules include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk @@ -23,3 +24,11 @@ override_dh_gencontrol: # FIXME: tests are broken at time override_dh_auto_test: : +======= +# -*- makefile -*- + +include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk + +override_dh_auto_install: + $(overridden_command) --destdir=debian/tmp +>>>>>>> debian/rules diff --git a/debian/upstream/metadata b/debian/upstream/metadata index acc3400..06c2ed5 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,7 +1,16 @@ +<<<<<<< debian/upstream/metadata Name: plasma-discover Changelog: https://quickgit.kde.org/?p=discover.git&a=log Contact: [email protected] Donation: https://www.kde.org/community/donations/index.php Repository: https://anongit.kde.org/discover.git Repository-Browse: https://quickgit.kde.org/?p=discover.git +======= +Name: kactivitymanagerd +Changelog: https://quickgit.kde.org/?p=kactivitymanagerd.git&a=log +Contact: [email protected] +Donation: https://www.kde.org/community/donations/index.php +Repository: https://anongit.kde.org/kactivitymanagerd.git +Repository-Browse: https://quickgit.kde.org/?p=kactivitymanagerd.git +>>>>>>> debian/upstream/metadata Security-Contact: [email protected] diff --git a/debian/watch b/debian/watch index 78e12c6..34e6b0f 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,6 @@ version=3 +<<<<<<< debian/watch http://download.kde.org/stable/plasma/([\d.]+)/discover-([\d.]+)\.tar\.xz +======= +http://download.kde.org/stable/plasma/([\d.]+)/kactivitymanagerd-([\d.]+)\.tar\.xz +>>>>>>> debian/watch
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
