diff options
Diffstat (limited to 'ubuntu/lucid_automake/applications/knetworkmanager')
3 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/lucid_automake/applications/knetworkmanager/debian/changelog b/ubuntu/lucid_automake/applications/knetworkmanager/debian/changelog index 5cdaa89d6..24a76ba33 100644 --- a/ubuntu/lucid_automake/applications/knetworkmanager/debian/changelog +++ b/ubuntu/lucid_automake/applications/knetworkmanager/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/ubuntu/lucid_automake/applications/knetworkmanager/debian/control b/ubuntu/lucid_automake/applications/knetworkmanager/debian/control index 3ac6a66b3..9ede20c9e 100644 --- a/ubuntu/lucid_automake/applications/knetworkmanager/debian/control +++ b/ubuntu/lucid_automake/applications/knetworkmanager/debian/control @@ -25,7 +25,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-kde3 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-kde3, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-kde3, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-kde3 Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [KDE3] diff --git a/ubuntu/lucid_automake/applications/knetworkmanager/debian/control.in b/ubuntu/lucid_automake/applications/knetworkmanager/debian/control.in index 32aa6dea9..d17a8b5ab 100644 --- a/ubuntu/lucid_automake/applications/knetworkmanager/debian/control.in +++ b/ubuntu/lucid_automake/applications/knetworkmanager/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-kde3 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-kde3, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-kde3, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-kde3 Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [KDE3] |