[SCM] kaccounts-integration packaging branch, master, updated. 21f6f30fef7b45a4e894027d64eb0efb21aa48d0

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kaccounts-integration.git;a=commitdiff;h=26d809a

The following commit has been merged in the master branch:
commit 26d809aea67c49ce80e9a4e84230c681ac13f870
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Apr 23 16:49:53 2015 +0200

    Debian packaging
---
 debian/control                 | 30 +++++++++++++++++++-----------
 debian/copyright               |  4 ++--
 debian/libkaccounts-dev.acc.in | 20 ++++++++++++++++++++
 debian/rules                   |  2 --
 debian/tests/acc               | 11 +++++++++++
 debian/tests/control           |  7 +++++--
 6 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index 94b2be1..bdaa588 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: kaccounts-integration
 Section: kde
-Priority: extra
+Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
@@ -18,20 +18,25 @@ Build-Depends: cmake,
                libsignon-qt5-dev,
                pkg-kde-tools (>= 0.12),
                qtbase5-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-extras/kaccounts-integration.git/
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kaccounts-integration.git
+Homepage: https://projects.kde.org/projects/kde/kdenetwork/kaccounts-integration
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/kaccounts-integration.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/kaccounts-integration.git
 
 Package: libkaccounts1
+Section: libs
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: kaccounts-providers
 Breaks: kaccounts-integration (<= 0.0+git20141209.1543+15.04)
 Replaces: kaccounts-integration (<= 0.0+git20141209.1543+15.04)
-Description: library to administer web accounts
- For the sites and services across the Plasma desktop.
+Description: System to administer web accounts - shared library
+ Small system to administer web accounts for the sites and services across the
+ KDE desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others.
+ .
+ This package contains the shared library.
 
 Package: libkaccounts-dev
 Section: libdevel
@@ -41,8 +46,9 @@ Depends: libkaccounts1 (= ${binary:Version}),
          ${shlibs:Depends}
 Breaks: kaccounts-integration (<= 0.0+git20141209.1543+15.04)
 Replaces: kaccounts-integration (<= 0.0+git20141209.1543+15.04)
-Description: library to administer web accounts - development files
- For the sites and services across the Plasma desktop.
+Description: System to administer web accounts - development files
+ Small system to administer web accounts for the sites and services across the
+ KDE desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others.
  .
  This package contains development files.
 
@@ -52,16 +58,18 @@ Depends: signon-kwallet-extension,
          signon-plugin-oauth2,
          signon-ui-x11,
          signond,
+         libkaccounts1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: kaccounts-providers
-Description: system to administer web accounts
- For the sites and services across the Plasma desktop.
+Description: System to administer web accounts
+ Small system to administer web accounts for the sites and services across the
+ KDE desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others.
 
 Package: kaccounts-integration-dbg
-Architecture: any
 Section: debug
 Priority: extra
+Architecture: any
 Depends: kaccounts-integration (= ${binary:Version}), ${misc:Depends}
 Description: system to administer web accounts - debug symbols
  For the sites and services across the Plasma desktop.
diff --git a/debian/copyright b/debian/copyright
index 070b7f8..0fd2b27 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: signon-kwallet-extension
-Source: http://quickgit.kde.org/?p=signon-kwallet-extension.git
+Upstream-Name: kaccounts-integration
+Source: git://anongit.kde.org/signon-kwallet-extension.git
 
 Files: *
 Copyright: 2012-2013 Alejandro Fiestas Olivares <afiestas at kde.org>
diff --git a/debian/libkaccounts-dev.acc.in b/debian/libkaccounts-dev.acc.in
new file mode 100644
index 0000000..4e23d14
--- /dev/null
+++ b/debian/libkaccounts-dev.acc.in
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<descriptor>
+
+<version>
+    15.04.0
+</version>
+
+<headers>
+    /usr/include/KAccounts/
+</headers>
+
+<libs>
+    /usr/lib/@@DEB_HOST_MULTIARCH@@/libkaccounts.so
+</libs>
+
+<gcc_options>
+    -fPIC
+</gcc_options>
+
+</descriptor>
diff --git a/debian/rules b/debian/rules
index 3ef5b43..8731286 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,5 +4,3 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=kaccounts-integration-dbg
-
-.PHONY: override_dh_auto_test
diff --git a/debian/tests/acc b/debian/tests/acc
new file mode 100755
index 0000000..f8dc629
--- /dev/null
+++ b/debian/tests/acc
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+for in_file in debian/*.acc.in; do
+    out_file=${in_file%.in}
+    sed 's/@@DEB_HOST_MULTIARCH@@/'"${DEB_HOST_MULTIARCH}"'/' \
+        "${in_file}" > "${out_file}"
+done
+
+dh_acc
diff --git a/debian/tests/control b/debian/tests/control
index e7fde3c..efb8abb 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,7 @@
 Tests: testsuite
-Depends: @builddeps@, build-essential,
+Depends: @, @builddeps@, build-essential,
          xvfb, xauth, dbus-x11, openbox
-Restrictions: rw-build-tree
+Restrictions: build-needed
+
+Tests: acc
+Depends: @, dh-acc, exuberant-ctags

-- 
kaccounts-integration packaging