[SCM] libnm-qt packaging branch, kubuntu_unstable, updated. e4439374d099cc1d6fab3bf9769283d0d838c4d2

Harald Sitter apachelogger-guest at moszumanska.debian.org
Wed Dec 3 08:33:25 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/libnm-qt.git;a=commitdiff;h=246b117

The following commit has been merged in the kubuntu_unstable branch:
commit 246b117c043ca4834f19cb6fcf143b2e0aaec381
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Dec 3 09:29:21 2014 +0100

    update for soversion bump
    
    also change install to be more explicit as to provoke build failures
    on subsequent sobumps
---
 debian/control                            | 8 ++++----
 debian/libkf5networkmanagerqt-dev.install | 2 +-
 debian/libkf5networkmanagerqt5.install    | 1 -
 debian/libkf5networkmanagerqt6.install    | 2 ++
 debian/rules                              | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index d80332b..a01c965 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/libnm-qt.git
 Package: libkf5networkmanagerqt-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5networkmanagerqt5 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libkf5networkmanagerqt6 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Qt wrapper for NetworkManager - devel files.
  Qt wrapper for NetworkManager DBus API.
  .
@@ -26,7 +26,7 @@ Description: Qt wrapper for NetworkManager - devel files.
  .
  This package contains the development files
 
-Package: libkf5networkmanagerqt5
+Package: libkf5networkmanagerqt6
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -35,11 +35,11 @@ Description: Qt wrapper for NetworkManager - library
  .
  This package is part of the KDE Plasma.
 
-Package: libkf5networkmanagerqt5-dbg
+Package: libkf5networkmanagerqt6-dbg
 Section: debug
 Architecture: any
 Recommends: qtbase5-dbg
-Depends: libkf5networkmanagerqt5 (= ${binary:Version}), ${misc:Depends}
+Depends: libkf5networkmanagerqt6 (= ${binary:Version}), ${misc:Depends}
 Description: Qt wrapper for NetworkManager - debug files.
  Qt wrapper for NetworkManager DBus API.
  .
diff --git a/debian/libkf5networkmanagerqt-dev.install b/debian/libkf5networkmanagerqt-dev.install
index 4205f18..3df5ed7 100644
--- a/debian/libkf5networkmanagerqt-dev.install
+++ b/debian/libkf5networkmanagerqt-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
 usr/lib/*/cmake/*
 usr/lib/*/libKF5NetworkManagerQt.so
-usr/lib/*/qt5/mkspecs/* 
+usr/lib/*/qt5/mkspecs/*
diff --git a/debian/libkf5networkmanagerqt5.install b/debian/libkf5networkmanagerqt5.install
deleted file mode 100644
index cbaae7b..0000000
--- a/debian/libkf5networkmanagerqt5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libKF5NetworkManagerQt.so.*
diff --git a/debian/libkf5networkmanagerqt6.install b/debian/libkf5networkmanagerqt6.install
new file mode 100644
index 0000000..481b024
--- /dev/null
+++ b/debian/libkf5networkmanagerqt6.install
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5NetworkManagerQt.so.5.1.90
+usr/lib/*/libKF5NetworkManagerQt.so.6
diff --git a/debian/rules b/debian/rules
index dda5282..a2debb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,6 @@
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=libkf5networkmanagerqt5-dbg
+	$(overridden_command) --dbg-package=libkf5networkmanagerqt6
 
 .PHONY: override_dh_auto_test

-- 
libnm-qt packaging



More information about the pkg-kde-commits mailing list