diff options
| author | Francois Andriot <[email protected]> | 2011-12-30 21:00:52 +0100 |
|---|---|---|
| committer | Francois Andriot <[email protected]> | 2011-12-30 21:00:52 +0100 |
| commit | c8101403012cec942b568b679e56f8a6d6bb3dc0 (patch) | |
| tree | bffa8577e8d68bc9e9624b9cf27a987c1854d566 /ubuntu/maverick/applications/knetworkmanager8/debian | |
| parent | 6d967c3097f4c7c077d35509cab6206feca351ea (diff) | |
| parent | 222c8a5f3bd5b962fe3d2b2ae602d5e9cc407ad4 (diff) | |
| download | tde-packaging-c8101403012cec942b568b679e56f8a6d6bb3dc0.tar.gz tde-packaging-c8101403012cec942b568b679e56f8a6d6bb3dc0.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/knetworkmanager8/debian')
| -rw-r--r-- | ubuntu/maverick/applications/knetworkmanager8/debian/control | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control b/ubuntu/maverick/applications/knetworkmanager8/debian/control index bae087017..3136bba7f 100644 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/control +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control @@ -26,8 +26,8 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9) -Replaces: network-manager-kde-kde3 (<< 4:3.5.13) -Breaks: network-manager-kde-kde3 (<< 4:3.5.13) +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 Provides: knetworkmanager-trinity Conflicts: network-manager-kde |