[SCM] kactivities packaging branch, master, updated. debian/4.13.1-1-128-gfafc380
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 31 14:31:03 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kactivities.git;a=commitdiff;h=cf00b1c
The following commit has been merged in the master branch:
commit cf00b1c4ffe8eb11ce95aac6c795ae2b6fd46e80
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date: Thu May 16 12:30:58 2013 +0000
merge
---
debian/changelog | 71 +++++++++++++++++++++++++++++++++++
debian/control | 31 ++++++++-------
debian/libkactivities-bin.install | 16 ++++----
debian/libkactivities-dev.install | 14 +++----
debian/libkactivities-models1.install | 2 +-
debian/libkactivities6.install | 2 +-
debian/rules | 2 +
7 files changed, 108 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dfeca99..57b9c9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+kactivities (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+ * New upstream release
+ * Merge with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 08 May 2013 16:08:38 +0000
+
+kactivities (4:4.10.2-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Add myself to Uploaders.
+
+ [ Sune Vuorela ]
+ * Add myself to uploaders
+
+ [ Daniele E. Domenichelli ]
+ * Update build dependencies:
+ + Bump kdelibs5-dev to 4:4.10.
+ + Add libx11-dev.
+ + Add libqt4-opengl-dev.
+ * Update installed files.
+ * Update symbols.
+
+ [ José Manuel Santamaría Lema ]
+ * Bump kde-sc-dev-latest build dependency to 4:4.10.1.
+ * Build depend on nepomuk-core-dev >= 4:4.10.
+ * In order to avoid a circular dependency between libkactivities-bin and
+ libkactivities6 (this didn't happen in 4.8.x):
+ + libkactivities6.symbols adds a dependency on libkactivities-bin (and added
+ a lintian override for symbols-declares-dependency-on-other-package).
+ + libkactivities6 recommends libkactivities-bin to avoid possible partial
+ upgrades problems.
+ * Add libkactivities-models1 package.
+ * Use ${allLibraries} variables for libkactivities-dev and libkactivities-dbg
+ depends.
+ * Bump build dependency on pkg-kde-tools to 0.15.4~, because previous releases
+ wouldn't filter out libkactivities-dbg from ${allLibraries}.
+ * Update installed files.
+ * Update symbols files.
+
+ -- Sune Vuorela <sune at debian.org> Wed, 03 Apr 2013 06:19:29 +0000
+
kactivities (4:4.10.2-0ubuntu1) raring; urgency=low
* New upstream bugfix release
@@ -111,6 +155,33 @@ kactivities (4:4.8.80a-0ubuntu1) quantal; urgency=low
-- Jonathan Thomas <echidnaman at kubuntu.org> Thu, 24 May 2012 23:34:02 -0400
+kactivities (4:4.8.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * Team upload.
+
+ [ José Manuel Santamaría Lema ]
+ * Add myself to Uploaders.
+ * Add watch file.
+
+ [ José Manuel Santamaría Lema ]
+ * Bump kde-sc-dev-latest build dependency to 4:4.8.4.
+
+ -- Modestas Vainius <modax at debian.org> Sat, 09 Jun 2012 15:42:48 +0300
+
+kactivities (4:4.8.3-1) experimental; urgency=low
+
+ * Team upload.
+
+ [ Eshat Cakar ]
+ * New upstream release, start from kubuntu packaging, thanks!
+ * Bump kdelibs5-dev depends to 4.8.
+
+ [ José Manuel Santamaría Lema ]
+ * Bump kde-sc-dev-latest build dependency to 4:4.8.3.
+
+ -- Modestas Vainius <modax at debian.org> Sat, 26 May 2012 20:37:00 +0300
+
kactivities (4:4.8.3-0ubuntu1) quantal; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index a3d2846..442c4fe 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,23 @@ Section: kde
Priority: optional
Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Eshat Cakar <info at eshat.de>
-Build-Depends:
- cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- libx11-dev,
- libqt4-opengl-dev,
- kdelibs5-dev (>= 4:4.10.2),
+Uploaders: Eshat Cakar <info at eshat.de>,
+ José Manuel Santamaría Lema <panfaust at gmail.com>,
+ Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
+ Sune Vuorela <sune at debian.org>
+Build-Depends: kde-sc-dev-latest (>= 4:4.10.1),
+ cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.15.4~),
+ kdelibs5-dev (>= 4:4.10), nepomuk-core-dev (>= 4:4.10),
libsoprano-dev,
- nepomuk-core-dev (>= 4:4.10.2),
- shared-desktop-ontologies (>= 0.8.1)
+ shared-desktop-ontologies (>= 0.8.1),
+ libx11-dev,
+ libqt4-opengl-dev
Standards-Version: 3.9.3
Homepage: http://www.kde.org/
Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kactivities
Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kactivities
+X-Vcs-Debian-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kactivities.git
+X-Vcs-Debian-Git: git://git.debian.org/pkg-kde/kde-sc/kactivities.git
Package: libkactivities-bin
Architecture: any
@@ -32,7 +36,8 @@ Description: executables for the KDE Activities
Package: libkactivities6
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libkactivities-bin (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: libkactivities-bin (= ${binary:Version})
Description: Activities library
This library provides functionality for managing activities.
.
@@ -41,16 +46,16 @@ Description: Activities library
Package: libkactivities-models1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libkactivities-bin (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Activities models library
- This library provides functionality for KDE activity models.
+ This library provides functionality for KDE activities models.
.
This package is part of the KDE Development Platform libraries module.
Package: libkactivities-dev
Section: libdevel
Architecture: any
-Depends: libkactivities6 (= ${binary:Version}), ${misc:Depends},
+Depends: ${allLibraries}, ${misc:Depends},
${sameVersionDep:kdelibs5-dev:libkactivities6}
Description: development files for the KDE Activities libraries
This package contains the development files for developing with the
@@ -62,7 +67,7 @@ Package: libkactivities-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: ${misc:Depends}, libkactivities6 (= ${binary:Version})
+Depends: ${allLibraries}, ${misc:Depends}
Breaks: kde-runtime-dbg (<< 4:4.8), kdebase-runtime-dbg (<< 4:4.8)
Replaces: kde-runtime-dbg (<< 4:4.8), kdebase-runtime-dbg (<< 4:4.8)
Suggests: libkactivities-bin (= ${binary:Version})
diff --git a/debian/libkactivities-bin.install b/debian/libkactivities-bin.install
index 9b420ce..87ddd4e 100644
--- a/debian/libkactivities-bin.install
+++ b/debian/libkactivities-bin.install
@@ -1,32 +1,32 @@
usr/bin/kactivitymanagerd
+usr/lib/kde4/activitymanager_plugin_activityranking.so
usr/lib/kde4/activitymanager_plugin_globalshortcuts.so
usr/lib/kde4/activitymanager_plugin_slc.so
usr/lib/kde4/activitymanager_plugin_sqlite.so
+usr/lib/kde4/activitymanager_plugin_virtualdesktopswitch.so
usr/lib/kde4/activitymanager_uihandler_declarative.so
usr/lib/kde4/activitymanager_uihandler_kdialog.so
-usr/lib/kde4/activitymanager_plugin_virtualdesktopswitch.so
usr/lib/kde4/imports/org/kde/activities/models/libkactivities-models-component-plugin.so
usr/lib/kde4/imports/org/kde/activities/models/qmldir
usr/lib/kde4/kactivitymanagerd_fileitem_linking_plugin.so
usr/lib/kde4/kcm_activities.so
usr/lib/kde4/kio_activities.so
-usr/lib/kde4/activitymanager_plugin_activityranking.so
usr/share/kde4/apps/activitymanager/workspace/settings/BlacklistApplicationView.qml
-usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/metadata.desktop
-usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/PasswordDialog.qml
-usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/uihandler.qml
-usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/NewPasswordDialog.qml
usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/ChoiceDialog.qml
usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/MessageDialog.qml
+usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/NewPasswordDialog.qml
+usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/PasswordDialog.qml
+usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/uihandler.qml
+usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/metadata.desktop
usr/share/kde4/services/activities.protocol
usr/share/kde4/services/activitymanager-plugin-activityranking.desktop
usr/share/kde4/services/activitymanager-plugin-globalshortcuts.desktop
usr/share/kde4/services/activitymanager-plugin-slc.desktop
usr/share/kde4/services/activitymanager-plugin-sqlite.desktop
usr/share/kde4/services/activitymanager-plugin-virtualdesktopswitch.desktop
-usr/share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop
usr/share/kde4/services/kactivitymanagerd.desktop
+usr/share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop
usr/share/kde4/services/kcm_activities.desktop
usr/share/kde4/servicetypes/activitymanager-plugin.desktop
-usr/share/ontology/kde/kao.trig
usr/share/ontology/kde/kao.ontology
+usr/share/ontology/kde/kao.trig
diff --git a/debian/libkactivities-dev.install b/debian/libkactivities-dev.install
index 615dcf1..9f523e7 100644
--- a/debian/libkactivities-dev.install
+++ b/debian/libkactivities-dev.install
@@ -1,15 +1,15 @@
-usr/include/kactivities
usr/include/KDE/KActivities
+usr/include/kactivities
usr/include/kactivities-models
-usr/lib/cmake/KActivities/KActivitiesConfig.cmake
-usr/lib/cmake/KActivities/KActivitiesConfigVersion.cmake
-usr/lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
-usr/lib/cmake/KActivities/KActivitiesLibraryTargets-debian.cmake
usr/lib/cmake/KActivities-Models/KActivities-ModelsConfig.cmake
usr/lib/cmake/KActivities-Models/KActivities-ModelsConfigVersion.cmake
usr/lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets-debian.cmake
usr/lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets.cmake
-usr/lib/libkactivities.so
+usr/lib/cmake/KActivities/KActivitiesConfig.cmake
+usr/lib/cmake/KActivities/KActivitiesConfigVersion.cmake
+usr/lib/cmake/KActivities/KActivitiesLibraryTargets-debian.cmake
+usr/lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
usr/lib/libkactivities-models.so
-usr/lib/pkgconfig/libkactivities.pc
+usr/lib/libkactivities.so
usr/lib/pkgconfig/libkactivities-models.pc
+usr/lib/pkgconfig/libkactivities.pc
diff --git a/debian/libkactivities-models1.install b/debian/libkactivities-models1.install
index ca00fa5..a4ecc3b 100644
--- a/debian/libkactivities-models1.install
+++ b/debian/libkactivities-models1.install
@@ -1,2 +1,2 @@
usr/lib/libkactivities-models.so.1
-usr/lib/libkactivities-models.so.1.*
+usr/lib/libkactivities-models.so.1.0.0
diff --git a/debian/libkactivities6.install b/debian/libkactivities6.install
index 6cf43b4..6880534 100644
--- a/debian/libkactivities6.install
+++ b/debian/libkactivities6.install
@@ -1,2 +1,2 @@
usr/lib/libkactivities.so.6
-usr/lib/libkactivities.so.6.*
+usr/lib/libkactivities.so.6.1.0
diff --git a/debian/rules b/debian/rules
index b504d2b..9bd8e2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+libpkgs_addsubst_allLibraries = libkactivities-dev libkactivities-dbg
+include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
.PHONY: override_dh_auto_test
--
kactivities packaging
More information about the pkg-kde-commits
mailing list