[SCM] ktextwidgets packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-7-gff925aa

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit ff925aa82a562f673ae63011d4ad50d3bd0c3132
Merge: 6498a040c910b0fe62c2f665785629c2b7c9e8ca 20735b7e58dbc39514b7241c27250333ebbed0a5
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Jul 1 23:39:43 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series

 debian/changelog                  | 13 ++++++++++---
 debian/control                    | 24 ++++++++++++++++++++++++
 debian/libkf5textwidgets5.symbols |  5 ++++-
 debian/patches/series             |  0
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index f64a65c,700a05e..47324c1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,12 +1,26 @@@
- ktextwidgets (5.10.0-0ubuntu2) UNRELEASED; urgency=medium
+ ktextwidgets (5.11.0-1) unstable; urgency=medium
  
 +  * Remove old patch Add-missing-license-file-COPYING.LGPL-2.patch
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 15 Jun 2015 06:36:01 +0200
 +
 +ktextwidgets (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
    * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+   * Remove upstream patch: Add-missing-license-file-COPYING.LGPL-2.patch
+   * Update symbols files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 20:28:41 +0200
+ 
++ktextwidgets (5.10.0-0ubuntu2) UNRELEASED; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:02:23 +0200
 +
  ktextwidgets (5.9.0-1) experimental; urgency=medium
  
    * Team upload.
@@@ -103,14 -96,14 +110,14 @@@ ktextwidgets (5.2.0-0ubuntu1) utopic; u
  
    [ Scarlett Clark ]
    * Cleanup copyright + move copyright extra details to comment to silence
--    space-in-std-shortname-in-dep5-copyright lintian error.  
++    space-in-std-shortname-in-dep5-copyright lintian error.
  
   -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 22 Sep 2014 19:50:52 +0200
  
  ktextwidgets (5.1.0-0ubuntu1) utopic; urgency=medium
  
    * New upstream release
--  * Patch symbols with batchpatch 
++  * Patch symbols with batchpatch
  
   -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 05 Aug 2014 17:26:22 +0200
  
diff --cc debian/control
index 3a577e4,37e9190..41a63e7
--- a/debian/control
+++ b/debian/control
@@@ -5,17 -5,17 +5,31 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.10.20130309),
                 debhelper (>= 9),
++<<<<<<< HEAD
 +               extra-cmake-modules (>= 5.10.0),
 +               libkf5completion-dev (>= 5.10.0),
 +               libkf5config-dev (>= 5.10.0),
 +               libkf5configwidgets-dev (>= 5.10.0),
 +               libkf5i18n-dev (>= 5.10.0),
 +               libkf5iconthemes-dev (>= 5.10.0),
 +               libkf5itemviews-dev (>= 5.10.0),
 +               libkf5service-dev (>= 5.10.0),
 +               libkf5sonnet-dev (>= 5.10.0),
 +               libkf5widgetsaddons-dev (>= 5.10.0),
 +               libkf5windowsystem-dev (>= 5.10.0),
++=======
+                extra-cmake-modules (>= 5.11.0~),
+                libkf5completion-dev (>= 5.11.0~),
+                libkf5config-dev (>= 5.11.0~),
+                libkf5configwidgets-dev (>= 5.11.0~),
+                libkf5i18n-dev (>= 5.11.0~),
+                libkf5iconthemes-dev (>= 5.11.0~),
+                libkf5itemviews-dev (>= 5.7.0),
+                libkf5service-dev (>= 5.11.0~),
+                libkf5sonnet-dev (>= 5.11.0~),
+                libkf5widgetsaddons-dev (>= 5.11.0~),
+                libkf5windowsystem-dev (>= 5.11.0~),
++>>>>>>> master
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),
                 xauth,
@@@ -29,13 -29,13 +43,23 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5textwidgets-dev
  Section: libdevel
  Architecture: any
++<<<<<<< HEAD
 +Depends: libkf5completion-dev (>= 5.10.0),
 +         libkf5configwidgets-dev (>= 5.10.0),
 +         libkf5iconthemes-dev (>= 5.10.0),
 +         libkf5service-dev (>= 5.10.0),
 +         libkf5sonnet-dev (>= 5.10.0),
 +         libkf5textwidgets5 (= ${binary:Version}),
 +         libkf5windowsystem-dev (>= 5.10.0),
++=======
+ Depends: libkf5completion-dev (>= 5.11.0~),
+          libkf5configwidgets-dev (>= 5.11.0~),
+          libkf5iconthemes-dev (>= 5.11.0~),
+          libkf5service-dev (>= 5.11.0~),
+          libkf5sonnet-dev (>= 5.11.0~),
+          libkf5textwidgets5 (= ${binary:Version}),
+          libkf5windowsystem-dev (>= 5.11.0~),
++>>>>>>> master
           qtbase5-dev (>= 5.4),
           ${misc:Depends}
  Description: development files for ktextwidgets

-- 
ktextwidgets packaging