[SCM] kitemmodels packaging branch, master, updated. d2310c92e4a892ad513a4f8dfee27e0b400e12e2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8e98bba62900a71bca2a95b5c109304dc8d0d97d
Merge: 87c8a4aedcc60609ee118f8ff808f4f7d32791ec e33789ceac0ad94e2e1c452310811dc78e0d51dc
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Mar 3 10:18:07 2015 +0100

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

 debian/changelog                 | 34 ++++++++++++++++++++++++++++++++++
 debian/control                   |  2 +-
 debian/libkf5itemmodels5.symbols |  3 +--
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 967f85b,c64d26f..3a49ccf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,37 +1,55 @@@
 +kitemmodels (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:38:25 +0100
 +
+ kitemmodels (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:17:39 +0100
+ 
 +kitemmodels (5.6.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.6.0).
 +  * Bump build dependencies to build against the experimental versions.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update install files.
 +  * Update build dependencies to follow cmake.
 +  * Update copyright information.
 +  * Add basic autopkgtests support.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 23 Jan 2015 15:12:16 +0100
 +
+ kitemmodels (5.6.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 06 Jan 2015 19:47:32 +0100
+ 
+ kitemmodels (5.5.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 11:12:19 +0100
+ 
+ kitemmodels (5.4.0-0ubuntu1) vivid; urgency=medium
+ 
+   [ Harald Sitter ]
+   * Update symbols for i386,amd64
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Nov 2014 15:02:41 +0100
+ 
+ kitemmodels (5.3.0-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 Oct 2014 11:12:20 +0100
+ 
  kitemmodels (5.2.0-0ubuntu1) utopic; urgency=medium
  
    * New upstream release
diff --cc debian/control
index fcbe86c,d2bcd77..c7d6a26
--- a/debian/control
+++ b/debian/control
@@@ -3,17 -3,16 +3,17 @@@ 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,
 +Build-Depends: cmake (>= 2.8.12),
                 dbus-x11,
 -               debhelper (>= 9.0.0),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
+                extra-cmake-modules (>= 1.7.0),
                 openbox,
                 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/kitemmodels
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kitemmodels.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kitemmodels.git

-- 
kitemmodels packaging