[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.1+git20110422.810bc16-1

Fri Apr 22 21:23:40 UTC 2011

The following commit has been merged in the master branch:
commit d188e107e654bfc7dd8bf8213d8d569dee86e7c9
Author: Modestas Vainius <modax at debian.org>
Date:   Fri Apr 22 22:51:32 2011 +0300

    Merge knm-runtime package into plasma-widget-networkmanager.
    
    It no longer makes sense after sunset of the network-manager-kde package.
---
 debian/changelog                                   |    2 +
 debian/control                                     |   25 +++-------------
 debian/knm-runtime.install                         |   25 -----------------
 debian/knm-runtime.lintian-overrides               |    3 --
 debian/plasma-widget-networkmanagement.install     |   29 ++++++++++++++++++-
 ...asma-widget-networkmanagement.lintian-overrides |    3 ++
 debian/rules                                       |   10 +-----
 7 files changed, 39 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42e70f8..68a7712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ networkmanagement (0.1+git20110422.810bc16-0r1) UNRELEASED; urgency=low
   * Update packaging section in debian/copyright.
   * Convert network-manager-kde to the transitional package for
     plasma-widget-networkmanagement.
+  * Merge knm-runtime package into plasma-widget-networkmanager. It no longer
+    makes sense after sunset of the network-manager-kde package.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 02 Apr 2011 00:25:25 +0300
 
diff --git a/debian/control b/debian/control
index 80a12ff..f4c2762 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,12 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/networkmanagement.git
 
 Package: plasma-widget-networkmanagement
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0),
+ mobile-broadband-provider-info
 Suggests: kdebase-workspace-bin
+Recommends: kwalletmanager, network-manager-vpnc, network-manager-openvpn, network-manager-pptp
+Replaces: knm-runtime
+Breaks: knm-runtime
 Description: Network Management widget for KDE4 Plasma
  This package contains the Network Management plasma widget which aims to
  provide a fully featured GUI for managing networks.  Currently, the only
@@ -25,25 +29,6 @@ Description: Network Management widget for KDE4 Plasma
  available in the kdebase-workspace-bin package. The user friendly name of the
  widget is "Network Management" (in e.g. "Add Widgets" dialog).
 
-Package: knm-runtime
-Architecture: any
-Section: net
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0),
- mobile-broadband-provider-info
-Replaces: plasma-widget-networkmanagement (<< 0.1~svn1005432)
-Recommends: kwalletmanager, network-manager-vpnc, network-manager-openvpn, network-manager-pptp
-Description: KDE NetworkManagement infrastructure runtime files
- This package contains runtime libraries and binaries needed by both
- network-manager-kde (knetworkmanager) and plasma-widget-networkmanagement
- packages. Currently, it provides interface to NetworkManager and the KDE4
- Control Module (kcm) for managing/storing network settings (to be used by
- either of the two support applications later).
- .
- It is possible to use this package without its frontends (either
- network-manager-kde or plasma-widget-networkmanagement). It enables
- notifications under KDE but actual network management functions will be very
- limited.
-
 Package: network-manager-kde
 Architecture: any
 Depends: ${misc:Depends}, plasma-widget-networkmanagement
diff --git a/debian/knm-runtime.install b/debian/knm-runtime.install
deleted file mode 100644
index ee333b6..0000000
--- a/debian/knm-runtime.install
+++ /dev/null
@@ -1,25 +0,0 @@
-etc/dbus-1/system.d/NetworkManager-kde4.conf
-usr/lib/kde4/kcm_networkmanagement.so
-usr/lib/kde4/kcm_networkmanagement_tray.so
-usr/lib/kde4/libexec/networkmanagement_configshell
-usr/lib/kde4/networkmanagement_novellvpnui.so
-usr/lib/kde4/networkmanagement_openvpnui.so
-usr/lib/kde4/networkmanagement_pptpui.so
-usr/lib/kde4/networkmanagement_strongswanui.so
-usr/lib/kde4/networkmanagement_vpncui.so
-usr/lib/libknm_nm.so
-usr/lib/libknmclient.so.*
-usr/lib/libknminternals.so.*
-usr/lib/libknmservice.so.*
-usr/lib/libknmui.so.*
-usr/lib/libsolidcontrolfuture.so
-usr/share/icons/oxygen/
-usr/share/kde4/apps/networkmanagement/networkmanagement.notifyrc
-usr/share/kde4/services/kcm_networkmanagement.desktop
-usr/share/kde4/services/kcm_networkmanagement_tray.desktop
-usr/share/kde4/services/networkmanagement_novellvpnui.desktop
-usr/share/kde4/services/networkmanagement_openvpnui.desktop
-usr/share/kde4/services/networkmanagement_pptpui.desktop
-usr/share/kde4/services/networkmanagement_strongswanui.desktop
-usr/share/kde4/services/networkmanagement_vpncui.desktop
-usr/share/kde4/servicetypes/networkmanagement_vpnuiplugin.desktop
diff --git a/debian/knm-runtime.lintian-overrides b/debian/knm-runtime.lintian-overrides
deleted file mode 100644
index 9c517eb..0000000
--- a/debian/knm-runtime.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-knm-runtime: package-name-doesnt-match-sonames
-knm-runtime: shlib-without-versioned-soname usr/lib/libknm_nm.so libknm_nm.so
-knm-runtime: shlib-without-versioned-soname usr/lib/libsolidcontrolfuture.so libsolidcontrolfuture.so
diff --git a/debian/plasma-widget-networkmanagement.install b/debian/plasma-widget-networkmanagement.install
index 802b063..3aef0a0 100644
--- a/debian/plasma-widget-networkmanagement.install
+++ b/debian/plasma-widget-networkmanagement.install
@@ -1,6 +1,31 @@
+etc/dbus-1/system.d/NetworkManager-kde4.conf
+usr/lib/kde4/kcm_networkmanagement.so
+usr/lib/kde4/kcm_networkmanagement_tray.so
+usr/lib/kde4/kded_networkmanagement.so
+usr/lib/kde4/libexec/networkmanagement_configshell
+usr/lib/kde4/networkmanagement_novellvpnui.so
+usr/lib/kde4/networkmanagement_openvpnui.so
+usr/lib/kde4/networkmanagement_pptpui.so
+usr/lib/kde4/networkmanagement_strongswanui.so
+usr/lib/kde4/networkmanagement_vpncui.so
 usr/lib/kde4/plasma_applet_networkmanagement.so
 usr/lib/kde4/plasma_engine_networkmanagement.so
