[SCM] KDevelop Platform packaging branch, experimental, updated. debian/1.7.3-3-13-g02bbe04

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevplatform.git;a=commitdiff;h=02690e1

The following commit has been merged in the experimental branch:
commit 02690e1edb70b02103784db9c4931d8f67fd2a3e
Author: Pino Toscano <pino at debian.org>
Date:   Thu Aug 25 23:16:18 2016 +0200

    fold libsublime into main pkgs
---
 debian/changelog                   |  6 ++++++
 debian/control                     | 26 +++-----------------------
 debian/kdevplatform-dev.install    | 18 ++----------------
 debian/kdevplatform10-libs.install |  2 ++
 debian/libsublime-dev.install      |  2 --
 debian/libsublime10.install        |  2 --
 6 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a365578..f26b41f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,12 @@ kdevplatform (5.0-0r1) UNRELEASED; urgency=medium
   * Manually add -dev dependencies in kdevplatform-dev and libsublime-dev,
     for now.
   * Update lintian overrides.
+  * Fold the Sublime library into the main library and -dev packages, as the
+    split is no more worth:
+    - install the content of libsublime10 into kdevplatform10-libs
+    - install the content of libsublime-dev into kdevplatform-dev, adding
+      proper breaks/replaces
+    - drop the libsublime10 and libsublime-dev binaries
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Aug 2016 19:23:00 +0200
 
diff --git a/debian/control b/debian/control
index 02887a1..2d56174 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-std/kdevplatform.git
 
 Package: kdevplatform10-libs
 Architecture: any
-Depends: libsublime10 (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: kdevelop (<< 4:3.9.96-1),
           kdevelop-data (<< 4:3.9.96-1),
           kdevplatform1-libs,
@@ -72,7 +72,6 @@ Package: kdevplatform-dev
 Section: libdevel
 Architecture: any
 Depends: kdevplatform10-libs (= ${binary:Version}),
-         libsublime-dev (>= ${source:Version}),
          ${misc:Depends},
          qtbase5-dev (>= 5.4.0),
          qtdeclarative5-dev (>= 5.4.0),
@@ -94,33 +93,14 @@ Depends: kdevplatform10-libs (= ${binary:Version}),
          libkf5threadweaver-dev (>= 5.16.0),
          libkf5windowsystem-dev (>= 5.16.0),
          libgrantlee5-dev,
+Breaks: libsublime-dev (<< 5.0)
+Replaces: libsublime-dev (<< 5.0)
 Description: development files for the KDevelop platform
  This package contains development files for building integrated development
  environments based on the KDevelop platform.
  .
  This package is part of the KDevelop platform.
 
-Package: libsublime10
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: User interface library
- sublime provides a user interface that supports multiple
- mainwindows, multiple dockwidgets, split views and areas
- .
- This package is part of the KDevelop platform.
-
-Package: libsublime-dev
-Section: libdevel
-Architecture: any
-Depends: libsublime10 (= ${binary:Version}),
-         ${misc:Depends},
-         qtbase5-dev (>= 5.4.0),
-Description: development files for the sublime user interface library
- This package contains development files for building applications using
- libsublime.
- .
- This package is part of the KDevelop platform.
-
 Package: kdevplatform-l10n
 Section: localization
 Architecture: all
diff --git a/debian/kdevplatform-dev.install b/debian/kdevplatform-dev.install
index f086fe3..fd918bb 100644
--- a/debian/kdevplatform-dev.install
+++ b/debian/kdevplatform-dev.install
@@ -1,19 +1,4 @@
-usr/include/kdevplatform/config-kdevplatform.h
-usr/include/kdevplatform/debugger
-usr/include/kdevplatform/documentation
-usr/include/kdevplatform/execute
-usr/include/kdevplatform/executescript/iexecutescriptplugin.h
-usr/include/kdevplatform/interfaces
-usr/include/kdevplatform/kdevplatform_version.h
-usr/include/kdevplatform/language
-usr/include/kdevplatform/openwith
-usr/include/kdevplatform/outputview
-usr/include/kdevplatform/project
-usr/include/kdevplatform/serialization
-usr/include/kdevplatform/shell
-usr/include/kdevplatform/tests
-usr/include/kdevplatform/util
-usr/include/kdevplatform/vcs
+usr/include/kdevplatform/
 usr/lib/*/cmake/KDevPlatform/KDevPlatformConfig.cmake
 usr/lib/*/cmake/KDevPlatform/KDevPlatformConfigVersion.cmake
 usr/lib/*/cmake/KDevPlatform/KDevPlatformMacros.cmake
@@ -27,6 +12,7 @@ usr/lib/*/libKDevPlatformOutputView.so
 usr/lib/*/libKDevPlatformProject.so
 usr/lib/*/libKDevPlatformSerialization.so
 usr/lib/*/libKDevPlatformShell.so
+usr/lib/*/libKDevPlatformSublime.so
 usr/lib/*/libKDevPlatformTests.so
 usr/lib/*/libKDevPlatformUtil.so
 usr/lib/*/libKDevPlatformVcs.so
diff --git a/debian/kdevplatform10-libs.install b/debian/kdevplatform10-libs.install
index 8c35afb..2efad22 100644
--- a/debian/kdevplatform10-libs.install
+++ b/debian/kdevplatform10-libs.install
@@ -17,6 +17,8 @@ usr/lib/*/libKDevPlatformSerialization.so.10
 usr/lib/*/libKDevPlatformSerialization.so.10.*
 usr/lib/*/libKDevPlatformShell.so.10
 usr/lib/*/libKDevPlatformShell.so.10.*
+usr/lib/*/libKDevPlatformSublime.so.10
+usr/lib/*/libKDevPlatformSublime.so.10.*
 usr/lib/*/libKDevPlatformTests.so.10
 usr/lib/*/libKDevPlatformTests.so.10.*
 usr/lib/*/libKDevPlatformUtil.so.10
diff --git a/debian/libsublime-dev.install b/debian/libsublime-dev.install
deleted file mode 100644
index d6e9c4b..0000000
--- a/debian/libsublime-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/kdevplatform/sublime/*
-usr/lib/*/libKDevPlatformSublime.so
diff --git a/debian/libsublime10.install b/debian/libsublime10.install
deleted file mode 100644
index af9a4f0..0000000
--- a/debian/libsublime10.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKDevPlatformSublime.so.10
-usr/lib/*/libKDevPlatformSublime.so.10.*

-- 
KDevelop Platform packaging