[SCM] baloo packaging branch, master, updated. debian/4.13.3-1-27-gbf16a4e
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Aug 23 23:13:09 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/baloo.git;a=commitdiff;h=41515c6
The following commit has been merged in the master branch:
commit 41515c6e5ca09732896369c26484147643a9977a
Merge: 9bebd61a2fb33fd256497a7f5c3e6cd6dd43d6ef 0248ae8637641d712d4d425401227ae48bd64660
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sat Aug 23 18:10:45 2014 +0200
Merge remote-tracking branch 'ubuntu/master'
Conflicts:
debian/control
debian/libbaloopim4.symbols
debian/libbalooxapian4.symbols
debian/changelog | 70 +++++++++++++++++++++++++++++++++++++
debian/control | 31 ++++++++++++++--
debian/libbalooqueryparser4.install | 2 ++
3 files changed, 100 insertions(+), 3 deletions(-)
diff --cc debian/changelog
index d232f30,4a343e3..ebefb1c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,73 +1,106 @@@
+baloo (4:4.14.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Update build dependencies.
+ * Update symbols files with buildds logs.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 18 Aug 2014 18:17:14 +0200
+
+ baloo (4:4.14.0-0ubuntu1) utopic; urgency=medium
+
+ [ Jonathan Riddell ]
+ * New upstream release
+
+ [ Philip Muškovac ]
+ * Add a transitional package for baloo > baloo4 as Provides don't take care
+ of upgrades
+ * Delete obsolete baloo.install
+
+ [ Rohan Garg ]
+ * Make baloo-utils a dep of baloo4
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 20 Aug 2014 12:26:11 +0200
+
+ baloo (4:4.13.97-0ubuntu3) utopic; urgency=medium
+
+ * Add replaces/breaks for file moved to baloo-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 12 Aug 2014 19:59:34 +0200
+
+ baloo (4:4.13.97-0ubuntu2) utopic; urgency=medium
+
+ * Bump replaces version of baloo for new updates
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 12 Aug 2014 19:45:17 +0200
+
+ baloo (4:4.13.97-0ubuntu1) utopic; urgency=medium
+
+ [ Scarlett Clark ]
+ * New upstream beta release RC
+
+ [ Jonathan Riddell ]
+ * Update symbols
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Fri, 01 Aug 2014 16:02:52 +0200
+
+ baloo (4:4.13.95-0ubuntu1) utopic; urgency=medium
+
+ [ Scarlett Clark ]
+ * New upstream beta release
+ * Fix libalooqueryparser install file
+
+ [ Philip Muškovac ]
+ * Remove empty arch= selector in libbaloopim4.symbols and
+ libbalooxapian4.symbols
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Fri, 25 Jul 2014 06:18:28 -0700
+
+ baloo (4:4.13.90-0ubuntu3) utopic; urgency=medium
+
+ * Add missing build-dep on libx11-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Sat, 19 Jul 2014 21:40:48 +0200
+
+ baloo (4:4.13.90-0ubuntu2) utopic; urgency=medium
+
+ * Add missing .install file
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Sat, 19 Jul 2014 21:40:48 +0200
+
+ baloo (4:4.13.90-0ubuntu1) utopic; urgency=medium
+
+ * New upstream beta release
+ * Added new library libbalooqueryparser
+ * Patched symbols with batchpatch
+ * Add new library to -dev as depend
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Fri, 18 Jul 2014 13:54:56 -0700
+
+baloo (4:4.13.3-1) unstable; urgency=medium
+
+ [ Pino Toscano ]
+ * Backport upstream commits 01f3fff52d63302e6970a088710ec6b692b1b470,
+ b538865e6069a61c8cf467622f3dccef2bac115e and
+ 07278894f3a00a3c4ca5ce7d62721c0edfddfb69 to fix build on glibc-based OSes
+ different than Linux; patches
+ upstream_xattr-fix-fallback-in-no-xattr-OSes.patch,
+ upstream_xattr-use-the-linux-xattr-impl-on-any-glibc-based-OS.patch, and
+ upstream_xattr-do-not-use-on-glibc-if-not-implemented.patch.
+ * Switch the libboost1.55-dev build dependency to libboost-dev.
+
+ [ Maximiliano Curia ]
+ * New upstream release.
+ * Remove upstream applied patch: upstream_xattr-do-not-use-on-glibc-
+ if-not-implemented.patch
+ * Remove upstream applied patch: upstream_xattr-fix-fallback-in-no-
+ xattr-OSes.patch
+ * Remove upstream applied patch: upstream_xattr-use-the-linux-xattr-
+ impl-on-any-glibc-based-OS.patch
+ * Update symbols file.
+ * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 30 Jul 2014 00:17:47 +0200
+
baloo (4:4.13.2-0ubuntu3) utopic; urgency=medium
* Allow for co-installability with baloo-kf5
diff --cc debian/control
index a6925a3,9f9038e..a652963
--- a/debian/control
+++ b/debian/control
@@@ -1,22 -1,23 +1,23 @@@
Source: baloo
Section: kde
Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
++Maintainer: Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+X-Ubuntu-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
Uploaders: Rohan Garg <rohangarg at kubuntu.org>,
Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake,
debhelper (>= 9),
kde-sc-dev-latest (>= 4:4.12),
- kdelibs5-dev (>= 4:4.14.0),
+ kdelibs5-dev (>= 4:4.13.0),
kdepimlibs5-dev (>= 4:4.14.0),
- libakonadi-dev (>= 1.12.91),
+ libakonadi-dev (>= 1.12.90),
libattr1-dev,
- libboost1.55-dev,
- libkfilemetadata-dev (>= 4:4.14.0),
+ libboost-dev,
+ libkfilemetadata-dev (>= 4:4.13.0),
libqjson-dev,
libxapian-dev,
- pkg-kde-tools
+ pkg-kde-tools,
+ libx11-dev
Build-Conflicts: libkfilemetadata5-dev
Standards-Version: 3.9.5
XS-Testsuite: autopkgtest
@@@ -28,14 -29,10 +29,14 @@@ X-Ubuntu-Vcs-Bzr: https://code.launchpa
Package: baloo4
Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}
+ Depends: ${misc:Depends}, ${shlibs:Depends}, baloo-utils
-Replaces: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80), baloo (<< 4:4.13.90)
-Breaks: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80), baloo (<< 4:4.13.90)
-Conflicts: baloo-kf5-data, baloo-kf5
+Replaces: baloo (<< 4:4.13.2-0ubuntu3),
+ kde-runtime (<< 4:4.12.80),
+ kde-runtime-data (<< 4:4.12.80)
+Breaks: baloo (<< 4:4.13.2-0ubuntu3),
+ kde-runtime (<< 4:4.12.80),
+ kde-runtime-data (<< 4:4.12.80)
+Conflicts: baloo-kf5, baloo-kf5-data
Provides: baloo
Description: framework for searching and managing metadata.
A framework for searching and managing metadata in KDE.
--
baloo packaging
More information about the pkg-kde-commits
mailing list