[SCM] baloo packaging branch, master, updated. debian/4.13.1-1-24-ga23a630

Maximiliano Curia maxy at moszumanska.debian.org
Wed Jul 30 12:31:25 UTC 2014 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/baloo.git;a=commitdiff;h=50ecf56

The following commit has been merged in the master branch:
commit 50ecf56a1b368a135da50c345e2e34f2f056c21e
Merge: 97d9fe94ff812c6552711e3dca628457240de24a 775842f53ee3fcc4822cce2fc6abcaf73e29895d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jul 30 00:16:31 2014 +0200

    Merge commit '775842f53ee3fcc4822cce2fc6abcaf73e29895d'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/libbaloocore4.symbols
    	debian/libbaloofiles4.symbols
    	debian/libbaloopim4.symbols
    	debian/libbalooxapian4.symbols

 debian/{baloo.install => baloo-utils.install} |   6 --
 debian/baloo4.install                         |   6 ++
 debian/changelog                              | 110 ++++++++++++++++++++++++++
 debian/control                                |  36 ++++++++-
 debian/libbaloocore4.symbols                  |   2 +-
 debian/libbaloofiles4.symbols                 |   2 +-
 debian/libbaloopim4.symbols                   |   2 +-
 debian/libbalooxapian4.symbols                |   2 +-
 8 files changed, 152 insertions(+), 14 deletions(-)

diff --cc debian/changelog
index 1ab4925,7813c3f..c5c47fc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,40 +1,63 @@@
 +baloo (4:4.13.3-1) UNRELEASED; 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
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 12:52:04 +0200
 +
+ baloo (4:4.13.2-0ubuntu3) utopic; urgency=medium
+ 
+   * Allow for co-installability with baloo-kf5
+     - create baloo-utils for kdelibs4 parts we want to keep installed
+     - rename to baloo4 and provide a common baloo virtual package
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 09 Jul 2014 17:24:47 +0200
+ 
+ baloo (4:4.13.2-0ubuntu2) utopic; urgency=medium
+ 
+   * Remove explicit baloo dependency from library .symbol files
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 30 Jun 2014 16:57:37 +0200
+ 
+ baloo (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   * new upstream release
+   * Remove upstream_catch_more_exceptions_emailsearchstore.patch
+     fixed upstream
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:38:20 +0100
+ 
+ baloo (4:4.13.0-0ubuntu5) utopic; urgency=medium
+ 
+   * Merge with Debian, remaining changes:
+    - still on 4.13.0
+   * Add conflicts on kf5 baloo packages
+   * Build-Conflicts: libkfilemetadata5-dev
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 29 May 2014 16:08:47 +0100
+ 
+ baloo (4:4.13.0-0ubuntu4) utopic; urgency=high
+ 
+   * Rebuild against boost1.55
+ 
+  -- Dimitri John Ledkov <xnox at ubuntu.com>  Sat, 03 May 2014 21:55:11 +0100
+ 
  baloo (4:4.13.1-1) experimental; urgency=medium
  
    * Initial release, based on the kubuntu package.
diff --cc debian/control
index 58dce43,5c033e3..a0cbaa2
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: baloo
  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>
 +Maintainer: Debian 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,
@@@ -19,16 -21,33 +21,41 @@@ Build-Conflicts: libkfilemetadata5-de
  Standards-Version: 3.9.5
  XS-Testsuite: autopkgtest
  Homepage: http://projects.kde.org/baloo
 -Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/baloo
 -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/baloo
 -X-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/baloo.git
 -X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/baloo.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/baloo.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/baloo.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/baloo
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/baloo
  
- Package: baloo
+ Package: baloo4
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Replaces: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80)
- Breaks: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80)
 -Replaces: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80), baloo (<< 4:4.13.2-0ubuntu3)
 -Breaks: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80), baloo (<< 4:4.13.2-0ubuntu3)
 -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.
+  .
+  This package contains the kdelibs4 version of the binaries, it can also
+  be replaced with baloo-kf5.
+ 
+ Package: baloo-utils
+ Architecture: any
+ Depends: ${misc:Depends}, ${shlibs:Depends}
 -Replaces: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80), baloo (<< 4:4.13.2-0ubuntu3)
 -Breaks: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80), baloo (<< 4:4.13.2-0ubuntu3)
++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)
+ Description: framework for searching and managing metadata.
+  A framework for searching and managing metadata in KDE.
+  .
+  This package contains kdelibs4 utilities for Baloo.
  
  Package: libbaloocore4
  Architecture: any

-- 
baloo packaging

More information about the pkg-kde-commits mailing list