[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:23 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/baloo.git;a=commitdiff;h=9886c14
The following commit has been merged in the master branch:
commit 9886c143108cd128fad6835e8e2efc14854b952c
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date: Thu May 29 16:28:34 2014 +0100
* Merge with Debian, remaining changes:
- still on 4.13.0
* Add conflicts on kf5 baloo packages
* Build-Conflicts: libkfilemetadata5-dev
* Initial release, based on the kubuntu package.
* Update build dependencies.
* Update symbols files.
* New patch: disable_tests_depending_on_revdep
* Add dh-acc files.
* Add dbus interface file to the -dev package.
---
debian/baloo-dev.install | 5 +-
debian/baloo.install | 33 ++++--
debian/changelog | 20 ++++
debian/control | 56 ++++++-----
debian/copyright | 61 ++++++------
debian/libbaloocore4.acc | 16 +++
debian/libbaloocore4.install | 3 +-
debian/libbaloocore4.symbols | 2 +-
debian/libbaloofiles4.acc | 22 ++++
debian/libbaloofiles4.install | 3 +-
debian/libbaloofiles4.symbols | 2 +-
debian/libbaloopim4.acc | 22 ++++
debian/libbaloopim4.install | 3 +-
debian/libbaloopim4.symbols | 12 +--
debian/libbalooxapian4.install | 3 +-
debian/libbalooxapian4.symbols | 12 ++-
debian/patches/disable_tests_depending_on_revdep | 122 +++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 7 +-
debian/tests/acc | 3 +
debian/tests/control | 8 ++
debian/tests/testsuite | 4 +
debian/tests/testsuite.xsession | 8 ++
debian/watch | 2 +
24 files changed, 343 insertions(+), 87 deletions(-)
diff --git a/debian/baloo-dev.install b/debian/baloo-dev.install
index a14192d..3f63fa4 100644
--- a/debian/baloo-dev.install
+++ b/debian/baloo-dev.install
@@ -1,3 +1,4 @@
-usr/include
-usr/lib/libbaloo*.so
+usr/include/baloo
usr/lib/cmake/Baloo/
+usr/lib/libbaloo*.so
+usr/share/dbus-1/interfaces/org.kde.baloo.*.xml
diff --git a/debian/baloo.install b/debian/baloo.install
index f61abba..1c5394a 100644
--- a/debian/baloo.install
+++ b/debian/baloo.install
@@ -1,12 +1,23 @@
-etc/dbus-1/system.d/*
-usr/bin/*
-usr/lib/kde4/*.so
-usr/lib/kde4/libexec/*
-usr/share/akonadi/agents/*
-usr/share/autostart/*
-usr/share/dbus-1/*
-usr/share/kde4/*
-usr/share/polkit-1/*
-usr/lib/kde4/akonadi/akonadibaloosearchplugin.desktop
+etc/dbus-1/system.d/org.kde.baloo.*
+usr/bin/akonadi_baloo_indexer
+usr/bin/baloo*
usr/lib/kde4/akonadi/akonadi_baloo_searchplugin.so
-usr/share/icons/hicolor/128x128/apps/baloo.png
+usr/lib/kde4/akonadi/akonadibaloosearchplugin.desktop
+usr/lib/kde4/baloo_*.so
+usr/lib/kde4/kcm_baloofile.so
+usr/lib/kde4/kio_baloosearch.so
+usr/lib/kde4/kio_tags.so
+usr/lib/kde4/kio_timeline.so
+usr/lib/kde4/krunner_baloosearchrunner.so
+usr/lib/kde4/libexec/kde_baloo_filewatch_raiselimit
+usr/share/akonadi/agents/akonadibalooindexingagent.desktop
+usr/share/autostart/baloo_*
+usr/share/dbus-1/system-services/org.kde.baloo.*
+usr/share/icons/*/*/apps/baloo.png
+usr/share/kde4/services/baloo*
+usr/share/kde4/services/kcm_baloofile.desktop
+usr/share/kde4/services/plasma-runner-baloosearch.desktop
+usr/share/kde4/services/tags.protocol
+usr/share/kde4/services/timeline.protocol
+usr/share/kde4/servicetypes/baloosearchstore.desktop
+usr/share/polkit-1/actions/org.kde.baloo.*
diff --git a/debian/changelog b/debian/changelog
index 725afcd..cfa7c30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+baloo (4:4.13.0-0ubuntu1) 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.1-1) experimental; urgency=medium
+
+ * Initial release, based on the kubuntu package.
+ * Update build dependencies.
+ * Update symbols files.
+ * New patch: disable_tests_depending_on_revdep
+ * Add dh-acc files.
+ * Add dbus interface file to the -dev package.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 26 May 2014 13:25:45 +0200
+
baloo (4:4.13.0-0ubuntu3) utopic; urgency=medium
* Remove explicit baloo dependency from library .symbol files
diff --git a/debian/control b/debian/control
index 69b8322..91b53a5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,23 +2,31 @@ Source: baloo
Section: kde
Priority: optional
Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-Build-Depends: debhelper (>= 9.0.0), cmake,
- pkg-kde-tools,
- kdelibs5-dev (>= 4:4.13.0),
- kdepimlibs5-dev (>= 4:4.13.0),
- libkfilemetadata-dev (>= 4:4.13.0),
- libxapian-dev,
- libqjson-dev,
- libattr1-dev,
- libakonadi-dev (>= 1.11.80),
- libboost1.54-dev
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+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.13.0),
+ kdepimlibs5-dev (>= 4:4.13.0),
+ libakonadi-dev (>= 1.11.80),
+ libattr1-dev,
+ libboost1.55-dev,
+ libkfilemetadata-dev (>= 4:4.13.0),
+ libqjson-dev,
+ libxapian-dev,
+ pkg-kde-tools
Build-Conflicts: libkfilemetadata5-dev
Standards-Version: 3.9.5
+XS-Testsuite: autopkgtest
Homepage: http://projects.kde.org/baloo
+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
Package: baloo
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+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)
Conflicts: baloo-kf5-data, baloo-kf5
@@ -28,44 +36,44 @@ Description: framework for searching and managing metadata.
Package: libbaloocore4
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Core funcationality for Baloo
Baloo is a framework for searching and managing metadata.
.
- This package contains development headers for baloo.
+ This package contains the baloo core library.
.
Baloo is part of KDE SC.
Package: libbaloofiles4
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Files funcationality for Baloo
Baloo is a framework for searching and managing metadata.
.
- This package contains development headers for baloo.
+ This package contains the baloo files library.
.
Baloo is part of KDE SC.
Package: libbaloopim4
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: PIM funcationality for Baloo
Baloo is a framework for searching and managing metadata.
.
- This package contains development headers for baloo.
+ This package contains the baloo PIM library.
.
Baloo is part of KDE SC.
Package: libbalooxapian4
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Xapian funcationality for Baloo
Baloo is a framework for searching and managing metadata.
.
- This package contains development headers for baloo.
+ This package contains the baloo Xapian library.
.
Baloo is part of KDE SC.
@@ -73,11 +81,11 @@ Package: baloo-dev
Architecture: any
Section: libdevel
Depends: libbaloocore4 (= ${binary:Version}),
- libbaloofiles4 (= ${binary:Version}),
- libbaloopim4 (= ${binary:Version}),
- libbalooxapian4 (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
+ libbaloofiles4 (= ${binary:Version}),
+ libbaloopim4 (= ${binary:Version}),
+ libbalooxapian4 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Development headers for developing applications with Baloo
Baloo is a framework for searching and managing metadata.
.
diff --git a/debian/copyright b/debian/copyright
index 7c42326..ec30424 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: baloo
-Source: http://community.kde.org/Baloo
+Source: git://anongit.kde.org/baloo
Files: *
Copyright: 2010, 2010-13, 2010-14, 2011-2014 Vishesh Handa <me at vhanda.in>
@@ -27,24 +27,24 @@ License: LGPL 2.1 or 3 or approved by KDE e.V.
License along with this library. If not, see <http://www.gnu.org/licenses/>.
Files: src/file/eventmonitor.cpp
- + src/file/eventmonitor.h
- + src/file/fileexcludefilters.cpp
- + src/file/fileexcludefilters.h
- + src/file/fileindexer.cpp
- + src/file/fileindexer.h
- + src/file/fileindexerconfig.cpp
- + src/file/fileindexerconfig.h
- + src/file/filewatch.cpp
- + src/file/filewatch.h
- + src/file/indexscheduler.cpp
- + src/file/indexscheduler.h
- + src/file/metadatamover.cpp
- + src/file/metadatamover.h
- + src/file/priority.cpp
- + src/file/priority.h
- + src/file/kcm/kcm.cpp
- + src/file/kcm/kcm.h
- + src/kioslaves/timeline/timelinetools.h
+ src/file/eventmonitor.h
+ src/file/fileexcludefilters.cpp
+ src/file/fileexcludefilters.h
+ src/file/fileindexer.cpp
+ src/file/fileindexer.h
+ src/file/fileindexerconfig.cpp
+ src/file/fileindexerconfig.h
+ src/file/filewatch.cpp
+ src/file/filewatch.h
+ src/file/indexscheduler.cpp
+ src/file/indexscheduler.h
+ src/file/metadatamover.cpp
+ src/file/metadatamover.h
+ src/file/priority.cpp
+ src/file/priority.h
+ src/file/kcm/kcm.cpp
+ src/file/kcm/kcm.h
+ src/kioslaves/timeline/timelinetools.h
Copyright: 2008 Sebastian Trueg <trueg at kde.org>
2010-14 Vishesh Handa <me at vhanda.in>
License: LGPL-2
@@ -89,17 +89,17 @@ License: LGPL-2+
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
-Files: icons/*
- autotests/search.cpp
- src/file/autotest/kinotifytest.h
- src/file/autotest/kinotifytest.cpp
- src/tools/balooshow/main.cpp
- src/kioslaves/timeline/kio_timeline.cpp
- src/kioslaves/search/kio_search.cpp
- src/pim/agent/emailindexer.h
- src/pim/agent/abstractindexer.h
- src/pim/agent/contactindexer.h
- src/pim/agent/abstractindexer.cpp
+Files: icons/*
+ autotests/search.cpp
+ src/file/autotest/kinotifytest.h
+ src/file/autotest/kinotifytest.cpp
+ src/tools/balooshow/main.cpp
+ src/kioslaves/timeline/kio_timeline.cpp
+ src/kioslaves/search/kio_search.cpp
+ src/pim/agent/emailindexer.h
+ src/pim/agent/abstractindexer.h
+ src/pim/agent/contactindexer.h
+ src/pim/agent/abstractindexer.cpp
Copyright: 2013 Vishesh Handa <me at vhanda.in>
2007 David Faure <faure at kde.org>
License: GPL 2 or 3 or approved by KDE e.V.
@@ -159,6 +159,7 @@ Files: src/xapian/xapian_export.h
src/core/core_export.h
debian/*
Copyright: 2014 Jonathan Riddell <jriddell at ubuntu.com>
+ 2014 Maximiliano Curia <maxy at debian.org>
2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
diff --git a/debian/libbaloocore4.acc b/debian/libbaloocore4.acc
new file mode 100644
index 0000000..2a33e9a
--- /dev/null
+++ b/debian/libbaloocore4.acc
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<descriptor>
+
+<version>
+ 4.13.1
+</version>
+
+<headers>
+ /usr/include/baloo/pim
+</headers>
+
+<libs>
+ /usr/lib/libbaloopim.so
+</libs>
+
+</descriptor>
diff --git a/debian/libbaloocore4.install b/debian/libbaloocore4.install
index cbe4d36..e403f76 100644
--- a/debian/libbaloocore4.install
+++ b/debian/libbaloocore4.install
@@ -1 +1,2 @@
-usr/lib/libbaloocore.so.4*
+usr/lib/libbaloocore.so.4
+usr/lib/libbaloocore.so.4.*
diff --git a/debian/libbaloocore4.symbols b/debian/libbaloocore4.symbols
index 6242b25..0066857 100644
--- a/debian/libbaloocore4.symbols
+++ b/debian/libbaloocore4.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 4:4.12.97 i386
-libbaloocore.so.4 libbaloocore4 #MINVER#
+libbaloocore.so.4 libbaloocore4 #MINVER#, baloo
_ZN5Baloo11SearchStore11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.12.80
_ZN5Baloo11SearchStore11qt_metacastEPKc at Base 4:4.12.80
_ZN5Baloo11SearchStore12searchStoresEv at Base 4:4.12.80
diff --git a/debian/libbaloofiles4.acc b/debian/libbaloofiles4.acc
new file mode 100644
index 0000000..bd406ed
--- /dev/null
+++ b/debian/libbaloofiles4.acc
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<descriptor>
+
+<version>
+ 4.13.1
+</version>
+
+<headers>
+ /usr/include/baloo/file.h
+ /usr/include/baloo/filefetchjob.h
+ /usr/include/baloo/filemodifyjob.h
+ /usr/include/baloo/filemonitor.h
+ /usr/include/baloo/taglistjob.h
+ /usr/include/baloo/indexerconfig.h
+ /usr/include/baloo/file_export.h
+</headers>
+
+<libs>
+ /usr/lib/libbaloofiles.so
+</libs>
+
+</descriptor>
diff --git a/debian/libbaloofiles4.install b/debian/libbaloofiles4.install
index f68af93..92aeb70 100644
--- a/debian/libbaloofiles4.install
+++ b/debian/libbaloofiles4.install
@@ -1 +1,2 @@
-usr/lib/libbaloofiles.so.4*
+usr/lib/libbaloofiles.so.4
+usr/lib/libbaloofiles.so.4.*
diff --git a/debian/libbaloofiles4.symbols b/debian/libbaloofiles4.symbols
index 302536f..867643b 100644
--- a/debian/libbaloofiles4.symbols
+++ b/debian/libbaloofiles4.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 4:4.12.97-0ubuntu2 amd64 i386
-libbaloofiles.so.4 libbaloofiles4 #MINVER#
+libbaloofiles.so.4 libbaloofiles4 #MINVER#, baloo
_ZN5Baloo10TagListJob11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.12.80
_ZN5Baloo10TagListJob11qt_metacastEPKc at Base 4:4.12.80
_ZN5Baloo10TagListJob16staticMetaObjectE at Base 4:4.12.80
diff --git a/debian/libbaloopim4.acc b/debian/libbaloopim4.acc
new file mode 100644
index 0000000..62ee281
--- /dev/null
+++ b/debian/libbaloopim4.acc
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<descriptor>
+
+<version>
+ 4.13.1
+</version>
+
+<headers>
+ /usr/include/baloo/term.h
+ /usr/include/baloo/query.h
+ /usr/include/baloo/queryrunnable.h
+ /usr/include/baloo/result.h
+ /usr/include/baloo/resultiterator.h
+ /usr/include/baloo/searchstore.h
+ /usr/include/baloo/core_export.h
+</headers>
+
+<libs>
+ /usr/lib/libbaloocore.so
+</libs>
+
+</descriptor>
diff --git a/debian/libbaloopim4.install b/debian/libbaloopim4.install
index 6fdbbea..d7c39ce 100644
--- a/debian/libbaloopim4.install
+++ b/debian/libbaloopim4.install
@@ -1 +1,2 @@
-usr/lib/libbaloopim.so.4*
+usr/lib/libbaloopim.so.4
+usr/lib/libbaloopim.so.4.*
diff --git a/debian/libbaloopim4.symbols b/debian/libbaloopim4.symbols
index 4eeef55..49befcf 100644
--- a/debian/libbaloopim4.symbols
+++ b/debian/libbaloopim4.symbols
@@ -1,5 +1,5 @@
-# SymbolsHelper-Confirmed: 4:4.12.97 amd64
-libbaloopim.so.4 libbaloopim4 #MINVER#
+# SymbolsHelper-Confirmed: 4:4.13.1 amd64
+libbaloopim.so.4 libbaloopim4 #MINVER#, baloo
_ZN5Baloo3PIM10EmailQuery11addInvolvesERK7QString at Base 4:4.12.80
_ZN5Baloo3PIM10EmailQuery11bodyMatchesERK7QString at Base 4:4.12.80
_ZN5Baloo3PIM10EmailQuery11setInvolvesERK11QStringList at Base 4:4.12.80
@@ -67,16 +67,16 @@ libbaloopim.so.4 libbaloopim4 #MINVER#
_ZN5Baloo3PIM9NoteQueryD0Ev at Base 4:4.12.80
_ZN5Baloo3PIM9NoteQueryD1Ev at Base 4:4.12.80
_ZN5Baloo3PIM9NoteQueryD2Ev at Base 4:4.12.80
- _ZN6Xapian18ValuePostingSourceD0Ev at Base 4:4.12.80
- _ZN6Xapian18ValuePostingSourceD1Ev at Base 4:4.12.80
- _ZN6Xapian18ValuePostingSourceD2Ev at Base 4:4.12.80
+ (optional=gccinternal|arch=!amd64)_ZN6Xapian18ValuePostingSourceD0Ev at Base 4:4.12.80
+ (optional=gccinternal|arch=!amd64)_ZN6Xapian18ValuePostingSourceD1Ev at Base 4:4.12.80
+ (optional=gccinternal|arch=!amd64)_ZN6Xapian18ValuePostingSourceD2Ev at Base 4:4.12.80
(optional=templinst)_ZN6Xapian5QueryC1IN5QListIS0_E8iteratorEEENS0_2opET_S6_j at Base 4:4.12.90
(optional=templinst)_ZN6Xapian5QueryC2IN5QListIS0_E8iteratorEEENS0_2opET_S6_j at Base 4:4.12.90
_ZNK5Baloo3PIM10EmailQuery5limitEv at Base 4:4.12.80
_ZNK5Baloo3PIM12ContactQuery13matchCriteriaEv at Base 4:4.12.80
_ZNK5Baloo3PIM12ContactQuery5limitEv at Base 4:4.12.80
_ZNK5Baloo3PIM9NoteQuery5limitEv at Base 4:4.12.80
- (optional=templinst)_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_EPKS3_RKS6_ at Base 4:4.12.80
+ (optional=templinst|arch=!amd64)_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_EPKS3_RKS6_ at Base 4:4.12.80
_ZTIN5Baloo3PIM10EmailQueryE at Base 4:4.12.80
_ZTIN5Baloo3PIM12ContactQueryE at Base 4:4.12.80
_ZTIN5Baloo3PIM5QueryE at Base 4:4.12.80
diff --git a/debian/libbalooxapian4.install b/debian/libbalooxapian4.install
index dec221c..2f6b813 100644
--- a/debian/libbalooxapian4.install
+++ b/debian/libbalooxapian4.install
@@ -1 +1,2 @@
-usr/lib/libbalooxapian.so.4*
+usr/lib/libbalooxapian.so.4
+usr/lib/libbalooxapian.so.4.*
diff --git a/debian/libbalooxapian4.symbols b/debian/libbalooxapian4.symbols
index a324307..ac6e43f 100644
--- a/debian/libbalooxapian4.symbols
+++ b/debian/libbalooxapian4.symbols
@@ -1,5 +1,5 @@
-# SymbolsHelper-Confirmed: 4:4.13.0 i386
-libbalooxapian.so.4 libbalooxapian4 #MINVER#
+# SymbolsHelper-Confirmed: 4:4.13.1 amd64
+libbalooxapian.so.4 libbalooxapian4 #MINVER#, baloo
_ZN5Baloo14XapianDatabase14deleteDocumentEj at Base 4:4.12.97
_ZN5Baloo14XapianDatabase15replaceDocumentEjRKN6Xapian8DocumentE at Base 4:4.12.97
_ZN5Baloo14XapianDatabase15replaceDocumentEjRKNS_14XapianDocumentE at Base 4:4.13.0
@@ -8,6 +8,8 @@ libbalooxapian.so.4 libbalooxapian4 #MINVER#
_ZN5Baloo14XapianDatabase8documentEj at Base 4:4.12.97
_ZN5Baloo14XapianDatabaseC1ERK7QStringb at Base 4:4.13.0
_ZN5Baloo14XapianDatabaseC2ERK7QStringb at Base 4:4.13.0
+ _ZN5Baloo14XapianDatabaseD1Ev at Base 4:4.13.1
+ _ZN5Baloo14XapianDatabaseD2Ev at Base 4:4.13.1
_ZN5Baloo14XapianDocument11addBoolTermERK7QStringS3_ at Base 4:4.12.97
_ZN5Baloo14XapianDocument11addBoolTermEiRK7QString at Base 4:4.12.97
_ZN5Baloo14XapianDocument19fetchTermStartsWithERK10QByteArray at Base 4:4.12.97
@@ -40,9 +42,9 @@ libbalooxapian.so.4 libbalooxapian4 #MINVER#
_ZN5Baloo17XapianSearchStore9setDbPathERK7QString at Base 4:4.12.80
_ZN5Baloo17XapianSearchStoreC1EP7QObject at Base 4:4.12.80
_ZN5Baloo17XapianSearchStoreC2EP7QObject at Base 4:4.12.80
- _ZN5Baloo17XapianSearchStoreD0Ev at Base 4:4.12.80
- _ZN5Baloo17XapianSearchStoreD1Ev at Base 4:4.12.80
- _ZN5Baloo17XapianSearchStoreD2Ev at Base 4:4.12.80
+ (optional=gccinternal|arch=!amd64)_ZN5Baloo17XapianSearchStoreD0Ev at Base 4:4.12.80
+ (optional=gccinternal|arch=!amd64)_ZN5Baloo17XapianSearchStoreD1Ev at Base 4:4.12.80
+ (optional=gccinternal|arch=!amd64)_ZN5Baloo17XapianSearchStoreD2Ev at Base 4:4.12.80
(optional=templinst)_ZN6Xapian5QueryC1IPS0_EENS0_2opET_S4_j at Base 4:4.12.80
(optional=templinst)_ZN6Xapian5QueryC2IPS0_EENS0_2opET_S4_j at Base 4:4.12.80
_ZNK5Baloo14XapianDocument3docEv at Base 4:4.13.0
diff --git a/debian/patches/disable_tests_depending_on_revdep b/debian/patches/disable_tests_depending_on_revdep
new file mode 100644
index 0000000..f01e8bd
--- /dev/null
+++ b/debian/patches/disable_tests_depending_on_revdep
@@ -0,0 +1,122 @@
+Index: baloo/src/pim/agent/autotests/CMakeLists.txt
+===================================================================
+--- baloo.orig/src/pim/agent/autotests/CMakeLists.txt 2014-05-20 17:59:58.781066129 +0200
++++ baloo/src/pim/agent/autotests/CMakeLists.txt 2014-05-20 18:02:39.430773398 +0200
+@@ -2,29 +2,29 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/..
+ )
+
+-set(indexertest_SRCS
+- indexertest.cpp
+- ../emailindexer.cpp
+- ../contactindexer.cpp
+- ../abstractindexer.cpp
+- ../../search/pimsearchstore.cpp
+- ../../search/email/emailsearchstore.cpp
+- ../../search/email/agepostingsource.cpp
+- ../../search/contact/contactsearchstore.cpp
+-)
++# set(indexertest_SRCS
++# indexertest.cpp
++# ../emailindexer.cpp
++# ../contactindexer.cpp
++# ../abstractindexer.cpp
++# ../../search/pimsearchstore.cpp
++# ../../search/email/emailsearchstore.cpp
++# ../../search/email/agepostingsource.cpp
++# ../../search/contact/contactsearchstore.cpp
++# )
+
+-add_definitions(-DBALOO_NO_PLUGINS=TRUE)
++# add_definitions(-DBALOO_NO_PLUGINS=TRUE)
+
+-kde4_add_unit_test(indexertest NOGUI ${indexertest_SRCS})
+-target_link_libraries(indexertest
+- ${QT_QTTEST_LIBRARY}
+- ${KDE4_KDECORE_LIBS}
+- ${KDEPIMLIBS_AKONADI_LIBS}
+- ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+- ${KDEPIMLIBS_KMIME_LIBS}
+- ${KDEPIMLIBS_KABC_LIBS}
+- ${XAPIAN_LIBRARIES}
+- ${KDEPIMLIBS_KPIMUTILS_LIBS}
+- baloocore
+- balooxapian
+-)
++# kde4_add_unit_test(indexertest NOGUI ${indexertest_SRCS})
++# target_link_libraries(indexertest
++# ${QT_QTTEST_LIBRARY}
++# ${KDE4_KDECORE_LIBS}
++# ${KDEPIMLIBS_AKONADI_LIBS}
++# ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
++# ${KDEPIMLIBS_KMIME_LIBS}
++# ${KDEPIMLIBS_KABC_LIBS}
++# ${XAPIAN_LIBRARIES}
++# ${KDEPIMLIBS_KPIMUTILS_LIBS}
++# baloocore
++# balooxapian
++# )
+Index: baloo/src/pim/akonadiplugin/autotests/CMakeLists.txt
+===================================================================
+--- baloo.orig/src/pim/akonadiplugin/autotests/CMakeLists.txt 2014-05-20 17:59:58.781066129 +0200
++++ baloo/src/pim/akonadiplugin/autotests/CMakeLists.txt 2014-05-20 18:02:56.826091845 +0200
+@@ -2,32 +2,32 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/..
+ )
+
+-set(searchplugintest_SRCS
+- searchplugintest.cpp
+- ../searchplugin.cpp
+- ../../agent/emailindexer.cpp
+- ../../agent/contactindexer.cpp
+- ../../agent/abstractindexer.cpp
+- ../../agent/akonotesindexer.cpp
+- ../../search/pimsearchstore.cpp
+- ../../search/email/emailsearchstore.cpp
+- ../../search/email/agepostingsource.cpp
+- ../../search/contact/contactsearchstore.cpp
+- ../../search/note/notesearchstore.cpp
+-)
++# set(searchplugintest_SRCS
++# searchplugintest.cpp
++# ../searchplugin.cpp
++# ../../agent/emailindexer.cpp
++# ../../agent/contactindexer.cpp
++# ../../agent/abstractindexer.cpp
++# ../../agent/akonotesindexer.cpp
++# ../../search/pimsearchstore.cpp
++# ../../search/email/emailsearchstore.cpp
++# ../../search/email/agepostingsource.cpp
++# ../../search/contact/contactsearchstore.cpp
++# ../../search/note/notesearchstore.cpp
++# )
+
+-add_definitions(-DBALOO_NO_PLUGINS=TRUE)
++# add_definitions(-DBALOO_NO_PLUGINS=TRUE)
+
+-kde4_add_unit_test(searchplugintest NOGUI ${searchplugintest_SRCS})
+-target_link_libraries(searchplugintest
+- ${QT_QTTEST_LIBRARY}
+- ${KDE4_KDECORE_LIBS}
+- ${KDEPIMLIBS_AKONADI_LIBS}
+- ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+- ${KDEPIMLIBS_KMIME_LIBS}
+- ${KDEPIMLIBS_KABC_LIBS}
+- ${XAPIAN_LIBRARIES}
+- ${KDEPIMLIBS_KPIMUTILS_LIBS}
+- baloocore
+- balooxapian
+-)
++# kde4_add_unit_test(searchplugintest NOGUI ${searchplugintest_SRCS})
++# target_link_libraries(searchplugintest
++# ${QT_QTTEST_LIBRARY}
++# ${KDE4_KDECORE_LIBS}
++# ${KDEPIMLIBS_AKONADI_LIBS}
++# ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
++# ${KDEPIMLIBS_KMIME_LIBS}
++# ${KDEPIMLIBS_KABC_LIBS}
++# ${XAPIAN_LIBRARIES}
++# ${KDEPIMLIBS_KPIMUTILS_LIBS}
++# baloocore
++# balooxapian
++# )
diff --git a/debian/patches/series b/debian/patches/series
index c9ba037..0ddfa30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+disable_tests_depending_on_revdep
upstream_catch_more_exceptions_emailsearchstore.patch
diff --git a/debian/rules b/debian/rules
index d7bfcf0..36b12af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,11 @@
include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
-override_dh_strip:
- dh_strip --dbg-package=baloo-dbg
-
+# disable unit testing on build, avoid the extra build-dependencies
.PHONY: override_dh_auto_test
override_dh_shlibdeps:
$(overridden_command) -- -xbaloo -xkde-runtime -xkdepim-runtime
+
+override_dh_strip:
+ dh_strip --dbg-package=baloo-dbg
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..bf0b633
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,8 @@
+Tests: testsuite
+Depends: @, @builddeps@,
+ xvfb, xauth, dbus-x11,
+ libqt4-sql-sqlite
+Restrictions: build-needed
+
+Tests: acc
+Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
new file mode 100755
index 0000000..fa0feb1
--- /dev/null
+++ b/debian/tests/testsuite
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+xvfb-run -a --server-args="-screen 0 1024x768x24" \
+ dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100755
index 0000000..7e49196
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,8 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+kdeinit4
+dh_auto_test
+ret=$?
+kdeinit4_shutdown
+exit $ret
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..4690a4c
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://download.kde.org/stable/([\d.]+)/src/baloo-([\d.]+).tar.xz
--
baloo packaging
More information about the pkg-kde-commits
mailing list