[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:20 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/baloo.git;a=commitdiff;h=9542019
The following commit has been merged in the master branch:
commit 9542019d6b397beb4a8416da9e5a970538b8d90b
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Wed Mar 12 07:24:52 2014 -0700
[ Jonathan Riddell ]
[ Scarlett Clark ]
* Fix copyright
* Create and fix symbols.
added:
debian/libbaloofiles4.lintian-overrides
debian/libbaloopim4.lintian-overrides
debian/libbalooxapian4.lintian-overrides
modified:
debian/changelog
debian/copyright
debian/libbaloopim4.symbols
debian/libbalooxapian4.symbols
debian/rules
---
debian/changelog | 5 ++
debian/copyright | 115 ++++++++++++++++++++++++++++++-
debian/libbaloofiles4.lintian-overrides | 1 +
debian/libbaloopim4.lintian-overrides | 1 +
debian/libbaloopim4.symbols | 3 +-
debian/libbalooxapian4.lintian-overrides | 1 +
debian/libbalooxapian4.symbols | 3 +-
debian/rules | 3 +
8 files changed, 125 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dfeb4ae..b6535d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
baloo (4:4.12.80-0ubuntu1) UNRELEASED; urgency=low
+ [ Jonathan Riddell ]
* Initial release
+ [ Scarlett Clark ]
+ * Fix copyright
+ * Create and fix symbols.
+
-- Jonathan Riddell <jriddell at ubuntu.com> Mon, 10 Mar 2014 10:41:50 +0000
diff --git a/debian/copyright b/debian/copyright
index 8a5ab83..7c42326 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,12 @@ Upstream-Name: baloo
Source: http://community.kde.org/Baloo
Files: *
-Copyright: 2013 Vishesh Handa <me at vhanda.in>
+Copyright: 2010, 2010-13, 2010-14, 2011-2014 Vishesh Handa <me at vhanda.in>
+ 2007-2011 Sebastian Trueg <trueg at kde.org>
+ 2013 Simeon Bird <bladud at gmail.com>
+ 2013 Daniel Vrátil <dvratil at redhat.com>
+ 2014 Christian Mollekopf <mollekopf at kolabsys.com>
+ 2014 Laurent Montel <montel at kde.org>
License: LGPL 2.1 or 3 or approved by KDE e.V.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -21,7 +26,71 @@ License: LGPL 2.1 or 3 or approved by KDE e.V.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
-Files: autotests/search.cpp
+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
+Copyright: 2008 Sebastian Trueg <trueg at kde.org>
+ 2010-14 Vishesh Handa <me at vhanda.in>
+License: LGPL-2
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License or (at your option) version 3 or any later version
+ accepted by the membership of KDE e.V. (or its successor approved
+ by the membership of KDE e.V.), which shall act as a proxy
+ defined in Section 14 of version 3 of the license.
+ .
+ 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, see <http://www.gnu.org/licenses/>.
+
+Files: src/core/core_export.h
+ src/file/kinotify.cpp
+ src/file/kinotify.h
+ src/file/lib/file_export.h
+ src/pim/lib/pim_export.h
+ src/xapian/xapian_export.h
+Copyright: 2007 David Faure <faure at kde.org>
+ 2007-2010 Sebastian Trueg <trueg at kde.org>
+ 2012 Vishesh Handa <me at vhanda.in>
+License: 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 as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ 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,
+ 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
@@ -32,6 +101,7 @@ Files: autotests/search.cpp
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.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -49,8 +119,47 @@ License: GPL 2 or 3 or approved by KDE e.V.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Files: debian/*
+Files: src/file/fileexcludefilters.h
+ src/file/kcm/kcm.h
+ src/file/kcm/kcm.cpp
+ src/file/indexscheduler.cpp
+ src/file/metadatamover.cpp
+ src/file/metadatamover.h
+ src/file/fileindexer.cpp
+ src/file/priority.cpp
+ src/file/fileindexerconfig.h
+ src/file/filewatch.cpp
+ src/file/fileindexer.h
+ src/file/indexscheduler.h
+ src/file/fileexcludefilters.cpp
+ src/file/eventmonitor.h
+ src/file/eventmonitor.cpp
+ src/file/filewatch.h
+ src/file/fileindexerconfig.cpp
+ src/file/priority.h
+ src/kioslaves/timeline/timelinetools.h
+Copyright: 2007-2010 Sebastian Trueg <trueg at kde.org>
+ 2012-2014 Vishesh Handa <me at vhanda.in>
+License: GPL-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,
+ Boston, MA 02110-1301, USA.
+
+Files: src/xapian/xapian_export.h
+ src/core/core_export.h
+ debian/*
Copyright: 2014 Jonathan Riddell <jriddell at ubuntu.com>
+ 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian/libbaloofiles4.lintian-overrides b/debian/libbaloofiles4.lintian-overrides
new file mode 100644
index 0000000..84dac92
--- /dev/null
+++ b/debian/libbaloofiles4.lintian-overrides
@@ -0,0 +1 @@
+libbaloofiles4: symbols-declares-dependency-on-other-package baloo
diff --git a/debian/libbaloopim4.lintian-overrides b/debian/libbaloopim4.lintian-overrides
new file mode 100644
index 0000000..edaf1a0
--- /dev/null
+++ b/debian/libbaloopim4.lintian-overrides
@@ -0,0 +1 @@
+libbaloopim4: symbols-declares-dependency-on-other-package baloo
diff --git a/debian/libbaloopim4.symbols b/debian/libbaloopim4.symbols
index c2d4d52..166dfd0 100644
--- a/debian/libbaloopim4.symbols
+++ b/debian/libbaloopim4.symbols
@@ -1,6 +1,5 @@
# SymbolsHelper-Confirmed: 4:4.12.80 amd64
-libbaloopim.so.4 libbaloopim4 #MINVER#
-| libbaloopim4 #MINVER#, baloo
+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
diff --git a/debian/libbalooxapian4.lintian-overrides b/debian/libbalooxapian4.lintian-overrides
new file mode 100644
index 0000000..8fd6e10
--- /dev/null
+++ b/debian/libbalooxapian4.lintian-overrides
@@ -0,0 +1 @@
+libbalooxapian4: symbols-declares-dependency-on-other-package baloo
diff --git a/debian/libbalooxapian4.symbols b/debian/libbalooxapian4.symbols
index 0ef7dd6..2948199 100644
--- a/debian/libbalooxapian4.symbols
+++ b/debian/libbalooxapian4.symbols
@@ -1,6 +1,5 @@
# SymbolsHelper-Confirmed: 4:4.12.80 amd64
-libbalooxapian.so.4 libbalooxapian4 #MINVER#
-| libbalooxapian4 #MINVER#, baloo
+libbalooxapian.so.4 libbalooxapian4 #MINVER#, baloo
_ZN5Baloo17XapianSearchStore11docForQueryEi at Base 4:4.12.80
_ZN5Baloo17XapianSearchStore13finalizeQueryERKN6Xapian5QueryE at Base 4:4.12.80
_ZN5Baloo17XapianSearchStore13toXapianQueryEN6Xapian5Query2opERK5QListINS_4TermEE at Base 4:4.12.80
diff --git a/debian/rules b/debian/rules
index 9c482e1..2fa261b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,3 +6,6 @@ override_dh_strip:
dh_strip --dbg-package=baloo-dbg
.PHONY: override_dh_auto_test
+
+override_dh_shlibdeps:
+ $(overridden_command) -- -xbaloo
--
baloo packaging
More information about the pkg-kde-commits
mailing list