[SCM] sonnet packaging branch, master, updated. debian/5.37.0-2-100-g6ea1571

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 1388d095916789dae482d482af29a6b43a75b9ff
Merge: be8d56d4800af60e67d116c16c8f1f77fadfdd45 b9b6de2338bdcc462b96bb8ad29c8d7fa5085e0d
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Sep 23 15:26:31 2016 +0200

    Merging debian/5.25.0-1 into Neon/unstable
    
    NOCI

 debian/changelog                    | 48 +++++++++++++++++++++++++++++++++++++
 debian/control                      | 48 +++++++++++++++++++++++++++----------
 debian/libkf5sonnet-dev-bin.install |  2 ++
 debian/libkf5sonnet-dev.install     |  2 --
 4 files changed, 85 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index 7fe18c7,a78f330..c83261a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,45 -1,51 +1,93 @@@
 +sonnet (5.26.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 12 Sep 2016 08:35:58 +0000
 +
+ sonnet (5.25.0-1) unstable; urgency=medium
+ 
+   [ Automatic packaging ]
+   * Update build-deps and deps with the info from cmake
+ 
+   [ Maximiliano Curia ]
+   * Bump group breaks (5.25)
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 18 Aug 2016 17:17:52 +0200
+ 
 +sonnet (5.25.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Sat, 13 Aug 2016 20:17:05 +0000
 +
 +sonnet (5.24.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Jul 2016 07:43:19 +0000
 +
+ sonnet (5.23.0-1) unstable; urgency=medium
+ 
+   [ Automatic packaging ]
+   * Update build-deps and deps with the info from cmake
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 18 Jun 2016 08:32:31 +0200
+ 
 +sonnet (5.23.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 13 Jun 2016 09:40:31 +0000
 +
+ sonnet (5.22.0-2) unstable; urgency=medium
+ 
+   * Release to unstable.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 22 May 2016 08:52:20 +0200
+ 
+ sonnet (5.22.0-1) experimental; urgency=medium
+ 
+   [ Automatic packaging ]
+   * Update build-deps and deps with the info from cmake
+ 
+   [ Maximiliano Curia ]
+   * Add a dev-bin package for the parsetrigrams cross building helper
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 18 May 2016 23:42:06 +0200
+ 
 +sonnet (5.22.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Tue, 17 May 2016 07:37:13 +0000
 +
+ sonnet (5.21.0-1) experimental; urgency=medium
+ 
+   [ Maximiliano Curia ]
+   * Replace the "Historical name" ddeb-migration by its "Modern, clearer" replacement dbgsym-migration.
+   * Add upstream metadata (DEP-12)
+   * debian/control: Update Vcs-Browser and Vcs-Git fields
+   * Update acc test script
+   * uscan no longer supports more than one main upstream tarball being listed
+ 
+   [ Automatic packaging ]
+   * Update build-deps and deps with the info from cmake
+   * Bump Standards-Version to 3.9.8
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 05 May 2016 18:50:33 +0200
+ 
 +sonnet (5.21.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Apr 2016 09:24:37 +0000
 +
 +sonnet (5.20.0-0neon) wily; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Fri, 01 Apr 2016 11:09:19 +0000
 +
  sonnet (5.19.0-1) experimental; urgency=medium
  
    * New upstream release (5.19.0).
diff --cc debian/control
index b9f068e,5d38a8e..0ab87d1
--- a/debian/control
+++ b/debian/control
@@@ -10,10 -10,9 +10,10 @@@ Build-Depends: aspell
                 hspell,
                 libaspell-dev,
                 libhunspell-dev,
 +               libvoikko-dev,
                 pkg-config,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
-                qtbase5-dev (>= 5.4),
+                qtbase5-dev (>= 5.5.0~),
                 qttools5-dev (>= 5.4),
                 qttools5-dev-tools (>= 5.4),
                 zlib1g-dev
@@@ -36,7 -35,20 +36,22 @@@ Description: spell checking library fo
   Frameworks 5.
   .
   This package contains development files for building software that uses
-  libraries from the Sonnet framework
+  libraries from the Sonnet framework.
+ Breaks: libkf5khtml-dev (<< 5.25), libkf5textwidgets-dev (<< 5.25)
+ 
+ Package: libkf5sonnet-dev-bin
+ Section: libdevel
+ Architecture: any
+ Multi-Arch: foreign
+ Depends: ${misc:Depends}, ${shlibs:Depends}
++Breaks: libkf5sonnet-dev (<< ${source:Version}~ciBuild)
++Replaces: libkf5sonnet-dev (<< ${source:Version}~ciBuild)
+ Description: spell checking library for Qt, devel binaries
+  Sonnet is a Qt based library that offers easy access to spell
+  checking using various plugin based backends.  It is part of KDE
+  Frameworks 5.
+  .
+  This package contains the utility programs related to the Sonnet framework.
  
  Package: libkf5sonnetcore5
  Section: libs
diff --cc debian/libkf5sonnet-dev-bin.install
index 0000000,0d243ba..21b3b17
mode 000000,100644..100644
--- a/debian/libkf5sonnet-dev-bin.install
+++ b/debian/libkf5sonnet-dev-bin.install
@@@ -1,0 -1,1 +1,2 @@@
++usr/bin/gentrigrams
+ usr/bin/parsetrigrams

-- 
sonnet packaging