[SCM] kconfigwidgets packaging branch, master, updated. d3d5f4dda87dd1eb4fbf82e407da656224e3738f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6e7b051926baac4c0a4177faebde56ddd7365918
Merge: ae45d405fea52220e620bd6b92d88fed703c1bf6 6f3c6aef923e38a4a5579a5c56e8451e6fec736e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 10:12:17 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/.gitattributes |  1 +
 debian/changelog      |  8 +++++++-
 debian/control        | 30 +++++++++++++++---------------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --cc debian/.gitattributes
index 0000000,0000000..6a03163
new file mode 100644
--- /dev/null
+++ b/debian/.gitattributes
@@@ -1,0 -1,0 +1,1 @@@
++changelog merge=dpkg-mergechangelogs
diff --cc debian/changelog
index ec418f1,89c16b7..97951c9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,9 +1,28 @@@
 +kconfigwidgets (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:39:54 +0100
 +
+ kconfigwidgets (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:50:41 +0100
+ 
 +kconfigwidgets (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update install files.
 +  * Update watch file.
 +  * Update copyright information.
 +  * Add basic autopkgtests support.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 26 Jan 2015 17:33:05 +0100
 +
  kconfigwidgets (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
@@@ -52,7 -39,7 +58,7 @@@ kconfigwidgets (5.1.0-0ubuntu1) utopic
  
    * New upstream release
    * Removed upstream_Dont_construct_bugus_objects.patch applied upstream
--  * Patched symbols using batchpatch. 
++  * Patched symbols using batchpatch.
  
   -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 05 Aug 2014 17:15:39 +0200
  
diff --cc debian/control
index f28f28c,65fb063..b3a5db3
--- a/debian/control
+++ b/debian/control
@@@ -3,26 -3,27 +3,26 @@@ 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),
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
                 docbook-xml,
                 docbook-xsl,
-                extra-cmake-modules (>= 1.6.0),
-                kdoctools-dev (>= 5.6.0),
-                libkf5auth-dev (>= 5.6.0),
-                libkf5codecs-dev (>= 5.6.0),
-                libkf5config-dev (>= 5.6.0),
-                libkf5coreaddons-dev (>= 5.6.0),
-                libkf5guiaddons-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
-                libkf5widgetsaddons-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
+                kdoctools-dev (>= 5.7.0),
 -               libkf5archive-dev (>= 5.7.0),
+                libkf5auth-dev (>= 5.7.0),
+                libkf5codecs-dev (>= 5.7.0),
+                libkf5config-dev (>= 5.7.0),
+                libkf5coreaddons-dev (>= 5.7.0),
+                libkf5guiaddons-dev (>= 5.7.0),
+                libkf5i18n-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
+                libkf5widgetsaddons-dev (>= 5.7.0),
                 libxml2-utils,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev,
 +               qtbase5-dev (>= 5.2.0),
                 xauth,
                 xvfb
 -Standards-Version: 3.9.5
 +Standards-Version: 3.9.6
 +XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/frameworks/kconfigwidgets
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kconfigwidgets.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kconfigwidgets.git
@@@ -30,13 -31,13 +30,13 @@@
  Package: libkf5configwidgets-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5auth-dev (>= 5.6.0),
-          libkf5codecs-dev (>= 5.6.0),
-          libkf5config-dev (>= 5.6.0),
 -Depends: libkf5auth-dev,
 -         libkf5codecs-dev,
 -         libkf5config-dev,
++Depends: libkf5auth-dev (>= 5.7.0),
++         libkf5codecs-dev (>= 5.7.0),
++         libkf5config-dev (>= 5.7.0),
           libkf5configwidgets5 (= ${binary:Version}),
-          libkf5guiaddons-dev (>= 5.6.0),
-          libkf5i18n-dev (>= 5.6.0),
-          libkf5widgetsaddons-dev (>= 5.6.0),
 -         libkf5guiaddons-dev,
 -         libkf5i18n-dev,
 -         libkf5widgetsaddons-dev,
++         libkf5guiaddons-dev (>= 5.7.0),
++         libkf5i18n-dev (>= 5.7.0),
++         libkf5widgetsaddons-dev (>= 5.7.0),
           ${misc:Depends}
  Description: development files for kconfigwidgets
   KConfigWidgets provides easy-to-use classes to create

-- 
kconfigwidgets packaging