[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:11 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kactivities.git;a=commitdiff;h=31d3509
The following commit has been merged in the master branch:
commit 31d3509ece9f001de8b84f2a9cf5523dbe56feaf
Author: Rohan Garg <rohangarg at kubuntu.org>
Date: Tue Jun 3 17:29:13 2014 +0200
* Merge with debian, no remaining changes
---
debian/changelog | 78 +++++++++++++++++++++++++
debian/compat | 2 +-
debian/control | 53 ++++++++++-------
debian/copyright | 8 +--
debian/libkactivities-models1.abi.tar.gz.amd64 | Bin 0 -> 383928 bytes
debian/libkactivities-models1.acc | 17 ++++++
debian/libkactivities6.abi.tar.gz.amd64 | Bin 0 -> 166187 bytes
debian/libkactivities6.acc | 17 ++++++
debian/libkactivities6.install | 2 +-
debian/libkactivities6.lintian-overrides | 1 +
debian/rules | 2 -
debian/source.lintian-overrides | 1 +
debian/source/include-binaries | 2 +
debian/source/local-options | 1 +
debian/tests/acc | 3 +
debian/tests/control | 3 +
debian/watch | 2 +
17 files changed, 162 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6b72533..ab47590 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+kactivities (4:4.13.1-1ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge with debian, no remaining changes
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Tue, 03 Jun 2014 17:10:52 +0200
+
+kactivities (4:4.13.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 26 May 2014 11:15:58 +0200
+
kactivities (4:4.13.0-0ubuntu1) trusty; urgency=medium
* New upstream KDE Software Compilation release
@@ -22,12 +34,32 @@ kactivities (4:4.12.90-0ubuntu1) trusty; urgency=medium
-- Jonathan Riddell <jriddell at ubuntu.com> Wed, 19 Mar 2014 10:35:47 +0000
+kactivities (4:4.12.4-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 28 Apr 2014 12:25:40 +0200
+
+kactivities (4:4.12.3-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 04 Mar 2014 00:06:48 +0100
+
kactivities (4:4.12.3-0ubuntu1) trusty; urgency=medium
* New upstream bugfix release
-- Rohan Garg <rohangarg at kubuntu.org> Tue, 04 Mar 2014 20:28:24 +0100
+kactivities (4:4.12.2-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Update acc files.
+ * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 10 Feb 2014 11:32:38 +0100
+
kactivities (4:4.12.2-0ubuntu1) trusty; urgency=medium
* New upstream bugfix release
@@ -64,6 +96,36 @@ kactivities (4:4.11.80-0ubuntu1) trusty; urgency=low
-- Rohan Garg <rohangarg at kubuntu.org> Sat, 23 Nov 2013 17:26:57 +0100
+kactivities (4:4.11.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add autopkgtest.
+ * Bump Standards-Version to 3.9.5, no changes needed.
+ * Add abi-compliance-checker info.
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 15 Jan 2014 21:30:13 -0300
+
+kactivities (4:4.11.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 06 Nov 2013 16:33:55 +0100
+
+kactivities (4:4.11.2-2) experimental; urgency=low
+
+ * Bump kdelibs5-dev build-dependency version.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 03 Oct 2013 17:11:50 +0200
+
+kactivities (4:4.11.2-1) experimental; urgency=low
+
+ * New upstream release.
+ * Update install files.
+ * Update symbols file.
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 02 Oct 2013 20:32:23 +0200
+
kactivities (4:4.11.2-0ubuntu1) saucy; urgency=low
* New upstream bugfix release
@@ -123,6 +185,22 @@ kactivities (4:4.10.80-0ubuntu1) saucy; urgency=low
-- Jonathan Riddell <jriddell at ubuntu.com> Fri, 21 Jun 2013 00:46:20 +0100
+kactivities (4:4.10.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 11 Jul 2013 17:17:42 +0200
+
+kactivities (4:4.10.4-1) experimental; urgency=low
+
+ * New upstream release.
+ * Bump debhelper build-dep and compat to 9.
+ * Bump Standards-Version to 3.9.4.
+ * Update Uploaders list.
+ * Update vcs fields.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 13 Jun 2013 23:00:03 +0200
+
kactivities (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
* New upstream bugfix release
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 97a86df..e564800 100644
--- a/debian/control
+++ b/debian/control
@@ -4,30 +4,38 @@ 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>,
- 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.13.0), nepomuk-core-dev (>= 4:4.13.0),
- libsoprano-dev,
- shared-desktop-ontologies (>= 0.8.1),
- libx11-dev,
- libqt4-opengl-dev
-Standards-Version: 3.9.3
+ Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
+ Sune Vuorela <sune at debian.org>,
+ Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+ debhelper (>= 9),
+ kde-sc-dev-latest (>= 4:4.12),
+ kdelibs5-dev (>= 4:4.11),
+ libqt4-opengl-dev,
+ libsoprano-dev,
+ libx11-dev,
+ nepomuk-core-dev (>= 4:4.11),
+ pkg-kde-tools (>= 0.15.4~),
+ shared-desktop-ontologies (>= 0.8.1)
+Standards-Version: 3.9.5
+XS-Testsuite: autopkgtest
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
+X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kactivities.git
+X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kactivities.git
Package: libkactivities-bin
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: kde-runtime (<< 4:4.8), kde-runtime-data (<< 4:4.8),
- kdebase-runtime (<< 4:4.8), kdebase-runtime-data (<< 4:4.8)
-Replaces: kde-runtime (<< 4:4.8), kde-runtime-data (<< 4:4.8),
- kdebase-runtime (<< 4:4.8), kdebase-runtime-data (<< 4:4.8)
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kde-runtime (<< 4:4.8),
+ kde-runtime-data (<< 4:4.8),
+ kdebase-runtime (<< 4:4.8),
+ kdebase-runtime-data (<< 4:4.8)
+Replaces: kde-runtime (<< 4:4.8),
+ kde-runtime-data (<< 4:4.8),
+ kdebase-runtime (<< 4:4.8),
+ kdebase-runtime-data (<< 4:4.8)
Description: executables for the KDE Activities
This package contains binary files shipped with the KDE Activities library.
.
@@ -36,7 +44,7 @@ Description: executables for the KDE Activities
Package: libkactivities6
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: libkactivities-bin (= ${binary:Version})
Description: Activities library
This library provides functionality for managing activities.
@@ -46,7 +54,7 @@ Description: Activities library
Package: libkactivities-models1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Activities models library
This library provides functionality for KDE activities models.
.
@@ -55,8 +63,9 @@ Description: Activities models library
Package: libkactivities-dev
Section: libdevel
Architecture: any
-Depends: ${allLibraries}, ${misc:Depends},
- ${sameVersionDep:kdelibs5-dev:libkactivities6}
+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
kactivities library.
diff --git a/debian/copyright b/debian/copyright
index 26d7da5..a26c8a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,12 +20,12 @@ This library is licenced as GNU GPL version 2. See /usr/share/common-licenses/GP
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
-
+
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
-
+
You should have received a copy of the GNU General Public
License along with this program; if not, write to the
Free Software Foundation, Inc.,
@@ -44,12 +44,12 @@ See /usr/share/common-licenses/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,
diff --git a/debian/libkactivities-models1.abi.tar.gz.amd64 b/debian/libkactivities-models1.abi.tar.gz.amd64
new file mode 100644
index 0000000..6bbb56e
Binary files /dev/null and b/debian/libkactivities-models1.abi.tar.gz.amd64 differ
diff --git a/debian/libkactivities-models1.acc b/debian/libkactivities-models1.acc
new file mode 100644
index 0000000..f71ef18
--- /dev/null
+++ b/debian/libkactivities-models1.acc
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<descriptor>
+
+<version>
+ 4.11.5
+</version>
+
+<headers>
+ /usr/include/KDE/KActivities/Models
+ /usr/include/kactivities-models
+</headers>
+
+<libs>
+ /usr/lib/libkactivities-models.so
+</libs>
+
+</descriptor>
diff --git a/debian/libkactivities6.abi.tar.gz.amd64 b/debian/libkactivities6.abi.tar.gz.amd64
new file mode 100644
index 0000000..d4c78b2
Binary files /dev/null and b/debian/libkactivities6.abi.tar.gz.amd64 differ
diff --git a/debian/libkactivities6.acc b/debian/libkactivities6.acc
new file mode 100644
index 0000000..aa53450
--- /dev/null
+++ b/debian/libkactivities6.acc
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<descriptor>
+
+<version>
+ 4.11.5
+</version>
+
+<headers>
+ /usr/include/KDE/KActivities
+ /usr/include/kactivities
+</headers>
+
+<libs>
+ /usr/lib/libkactivities.so
+</libs>
+
+</descriptor>
diff --git a/debian/libkactivities6.install b/debian/libkactivities6.install
index 2371373..6cf43b4 100644
--- a/debian/libkactivities6.install
+++ b/debian/libkactivities6.install
@@ -1,2 +1,2 @@
usr/lib/libkactivities.so.6
-usr/lib/libkactivities.so.6.2.0
+usr/lib/libkactivities.so.6.*
diff --git a/debian/libkactivities6.lintian-overrides b/debian/libkactivities6.lintian-overrides
new file mode 100644
index 0000000..1f687c0
--- /dev/null
+++ b/debian/libkactivities6.lintian-overrides
@@ -0,0 +1 @@
+libkactivities6: symbols-declares-dependency-on-other-package libkactivities-bin
diff --git a/debian/rules b/debian/rules
index 9bd8e2c..4e2d8d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@ 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
-
override_dh_shlibdeps:
$(overridden_command) $(foreach p,$(shell dh_listpackages | grep ^lib),-p$p) -- -xkde-runtime
$(overridden_command) --remaining-packages
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..28ecdf5
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1 @@
+kactivities source: dbg-package-missing-depends libkactivities-dbg
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..057be75
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,2 @@
+debian/libkactivities6.abi.tar.gz.amd64
+debian/libkactivities-models1.abi.tar.gz.amd64
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes
diff --git a/debian/tests/acc b/debian/tests/acc
new file mode 100755
index 0000000..ecd74f2
--- /dev/null
+++ b/debian/tests/acc
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+dh_acc
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..68bd116
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: acc
+Depends: @,
+ dh-acc, exuberant-ctags
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..88a5d33
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kde.org/pub/kde/stable/([\d\.]*)/src/kactivities-([\d\.]*).tar.xz
--
kactivities packaging
More information about the pkg-kde-commits
mailing list