diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 15:25:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 15:25:21 -0600 |
| commit | 469a2fea7abec99022999bfd31e6d81c9364e325 (patch) | |
| tree | 9b26af63d79d8c6b35efbd5dc48fe7bf85c82986 /ubuntu/maverick/applications/knetworkmanager8/debian | |
| parent | 51bd98a34517e658bbaab01a523d4d3f99ed509d (diff) | |
| download | tde-packaging-469a2fea7abec99022999bfd31e6d81c9364e325.tar.gz tde-packaging-469a2fea7abec99022999bfd31e6d81c9364e325.zip | |
Update Debian and Ubuntu packaging to match recent renaming
Diffstat (limited to 'ubuntu/maverick/applications/knetworkmanager8/debian')
3 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/changelog b/ubuntu/maverick/applications/knetworkmanager8/debian/changelog index 04405984c..b68efdcf7 100644 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/changelog +++ b/ubuntu/maverick/applications/knetworkmanager8/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/maverick/applications/knetworkmanager8/debian/control b/ubuntu/maverick/applications/knetworkmanager8/debian/control index 711f2e99d..2f3d45694 100644 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/control +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control @@ -28,7 +28,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9) Replaces: network-manager-kde-trinity (<< 4:14.0.0) Breaks: network-manager-kde-trinity (<< 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/ubuntu/maverick/applications/knetworkmanager8/debian/control.in b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in index 9a213de18..6ec9fbbd7 100644 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/control.in +++ b/ubuntu/maverick/applications/knetworkmanager8/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] |