[SCM] kfilemetadata packaging branch, master, updated. debian/4.13.1-1-17-gc5df8bb

Tue Jul 29 08:37:13 UTC 2014

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

The following commit has been merged in the master branch:
commit bd66d91711d266c7351959560cfc5580a577b0a6
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Fri Jun 13 15:45:03 2014 +0200

    * Merge with debian, no remaining changes
---
 debian/changelog                    | 20 ++++++++++++++++
 debian/control                      | 48 +++++++++++++++++++++++--------------
 debian/copyright                    | 31 ++++++++++++++++++++++++
 debian/libkfilemetadata-dev.install |  4 ++--
 debian/libkfilemetadata4.install    |  9 +++----
 debian/rules                        |  6 ++---
 debian/tests/control                |  3 +++
 debian/tests/testsuite              |  3 +++
 debian/watch                        |  2 ++
 9 files changed, 98 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f7b865..fd68dae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+kfilemetadata (4:4.13.1-2ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with debian, no remaining changes
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 13 Jun 2014 15:31:50 +0200
+
+kfilemetadata (4:4.13.1-2) UNRELEASED; urgency=medium
+
+  * Improve copyright information, thanks to Scott Kitterman.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 19 May 2014 14:17:12 +0200
+
+kfilemetadata (4:4.13.1-1) unstable; urgency=medium
+
+  * Initial release, based on the kubuntu packages.
+  * Add autopkgtests.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 16 May 2014 20:27:37 +0200
+
 kfilemetadata (4:4.13.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream KDE Software Compilation release
@@ -25,3 +44,4 @@ kfilemetadata (4:4.12.90-0ubuntu1) trusty; urgency=low
   * New upstream beta release
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 10:55:44 +0000
+
diff --git a/debian/control b/debian/control
index 04696bb..1b0777c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,27 +1,37 @@
 Source: kfilemetadata
 Priority: optional
-Maintainer: Rohan Garg <rohangarg at kubuntu.org>
-Build-Depends: debhelper (>= 9.0.0), cmake,
- pkg-kde-tools,
- kdelibs5-dev (>= 4:4.13.0),
- libpoppler-qt4-dev,
- libtag1-dev,
- libexiv2-dev,
- libepub-dev,
- libavcodec-dev,
- libavformat-dev,
- libavdevice-dev,
- libswscale-dev,
- libqmobipocket-dev
-Standards-Version: 3.9.4
+Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
+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),
+               kdelibs5-dev (>= 4:4.13.0),
+               libavcodec-dev,
+               libavdevice-dev,
+               libavformat-dev,
+               libepub-dev,
+               libexiv2-dev,
+               libpoppler-qt4-dev,
+               libqmobipocket-dev,
+               libswscale-dev,
+               libtag1-dev,
+               pkg-kde-tools
+Standards-Version: 3.9.5
 Section: libs
+XS-Testsuite: autopkgtest
 Homepage: http://projects.kde.org/kfilemetadata
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kfilemetadata
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kfilemetadata
+X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kfilemetadata.git
+X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kfilemetadata.git
 
 Package: libkfilemetadata-dev
 Section: libdevel
 Architecture: any
-Depends: libkfilemetadata4 (= ${binary:Version}), ${shlibs:Depends},
- ${misc:Depends}
+Depends: libkfilemetadata4 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: library for extracting file metadata -- development files
  A library for extracting file metadata -- development headers and
  cmake files.
@@ -29,7 +39,7 @@ Description: library for extracting file metadata -- development files
 Package: libkfilemetadata4
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library for extracting file metadata
  A library for extracting file metadata
 
@@ -37,6 +47,8 @@ Package: kfilemetadata-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, libkfilemetadata4 (= ${binary:Version})
+Depends: libkfilemetadata4 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: library for extracting file metadata -- debug symbols
  A library for extracting file metadata -- debug symbols
diff --git a/debian/copyright b/debian/copyright
index a01900f..6668577 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,12 +14,43 @@ Copyright: © 2012-2014 Vishesh Handa <me at vhanda.in>
            © 2008 Jakub Stachowski <qbast at go2.pl>
 License: LGPL-2.1+
 
+Filse: autotests/indexerextractortests.cpp
+       autotests/indexerextractortests.h
+       src/extractionresult.cpp
+       src/extractionresult.h
+       src/propertyinfo.cpp
+       src/propertyinfo.h
+Copyright: 2013, David Edmundson <davidedmundson at kde.org>
+           2013-2014, Vishesh Handa <me at vhanda.in>
+License: LGPL-2.1 or LGPL-3 or later 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
+ License as published by the Free Software Foundation; either
+ version 2.1 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 6 of version 3 of the license.
+ .
+ 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
+ Lesser General Public License for more details.
+ .
+ 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/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1, also on
+ Debian systems, the complete text of the GNU Lesser General Public License
+ version 3 can be found in /usr/share/common-licenses/LGPL-3.
+
 Files: src/kfilemetadata_export.h
 Copyright: © 2007 David Faure <faure at kde.org>
 License: LGPL-2
 
 Files: debian/*
 Copyright: Rohan Garg <rohangarg at kubuntu.org>
+           2014, Maximiliano Curia <maxy at debian.org>
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
diff --git a/debian/libkfilemetadata-dev.install b/debian/libkfilemetadata-dev.install
index 8288075..a3af1ff 100644
--- a/debian/libkfilemetadata-dev.install
+++ b/debian/libkfilemetadata-dev.install
@@ -1,3 +1,3 @@
-usr/include/*
-usr/lib/cmake/
+usr/include/kfilemetadata/
+usr/lib/cmake/KFileMetaData/
 usr/lib/libkfilemetadata.so
diff --git a/debian/libkfilemetadata4.install b/debian/libkfilemetadata4.install
index 6ea54e4..6d6b8f4 100644
--- a/debian/libkfilemetadata4.install
+++ b/debian/libkfilemetadata4.install
@@ -1,4 +1,5 @@
-usr/lib/libkfilemetadata.so.4*
-usr/lib/kde4/
-usr/share/kde4/services/
-usr/share/kde4/servicetypes/
+usr/lib/kde4/kfilemetadata_*
+usr/lib/libkfilemetadata.so.4
+usr/lib/libkfilemetadata.so.4.*
+usr/share/kde4/services/kfilemetadata_*
+usr/share/kde4/servicetypes/kfilemetadata*
diff --git a/debian/rules b/debian/rules
index b5ee364..819fce9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,8 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-%:
-	dh $@
+# disable unit testing on build, avoid the extra build-dependencies
+.PHONY: override_dh_auto_test
 
 override_dh_strip:
 	dh_strip --dbg-package=kfilemetadata-dbg
-
-.PHONY: override_dh_auto_test
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..a8d28d3
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: testsuite
+Depends: @, @builddeps@, build-essential
+Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
new file mode 100755
index 0000000..dabe645
--- /dev/null
+++ b/debian/tests/testsuite
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+dh_auto_test
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..4488a0c
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://download.kde.org/stable/([\d.]+)/src/kfilemetadata-([\d.]+).tar.xz

-- 
kfilemetadata packaging

