Merge lp:~panfaust/kubuntu-packaging-next/kactivities-work into lp:~kubuntu-packagers/kubuntu-packaging-next/kpty

[Jose Manuel Santamaria Lema]

Use Breaks instead of conflicts against libkactivities-bin.
According to debian's policy 7.4 "Normally, Breaks should be used
instead of Conflicts since Conflicts imposes a stronger restriction
on the ordering of package installation or upgrade and can make it
more difficult for the package manager to find a correct solution to
an upgrade or installation problem, Breaks should be used". This is
the case when upgrading from debian's kde metapackages such as kde-
standard or kde-full, so this change is needed to make the upgrades
from such metapackages work better.

Unmerged revisions

51. By Jose Manuel Santamaria Lema on 2014-07-31

Use breaks instead of conflicts.

50. By Jonathan Riddell on 2014-07-21

Update libraries *.install paths so a soname bump doesn't go unnoticed.

49. By Scarlett Gately Moore on 2014-07-18

Update extra-cmake-modules depend version

modified:
  debian/changelog
  debian/control

48. By Jonathan Riddell on 2014-07-17

these files are gpl 2

47. By Rohan Garg on 2014-07-15

releasing package kactivities-kf5 version 5.0.0-0ubuntu1

46. By Rohan Garg on 2014-07-15

Cleanup++

45. By Scarlett Gately Moore on 2014-07-08

fix watch

44. By Scarlett Gately Moore on 2014-07-08

fix watch, depends version, add VCS

43. By Jonathan Riddell on 2014-07-02

update .install files for new soversion

42. By Jonathan Riddell on 2014-07-01