-usr/lib/kde4/kded_networkmanagement.so
+usr/lib/libknm_nm.so
+usr/lib/libknmclient.so.*
+usr/lib/libknminternals.so.*
+usr/lib/libknmservice.so.*
+usr/lib/libknmui.so.*
+usr/lib/libsolidcontrolfuture.so
+usr/share/icons/oxygen/
+usr/share/kde4/apps/networkmanagement/networkmanagement.notifyrc
+usr/share/kde4/services/kcm_networkmanagement.desktop
+usr/share/kde4/services/kcm_networkmanagement_tray.desktop
+usr/share/kde4/services/kded/networkmanagement.desktop
+usr/share/kde4/services/networkmanagement_novellvpnui.desktop
+usr/share/kde4/services/networkmanagement_openvpnui.desktop
+usr/share/kde4/services/networkmanagement_pptpui.desktop
+usr/share/kde4/services/networkmanagement_strongswanui.desktop
+usr/share/kde4/services/networkmanagement_vpncui.desktop
 usr/share/kde4/services/plasma-applet-networkmanagement.desktop
 usr/share/kde4/services/plasma-engine-networkmanagement.desktop
-usr/share/kde4/services/kded/networkmanagement.desktop
+usr/share/kde4/servicetypes/networkmanagement_vpnuiplugin.desktop
diff --git a/debian/plasma-widget-networkmanagement.lintian-overrides b/debian/plasma-widget-networkmanagement.lintian-overrides
new file mode 100644
index 0000000..9b2354a
--- /dev/null
+++ b/debian/plasma-widget-networkmanagement.lintian-overrides
@@ -0,0 +1,3 @@
+plasma-widget-networkmanagement: package-name-doesnt-match-sonames
+plasma-widget-networkmanagement: shlib-without-versioned-soname usr/lib/libknm_nm.so libknm_nm.so
+plasma-widget-networkmanagement: shlib-without-versioned-soname usr/lib/libsolidcontrolfuture.so libsolidcontrolfuture.so
diff --git a/debian/rules b/debian/rules
index c2d8eb5..a82464e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,15 +13,9 @@ override_dh_install:
 	    $(wildcard debian/tmp/usr/share/kde4/apps/desktoptheme/default/icons/network.svgz)
 	dh_install --remaining-packages
 
-override_dh_makeshlibs:
-	dh_makeshlibs -pknm-runtime -V'knm-runtime (= $(DEB_BINARY_VERSION))'
-	dh_makeshlibs --remaining-packages
-
 override_dh_gencontrol:
-	dh_gencontrol -pnetwork-manager-kde -- -v'$(DEB_KNETWORKMANAGER_VERSION)' \
-        -V'knetworkmanager:Version=$(DEB_KNETWORKMANAGER_VERSION)'
-	dh_gencontrol --remaining-packages -- \
-        -V'knetworkmanager:Version=$(DEB_KNETWORKMANAGER_VERSION)'
+	dh_gencontrol -pnetwork-manager-kde -- -v'$(DEB_KNETWORKMANAGER_VERSION)'
+	dh_gencontrol --remaining-packages
 
 %:
 	dh --parallel --with kde --dbg-package=plasma-widget-networkmanagement-dbg $@

-- 
"Network Management" Plasma widget Debian packaging

