[SCM] kconfigwidgets packaging branch, master, updated. debian/5.37.0-2-96-gb5e51c0

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 70a301f2e0bba67340dee4c50f9c4727ea0bb1bd
Merge: e863f536ea70fbee6d50fa828b9f0fb422e5c4e9 3dab3264d4976884bf04485da7b978b75dd08e03
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 3 12:12:50 2016 +0200

    Merging master into Neon/unstable
    
    # Conflicts:
    #	debian/control

 debian/changelog                        | 13 +++++++++
 debian/control                          | 47 ++++++++++++---------------------
 debian/libkf5configwidgets-data.install |  1 -
 debian/rules                            |  2 +-
 debian/tests/acc                        |  7 +++++
 debian/upstream/metadata                |  7 +++++
 debian/watch                            |  1 -
 7 files changed, 45 insertions(+), 33 deletions(-)

diff --cc debian/changelog
index 75565b5,74d5135..a01c7b2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,16 +1,38 @@@
 +kconfigwidgets (5.21.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Apr 2016 09:23:01 +0000
 +
 +kconfigwidgets (5.20.0-0neon) wily; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Fri, 01 Apr 2016 11:05:12 +0000
 +
+ kconfigwidgets (5.19.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.19.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 13 Feb 2016 15:16:38 +0100
+ 
+ kconfigwidgets (5.18.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.17.0).
+   * New upstream release (5.18.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:34:37 +0100
+ 
 +kconfigwidgets (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release Xenial
 +
 +  [ Philip Muškovac ]
 +  * New upstream release
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 14:57:48 +0100
 +
  kconfigwidgets (5.16.0-1) unstable; urgency=medium
  
    * New upstream release (5.16.0).
diff --cc debian/libkf5configwidgets-data.install
index d329af4,d4cddfe..70eb324
--- a/debian/libkf5configwidgets-data.install
+++ b/debian/libkf5configwidgets-data.install
@@@ -1,3 -1,3 +1,2 @@@
  usr/bin/preparetips5
 -usr/share/locale/*/*/kconfigwidgets5.mo
 -usr/share/locale/*/kf5_entry.desktop
 +usr/share/locale/*
- 

-- 
kconfigwidgets packaging