[SCM] kdelibs4support packaging branch, master, updated. 1110429324ffd0da60b6c84d55d676542d6df443

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdelibs4support.git;a=commitdiff;h=3c36564

The following commit has been merged in the master branch:
commit 3c3656411156e7ca75ce97c07def53593845e2a0
Merge: 1862d711fec401805a8209dd6f4c87c72234d57e 0fc8c9b4ab962772126c9e9ef9732c85374f8ad6
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:04:37 2015 +0200

    Merge commit '0fc8c9b4ab962772126c9e9ef9732c85374f8ad6'
    
    Conflicts:
    	debian/control

 debian/changelog | 18 ++++++++++++++++++
 debian/control   |  4 ++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 9aaf6d7,2e94c91..5c75821
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,21 +1,55 @@@
 +kdelibs4support (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:22:31 +0200
 +
+ kdelibs4support (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 23:21:43 +0200
+ 
 +kdelibs4support (5.8.0-1) experimental; urgency=medium
 +
 +  * Add missing -dev dependency (cmake files depend on kinit).
 +  * New upstream release (5.7.0).
 +  * New upstream release (5.8.0).
 +  * Refresh patches.
 +  * New patch: standarddirs_test
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Mar 2015 17:45:50 +0100
 +
+ kdelibs4support (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:48:00 +0100
+ 
+ kdelibs4support (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 17:03:42 +0100
+ 
 +kdelibs4support (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.
 +  * Set -data package as arch all.
 +  * Update copyright information.
 +  * Update install files.
 +  * Update watch file.
 +  * Add basic autopkgtests support.
 +  * Add missing -dev dependencies.
 +  * New patch: incomplete_header.
 +  * New patch: install_missing_header.
 +  * New patch: renamed_header.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Feb 2015 20:23:02 +0100
 +
  kdelibs4support (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 7ca5079,6d65ffc..3758f06
--- a/debian/control
+++ b/debian/control
@@@ -173,8 -168,8 +173,10 @@@ Description: Porting aid from KDELibs4
  
  Package: libkf5kdelibs4support5-dbg
  Section: debug
++Priority: extra
  Architecture: any
  Depends: libkf5kdelibs4support5 (= ${binary:Version}), ${misc:Depends}
++Recommends: libkf5kdelibs4support5-bin (= ${binary:Version})
  Description: debug symbols for kde4support
   This framework provides code and utilities to ease
   the transition from kdelibs 4 to KDE Frameworks 5.
@@@ -195,5 -190,5 +197,3 @@@
   variable correctly.
   .
   Contains debug symbols for kde4support.
--Recommends: libkf5kdelibs4support5-bin (= ${binary:Version})
--Priority: extra

-- 
kdelibs4support packaging