diff options
Diffstat (limited to 'debian/wheezy/applications/knetworkmanager.cmake')
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/wheezy/applications/knetworkmanager.cmake/debian/changelog b/debian/wheezy/applications/knetworkmanager.cmake/debian/changelog index ed0d32a81..d430a6b1e 100644 --- a/debian/wheezy/applications/knetworkmanager.cmake/debian/changelog +++ b/debian/wheezy/applications/knetworkmanager.cmake/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/debian/wheezy/applications/knetworkmanager.cmake/debian/control b/debian/wheezy/applications/knetworkmanager.cmake/debian/control index 988450b51..6650a2b73 100644 --- a/debian/wheezy/applications/knetworkmanager.cmake/debian/control +++ b/debian/wheezy/applications/knetworkmanager.cmake/debian/control @@ -27,7 +27,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) Replaces: network-manager-kde (<< 4:14.0.0) Breaks: network-manager-kde (<< 4:14.0.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/wheezy/applications/knetworkmanager.cmake/debian/control.in b/debian/wheezy/applications/knetworkmanager.cmake/debian/control.in index 9a213de18..6ec9fbbd7 100644 --- a/debian/wheezy/applications/knetworkmanager.cmake/debian/control.in +++ b/debian/wheezy/applications/knetworkmanager.cmake/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] |