Initial stable upstream release

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2014-07-31 17:34:35 +0000
@@ -0,0 +1,25 @@
+kactivities-kf5 (5.0.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Scarlett Clark ]
+  * Update extra-cmake-modules depend version 
+
+  [ José Manuel Santamaría Lema ]
+  * Update libraries *.install paths so a soname bump doesn't go
+    unnoticed.
+  * Use Breaks instead of conflicts against libkactivities-bin.
+    According to debian's policy 7.4 "Normally, Breaks should be used
+    instead of Conflicts since Conflicts imposes a stronger restriction
+    on the ordering of package installation or upgrade and can make it
+    more difficult for the package manager to find a correct solution to
+    an upgrade or installation problem, Breaks should be used". This is
+    the case when upgrading from debian's kde metapackages such as kde-
+    standard or kde-full, so this change is needed to make the upgrades
+    from such metapackages work better.
+
+ -- Scarlett Clark <[e-mail]>  Fri, 18 Jul 2014 07:24:35 -0700
+
+kactivities-kf5 (5.0.0-0ubuntu1) utopic; urgency=medium
+
+  * Initial stable upstream release
+
+ -- Jonathan Riddell <[e-mail]>  Tue, 15 Jul 2014 10:24:26 +0200

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2014-07-31 17:34:35 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2014-07-31 17:34:35 +0000
@@ -0,0 +1,57 @@
+Source: kactivities-kf5
+Section: libs
+Priority: optional
+Maintainer: Kubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jonathan Riddell <[e-mail]>
+Build-Depends: cmake,
+               debhelper (>= 9.0.0),
+               extra-cmake-modules (>= 1.0.0),
+               kio-dev (>= 5.0.0),
+               libboost-dev,
+               libkf5config-dev (>= 5.0.0),
+               libkf5coreaddons-dev (>= 5.0.0),
+               libkf5dbusaddons-dev (>= 5.0.0),
+               libkf5i18n-dev (>= 5.0.0),
+               libkf5kjs-dev (>= 5.0.0),
+               libkf5service-dev (>= 5.0.0),
+               libkf5windowsystem-dev (>= 5.0.0),
+               pkg-kde-tools,
+               qtbase5-dev,
+               qtdeclarative5-dev
+Standards-Version: 3.9.5
+Homepage: https://projects.kde.org/projects/kde/kdelibs/kactivities
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging-next/kactivities
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging-next/kactivities
+
+Package: libkf5activities-dev
+Section: libdevel
+Architecture: any
+Depends: libkf5activities5 (= ${binary:Version}), qtbase5-dev, ${misc:Depends}
+Description: development files for kactivities.
+ This library provides functionality for managing Activities.
+ .
+ Contains development files for kactivities.
+
+Package: libkf5activities5
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Library to organize the user work in separate activities.
+ This library provides functionality for managing Activities.
+
+Package: kactivities
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libkactivities-bin (<< 4:5.0.0)
+Description: Runtime to organize the user work in separate activities.
+ This library provides functionality for managing Activities.
+
+Package: libkf5activities5-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: libkf5activities5 (= ${binary:Version}), ${misc:Depends}
+Description: debug symbols for kactivities
+ This library provides functionality for managing Activities.
+ .
+ Contains debug symbols for kactivities.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2014-07-31 17:34:35 +0000
@@ -0,0 +1,88 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: kactivities
+Source: https://projects.kde.org/projects/frameworks/kactivities
+
+Files: *
+       debian/*
+Copyright: 2010-2013 Ivan Cukic <[e-mail]>
+           2012 Makis Marimpis <[e-mail]>
+           2008 Aaron Seigo <[e-mail]>
+           2012 Patrick von Reth <[e-mail]>
+           2014 Scarlett Clark <[e-mail]>
+License: GPL-2+
+ This package 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) any later version.
+ .
+ This package 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: src/lib/core/consumer.cpp
+       src/lib/core/consumer.h
+       src/lib/core/consumer_p.h
+       src/lib/core/controller.cpp
+       src/lib/core/controller.h
+       src/lib/core/dbusfuture_p.cpp
+       src/lib/core/info.cpp
+       src/lib/core/info.h
+       src/lib/core/info_p.h
+Copyright: 2010, 2011, 2012, 2013 Ivan Cukic <ivan.cukic(at)kde.org>
+License: LGPL-2
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU Library General
+ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+
+Files: src/imports/activitiesextensionplugin.cpp
+       src/imports/activitiesextensionplugin.h
+       src/lib/core/manager_p.cpp
+       src/lib/core/manager_p.h
+       src/lib/core/resourceinstance.h
+       src/lib/core/version.cpp
+       src/lib/core/version.h
+       src/lib/models/activitiescomponentplugin.cpp
+       src/lib/models/activitiescomponentplugin.h
+       src/lib/models/kactivities_models_export.h
+       src/utils/* excluding:
+Copyright: 2010, 2011, 2012 Ivan Cukic <ivan.cukic(at)kde.org>
+           2008 by Aaron Seigo <[e-mail]>
+            2012 Patrick von Reth <[e-mail]>
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU Library General
+ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".

=== added file 'debian/kactivities.install'
--- debian/kactivities.install	1970-01-01 00:00:00 +0000
+++ debian/kactivities.install	2014-07-31 17:34:35 +0000
@@ -0,0 +1,8 @@
+usr/bin/kactivitymanagerd
+usr/lib/*/qt5/plugins/kactivitymanagerd/kactivitymanagerd_plugin_activitytemplates.so
+usr/lib/*/qt5/plugins/kactivitymanagerd/kactivitymanagerd_plugin_slc.so
+usr/lib/*/qt5/plugins/kactivitymanagerd/kactivitymanagerd_plugin_sqlite.so
+usr/lib/*/qt5/qml/org/kde/activities/*
+usr/share/kservices5/kactivitymanagerd.desktop
+usr/share/kservicetypes5/kactivitymanagerd-plugin.desktop
+usr/share/locale/*/LC_MESSAGES/kactivities5.mo

