[SCM] attica packaging branch, master, updated. debian/5.37.0-2-104-gbedaaba

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/attica.git;a=commitdiff;h=b8c9e84

The following commit has been merged in the master branch:
commit b8c9e8448685201e1058bfa1afcb6150a8eb2507
Merge: 19c8e162bec4d5139b7fb907d340e2cb52372671 9cac8f0a65f82ba94df83d2c7e381a000fcf72a2
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Sep 29 15:15:20 2015 -0700

    Fix merge.

 debian/.gitattributes           |   1 +
 debian/changelog                |  73 +++++++++++++
 debian/control                  |  17 +--
 debian/copyright                |   5 +-
 debian/libkf5attica-dev.acc.in  |  20 ++++
 debian/libkf5attica-dev.install |   3 +-
 debian/libkf5attica5.symbols    | 230 +---------------------------------------
 debian/tests/acc                |  11 ++
 debian/tests/control            |   6 ++
 debian/tests/testsuite          |   3 +
 10 files changed, 130 insertions(+), 239 deletions(-)

diff --cc debian/changelog
index 6efc901,c08a4ce..e60c9ec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,52 +1,59 @@@
 +attica-kf5 (5.9.0-0ubuntu2) UNRELEASED; urgency=medium
 +
 +  * Fix control line 9 failure. 
++  * Fix merge. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 29 Sep 2015 15:12:00 -0700
 +
+ attica-kf5 (5.14.0-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Clive Johnston <clivejo at aol.com>  Thu, 17 Sep 2015 13:03:00 +0100
+ 
+ attica-kf5 (5.13.0-0ubuntu1) wily; urgency=medium
+ 
+   [ José Manuel Santamaría Lema ]
+   * Update symbols file:
+     - Mark as optional the previously non-optional symbols gone after building
+       with gcc 5
+     - Keep the optional symbols gone after building with gcc 5
+ 
+   [ Jonathan Riddell ]
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 12:45:37 +0200
+ 
+ attica-kf5 (5.12.0-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+   * Vivid backport. 
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 14:22:16 +0200
+ 
+ attica-kf5 (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 25 Jun 2015 16:48:15 +0200
+ 
+ attica-kf5 (5.10.0-0ubuntu1) wily; urgency=medium
+ 
+   [ Maximiliano Curia ]
+   * New upstream release (5.10.0).
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:53:43 +0200
+ 
+ attica-kf5 (5.9.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.9.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 23 Apr 2015 08:25:43 +0200
+ 
  attica-kf5 (5.9.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index c3f9454,013355b..9bc3055
--- a/debian/control
+++ b/debian/control
@@@ -3,14 -3,15 +3,15 @@@ Section: lib
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
- Build-Depends: cmake,
-                debhelper (>= 9.0.0),
-                extra-cmake-modules (>= 1.8.0),
+ Build-Depends: cmake (>= 2.8.12),
+                debhelper (>= 9),
+                extra-cmake-modules (>= 5.14.0~),
 -               pkg-kde-tools (>= 0.15.15ubuntu1~),
 +               pkg-kde-tools (>= 0.15.15~),
-                qtbase5-dev
- Standards-Version: 3.9.5
+                qtbase5-dev (>= 5.4)
+ Standards-Version: 3.9.6
+ XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/kdesupport/attica
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/attica.git
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/attica.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/attica.git
  
  Package: libkf5attica-dev

-- 
attica packaging