[SCM] syntax-highlighting packaging branch, master, updated. debian/5.37.0-3-51-gabd7d44

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit fa824a4e88698ca31a33bda0e6f83b29b7cf317d
Merge: d80070adb4131d85612ae667587d91ba491eebc2 85008a40f8d82d1d7cbf0273e685b8cf2aa0ff2f
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Nov 2 16:06:18 2017 +0000

    merge debian

 debian/changelog                            | 80 +++++++++++------------------
 debian/control                              | 68 +++++++++++++++++-------
 debian/libkf5syntaxhighlighting-doc.install |  2 +
 debian/rules                                |  3 ++
 debian/upstream/metadata                    |  4 +-
 debian/watch                                |  2 +-
 6 files changed, 88 insertions(+), 71 deletions(-)

diff --cc debian/changelog
index d750a89,a2a709c..85d10c5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,68 -1,42 +1,48 @@@
 +ksyntax-highlighting (5.39.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Sun, 15 Oct 2017 11:48:05 +0000
 +
- ksyntax-highlighting (5.38.0-0neon) xenial; urgency=medium
+ ksyntax-highlighting (5.37.0-2) sid; urgency=medium
  
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Mon, 11 Sep 2017 13:32:23 +0000
- 
- ksyntax-highlighting (5.37.0-0neon) xenial; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Fri, 11 Aug 2017 15:18:38 +0000
- 
- ksyntax-highlighting (5.36.0-0neon) xenial; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Mon, 10 Jul 2017 17:16:04 +0000
- 
- ksyntax-highlighting (5.35.0-0neon) xenial; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Sun, 11 Jun 2017 20:38:41 +0000
- 
- ksyntax-highlighting (5.34.0-0neon) xenial; urgency=medium
+   * New revision
+   * Bump Standards-Version to 4.1.0.
+   * Update upstream metadata
+   * Release to sid
  
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Sun, 14 May 2017 17:44:08 +0000
- 
- ksyntax-highlighting (5.33.0-0neon) xenial; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Fri, 07 Apr 2017 16:26:50 +0000
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 03 Sep 2017 09:58:48 +0200
  
- ksyntax-highlighting (5.32.0-0neon) xenial; urgency=medium
+ ksyntax-highlighting (5.37.0-1) experimental; urgency=medium
  
-   * New release
+   * New upstream release (5.37.0).
+   * Update build-deps and deps with the info from cmake
+   * Bump group breaks (5.37)
+   * Add a libkf5syntaxhighlighting-doc package for the qch files
+   * Bump Standards-Version to 4.0.1.
+   * Set section for the doc package
+   * Release to experimental
  
-  -- Neon CI <neon at kde.org>  Sun, 12 Mar 2017 13:24:39 +0000
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Aug 2017 10:42:16 +0200
  
- ksyntax-highlighting (5.31.0-0neon) xenial; urgency=medium
+ ksyntax-highlighting (5.36.0-1) experimental; urgency=medium
  
-   * New release
+   [ Maximiliano Curia ]
+   * New upstream release (5.35.0).
+   * Bump Standards-Version to 4.0.0.
+   * Update build-deps and deps with the info from cmake
+   * Add qttools5-dev-tools missing build dep
+   * watch: Use https uris
+   * New upstream release (5.36.0).
+   * Bump group breaks (5.36)
+   * Update build-deps and deps with the info from cmake
  
-  -- Neon CI <neon at kde.org>  Mon, 13 Feb 2017 14:42:31 +0000
- 
- ksyntax-highlighting (5.30.0-0neon) xenial; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Mon, 16 Jan 2017 13:45:06 +0000
- 
- ksyntax-highlighting (5.29.0-0neon) xenial; urgency=medium
- 
-   * New release
+   [ Jonathan Riddell ]
+   * add libkf5syntaxhighlighting-data for translations
+   * fix depends
+   * add signature
  
-  -- Neon CI <neon at kde.org>  Fri, 09 Dec 2016 19:10:28 +0000
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 09 Jul 2017 23:41:20 +0200
  
  ksyntax-highlighting (5.28.0-1) unstable; urgency=medium
  
diff --cc debian/control
index a94e7b7,30773b0..dcfc72a
--- a/debian/control
+++ b/debian/control
@@@ -46,20 -62,9 +62,21 @@@ Description: Syntax highlighting Engin
   rendering (e.g. as HTML), supporting both integration
   with a custom editor as well as a ready-to-use
   QSyntaxHighlighter sub-class.
 +
 +Package: libkf5syntaxhighlighting-data
 +Architecture: all
 +Multi-Arch: foreign
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Description: Syntax highlighting Engine - translations
 + This is a stand-alone implementation of the Kate syntax
 + highlighting engine. It's meant as a building block for
 + text editors as well as for simple highlighted text
 + rendering (e.g. as HTML), supporting both integration
 + with a custom editor as well as a ready-to-use
 + QSyntaxHighlighter sub-class.
   .
-  This package provides the translations.
+  This package contains the qch documentation files.
+ Section: doc
  
  Package: libkf5syntaxhighlighting-tools
  Architecture: any
@@@ -75,3 -80,18 +92,18 @@@ Description: Syntax highlighting Engin
   QSyntaxHighlighter sub-class.
   .
   Provides additional tools for libkf5syntaxhighlighting5
+ 
+ Package: libkf5syntaxhighlighting5
+ Architecture: any
+ Multi-Arch: same
++Breaks: libkf5texteditor5 (<< 5.37)
+ Depends: libkf5syntaxhighlighting-data (= ${source:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends},
+ Description: Syntax highlighting Engine
+  This is a stand-alone implementation of the Kate syntax
+  highlighting engine. It's meant as a building block for
+  text editors as well as for simple highlighted text
+  rendering (e.g. as HTML), supporting both integration
+  with a custom editor as well as a ready-to-use
+  QSyntaxHighlighter sub-class.
 -Breaks: libkf5texteditor5 (<< 5.37)

-- 
syntax-highlighting packaging