=== added file 'debian/libkf5activities-dev.install'
--- debian/libkf5activities-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libkf5activities-dev.install	2014-07-31 17:34:35 +0000
@@ -0,0 +1,5 @@
+usr/include/KF5/
+usr/lib/*/cmake/KF5Activities/
+usr/lib/*/libKF5Activities.so
+usr/lib/*/pkgconfig/libKActivities.pc
+usr/lib/*/qt5/mkspecs/modules/*

=== added file 'debian/libkf5activities5.install'
--- debian/libkf5activities5.install	1970-01-01 00:00:00 +0000
+++ debian/libkf5activities5.install	2014-07-31 17:34:35 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5Activities.so.5
+usr/lib/*/libKF5Activities.so.5.*

=== added file 'debian/libkf5activities5.symbols'
--- debian/libkf5activities5.symbols	1970-01-01 00:00:00 +0000
+++ debian/libkf5activities5.symbols	2014-07-31 17:34:35 +0000
@@ -0,0 +1,112 @@
+# SymbolsHelper-Confirmed: 4.100.0 amd64
+libKF5Activities.so.5 libkf5activities5 #MINVER#
+ _ZN11KActivities10Controller11addActivityERK7QString@Base 4.96.0
+ _ZN11KActivities10Controller11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.96.0
+ _ZN11KActivities10Controller11qt_metacastEPKc@Base 4.96.0
+ _ZN11KActivities10Controller12stopActivityERK7QString@Base 4.96.0
+ _ZN11KActivities10Controller13startActivityERK7QString@Base 4.96.0
+ _ZN11KActivities10Controller14removeActivityERK7QString@Base 4.96.0
+ _ZN11KActivities10Controller15setActivityIconERK7QStringS3_@Base 4.96.0
+ _ZN11KActivities10Controller15setActivityNameERK7QStringS3_@Base 4.96.0
+ _ZN11KActivities10Controller16staticMetaObjectE@Base 4.96.0
+ _ZN11KActivities10Controller18setCurrentActivityERK7QString@Base 4.96.0
+ _ZN11KActivities10ControllerC1EP7QObject@Base 4.96.0
+ _ZN11KActivities10ControllerC2EP7QObject@Base 4.96.0
+ _ZN11KActivities10ControllerD0Ev@Base 4.96.0
+ _ZN11KActivities10ControllerD1Ev@Base 4.96.0
+ _ZN11KActivities10ControllerD2Ev@Base 4.96.0
+ _ZN11KActivities12versionMajorEv@Base 4.96.0
+ _ZN11KActivities12versionMinorEv@Base 4.96.0
+ _ZN11KActivities13versionStringEv@Base 4.96.0
+ _ZN11KActivities14versionReleaseEv@Base 4.96.0
+ _ZN11KActivities16ResourceInstance11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.96.0
+ _ZN11KActivities16ResourceInstance11qt_metacastEPKc@Base 4.96.0
+ _ZN11KActivities16ResourceInstance11setMimetypeERK7QString@Base 4.96.0
+ _ZN11KActivities16ResourceInstance13requestsFocusEv@Base 4.96.0
+ _ZN11KActivities16ResourceInstance14notifyAccessedERK4QUrlRK7QString@Base 4.96.0
+ _ZN11KActivities16ResourceInstance14notifyModifiedEv@Base 4.96.0
+ _ZN11KActivities16ResourceInstance15notifyFocusedInEv@Base 4.96.0
+ _ZN11KActivities16ResourceInstance16notifyFocusedOutEv@Base 4.96.0
+ _ZN11KActivities16ResourceInstance16staticMetaObjectE@Base 4.96.0
+ _ZN11KActivities16ResourceInstance6setUriERK4QUrl@Base 4.96.0
+ _ZN11KActivities16ResourceInstance8setTitleERK7QString@Base 4.96.0
+ (subst)_ZN11KActivities16ResourceInstanceC1E{quintptr}4QUrlRK7QStringS4_S4_P7QObject@Base 4.96.0
+ (subst)_ZN11KActivities16ResourceInstanceC1E{quintptr}P7QObject@Base 4.96.0
+ (subst)_ZN11KActivities16ResourceInstanceC1E{quintptr}RK7QStringP7QObject@Base 4.96.0
+ (subst)_ZN11KActivities16ResourceInstanceC2E{quintptr}4QUrlRK7QStringS4_S4_P7QObject@Base 4.96.0
+ (subst)_ZN11KActivities16ResourceInstanceC2E{quintptr}P7QObject@Base 4.96.0
+ (subst)_ZN11KActivities16ResourceInstanceC2E{quintptr}RK7QStringP7QObject@Base 4.96.0
+ _ZN11KActivities16ResourceInstanceD0Ev@Base 4.96.0
+ _ZN11KActivities16ResourceInstanceD1Ev@Base 4.96.0
+ _ZN11KActivities16ResourceInstanceD2Ev@Base 4.96.0
+ _ZN11KActivities4Info11iconChangedERK7QString@Base 4.96.0
+ _ZN11KActivities4Info11infoChangedEv@Base 4.96.0
+ _ZN11KActivities4Info11nameChangedERK7QString@Base 4.96.0
+ _ZN11KActivities4Info11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.96.0
+ _ZN11KActivities4Info11qt_metacastEPKc@Base 4.96.0
+ _ZN11KActivities4Info12stateChangedENS0_5StateE@Base 4.96.0
+ _ZN11KActivities4Info16staticMetaObjectE@Base 4.96.0
+ _ZN11KActivities4Info5addedEv@Base 4.96.0
+ _ZN11KActivities4Info7removedEv@Base 4.96.0
+ _ZN11KActivities4Info7startedEv@Base 4.96.0
+ _ZN11KActivities4Info7stoppedEv@Base 4.96.0
+ _ZN11KActivities4InfoC1ERK7QStringP7QObject@Base 4.96.0
+ _ZN11KActivities4InfoC2ERK7QStringP7QObject@Base 4.96.0
+ _ZN11KActivities4InfoD0Ev@Base 4.96.0
+ _ZN11KActivities4InfoD1Ev@Base 4.96.0
+ _ZN11KActivities4InfoD2Ev@Base 4.96.0
+ _ZN11KActivities7versionEv@Base 4.96.0
+ _ZN11KActivities8Consumer11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.96.0
+ _ZN11KActivities8Consumer11qt_metacastEPKc@Base 4.96.0
+ _ZN11KActivities8Consumer13activityAddedERK7QString@Base 4.96.0
+ _ZN11KActivities8Consumer13serviceStatusEv@Base 4.96.0
+ _ZN11KActivities8Consumer15activityRemovedERK7QString@Base 4.96.0
+ _ZN11KActivities8Consumer16staticMetaObjectE@Base 4.96.0
+ _ZN11KActivities8Consumer17activitiesChangedERK11QStringList@Base 4.96.0
+ _ZN11KActivities8Consumer20serviceStatusChangedENS0_13ServiceStatusE@Base 4.96.0
+ _ZN11KActivities8Consumer22currentActivityChangedERK7QString@Base 4.96.0
+ _ZN11KActivities8ConsumerC1EP7QObject@Base 4.96.0
+ _ZN11KActivities8ConsumerC2EP7QObject@Base 4.96.0
+ _ZN11KActivities8ConsumerD0Ev@Base 4.96.0
+ _ZN11KActivities8ConsumerD1Ev@Base 4.96.0
+ _ZN11KActivities8ConsumerD2Ev@Base 4.96.0
+ _ZNK11KActivities10Controller10metaObjectEv@Base 4.96.0
+ _ZNK11KActivities16ResourceInstance10metaObjectEv@Base 4.96.0
+ _ZNK11KActivities16ResourceInstance3uriEv@Base 4.96.0
+ _ZNK11KActivities16ResourceInstance5titleEv@Base 4.96.0
+ _ZNK11KActivities16ResourceInstance5winIdEv@Base 4.96.0
+ _ZNK11KActivities16ResourceInstance8mimetypeEv@Base 4.96.0
+ _ZNK11KActivities4Info10metaObjectEv@Base 4.96.0
+ _ZNK11KActivities4Info12availabilityEv@Base 4.96.0
+ _ZNK11KActivities4Info2idEv@Base 4.96.0
+ _ZNK11KActivities4Info3uriEv@Base 4.96.0
+ _ZNK11KActivities4Info4iconEv@Base 4.96.0
+ _ZNK11KActivities4Info4nameEv@Base 4.96.0
+ _ZNK11KActivities4Info5stateEv@Base 4.96.0
+ _ZNK11KActivities4Info7isValidEv@Base 4.96.0
+ _ZNK11KActivities8Consumer10activitiesENS_4Info5StateE@Base 4.96.0
+ _ZNK11KActivities8Consumer10activitiesEv@Base 4.96.0
+ _ZNK11KActivities8Consumer10metaObjectEv@Base 4.96.0
+ _ZNK11KActivities8Consumer15currentActivityEv@Base 4.96.0
+ (optional=templinst)_ZNKSt8functionIFvvEEclEv@Base 4.97.0
+ (optional=templinst)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv@Base 4.98.0
+ (optional=templinst)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev@Base 4.98.0
+ (optional=templinst)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED1Ev@Base 4.98.0
+ (optional=templinst)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev@Base 4.98.0
+ _ZTIN11KActivities10ControllerE@Base 4.96.0
+ _ZTIN11KActivities16ResourceInstanceE@Base 4.96.0
+ _ZTIN11KActivities4InfoE@Base 4.96.0
+ _ZTIN11KActivities8ConsumerE@Base 4.96.0
+ _ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.98.0
+ _ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.98.0
+ _ZTSN11KActivities10ControllerE@Base 4.96.0
+ _ZTSN11KActivities16ResourceInstanceE@Base 4.96.0
+ _ZTSN11KActivities4InfoE@Base 4.96.0
+ _ZTSN11KActivities8ConsumerE@Base 4.96.0
+ _ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.98.0
+ _ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.98.0
+ _ZTVN11KActivities10ControllerE@Base 4.96.0
+ _ZTVN11KActivities16ResourceInstanceE@Base 4.96.0
+ _ZTVN11KActivities4InfoE@Base 4.96.0
+ _ZTVN11KActivities8ConsumerE@Base 4.96.0
+ _ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.98.0

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2014-07-31 17:34:35 +0000
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+
+override_dh_strip:
+	$(overridden_command) --dbg-package=libkf5activities5-dbg

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2014-07-31 17:34:35 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== added file 'debian/source/include-binaries'
--- debian/source/include-binaries	1970-01-01 00:00:00 +0000
+++ debian/source/include-binaries	2014-07-31 17:34:35 +0000
@@ -0,0 +1,4 @@
+obj-x86_64-linux-gnu/CMakeFiles/2.8.12.1/CMakeDetermineCompilerABI_C.bin
+obj-x86_64-linux-gnu/CMakeFiles/2.8.12.1/CMakeDetermineCompilerABI_CXX.bin
+obj-x86_64-linux-gnu/CMakeFiles/2.8.12.1/CompilerIdC/a.out
+obj-x86_64-linux-gnu/CMakeFiles/2.8.12.1/CompilerIdCXX/a.out

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2014-07-31 17:34:35 +0000
@@ -0,0 +1,4 @@
+version=3
+http://download.kde.org/unstable/frameworks/([\d\.]*)/kactivities-(.*)\.tar\.xz
+
+http://download.kde.org/stable/frameworks/([\d\.]*)/kactivities-(.*)\.tar\.xz
\ No newline at end of file