[SCM] okteta packaging branch, master, updated. debian/4.14.2-1-34-gec3694d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/okteta.git;a=commitdiff;h=ec3694d

The following commit has been merged in the master branch:
commit ec3694d0bae2a533b71d5dec3aa5e50b23790a5d
Merge: dc9d93728e5eaf59a03d10f1fe595ac4f0b368fe f14988ec5e4a794900c2711065b02460cb45d56c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 20:53:32 2015 +0100

    Merge commit 'f14988ec5e4a794900c2711065b02460cb45d56c'
    
    Conflicts:
    	debian/control
    	debian/libkasten3okteta1controllers1.symbols
    	debian/patches/series

 debian/changelog                                   |   17 +
 debian/control                                     |   20 +-
 debian/libkasten3controllers3.symbols              |  809 ++-
 debian/libkasten3core3.symbols                     |  985 ++--
 debian/libkasten3gui3.symbols                      |  937 ++--
 debian/libkasten3okteta1controllers1.symbols       | 5262 ++++++++++----------
 debian/libkasten3okteta1core1.symbols              |  205 +-
 debian/libkasten3okteta1gui1.symbols               |  579 ++-
 debian/libokteta2core2.symbols                     |  421 +-
 debian/libokteta2gui2.symbols                      |  965 ++--
 debian/okteta-dev.install                          |    2 +-
 debian/patches/enable_debianabimanager.diff        |   20 -
 debian/patches/series                              |    2 -
 .../upstream_fix_installation_path_for_kasten      |   46 -
 14 files changed, 5089 insertions(+), 5181 deletions(-)

diff --cc debian/changelog
index 17bbb78,eb9e32c..84d19d4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,20 +1,37 @@@
 +okteta (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 12:21:01 +0100
 +
+ okteta (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream release
+ 
+   [ Harald Sitter ]
+   * Rip out ABIManager patch and versioning.
+     + KF5 based release had no ABI breakage yet so the symbols distrotion
+       caused by the ABI manager is more useless than anything
+     + The package is now CI'd by Kubuntu CI which means we'll be able to catch
+       BIC before release making sure upstream does a so-version bump
+ 
+   [ Scarlett Clark ]
+   * Add missing libqca-qt5-2-dev to build depends. 
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:21:57 -0700
+ 
 +okteta (4:14.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.2).
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Update copyright information.
 +  * New upstream patch: upstream_fix_installation_path_for_kasten
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 21 Feb 2015 11:02:20 +0100
 +
  okteta (4:14.12.2-0ubuntu3) vivid; urgency=medium
  
    * Update symbols files from build logs.
diff --cc debian/control
index a7a250b,2641200..e90ef7a
--- a/debian/control
+++ b/debian/control
@@@ -21,16 -18,13 +21,16 @@@ Build-Depends: cmake (>= 2.8.12)
                 libkf5kcmutils-dev,
                 libkf5newstuff-dev,
                 libkf5parts-dev,
 -               libqca-qt5-2-dev,
 +               libkf5service-dev,
 +               libkf5widgetsaddons-dev,
 +               libkf5xmlgui-dev,
 +               libqca-qt5-2-dev (>= 2.1.0),
                 pkg-config,
 -               pkg-kde-tools (>= 0.12),
 -               qtbase5-dev,
 +               pkg-kde-tools (>> 0.15.15),
 +               qtbase5-dev (>= 5.2.0),
-                qttools5-dev,
                 qtscript5-dev,
-                shared-mime-info (>= 0.30),
+                qttools5-dev,
+                shared-mime-info (>= 0.30)
  Standards-Version: 3.9.6
  XS-Testsuite: autopkgtest
  Homepage: http://www.kde.org/
@@@ -95,8 -85,8 +91,6 @@@ Description: core Kasten library for Ok
  
  Package: libkasten3gui3
  Architecture: any
--X-Debian-ABI: 0
--X-CMake-Target: kastengui
  Section: libs
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Description: gui Kasten library for Okteta
diff --cc debian/okteta-dev.install
index d7331ef,41eed07..b39c0cd
--- a/debian/okteta-dev.install
+++ b/debian/okteta-dev.install
@@@ -1,7 -1,4 +1,7 @@@
 -usr/include/
 +usr/include/Kasten/
- usr/include/kasten/
 +usr/include/Okteta/
++usr/include/kasten/
 +usr/include/okteta/
  usr/lib/*/libkasten3controllers.so
  usr/lib/*/libkasten3core.so
  usr/lib/*/libkasten3gui.so

-- 
okteta packaging