diff options
| author | albator <albator@arcadia.vtf> | 2011-10-21 20:16:07 +0200 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-10-21 20:16:07 +0200 |
| commit | 7a0adf35896618a7570e425941fc1b74c54def47 (patch) | |
| tree | 16dab9d8bfbd93575440f357c70907cbb5480980 /ubuntu/maverick/applications/kdesvn/debian/control | |
| parent | cd71be65dc30c8007ec54becdf6c50260ed8e908 (diff) | |
| parent | a8707e2a9f22d082cecb8ea6079175076f983c55 (diff) | |
| download | tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.tar.gz tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/kdesvn/debian/control')
| -rw-r--r-- | ubuntu/maverick/applications/kdesvn/debian/control | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ubuntu/maverick/applications/kdesvn/debian/control b/ubuntu/maverick/applications/kdesvn/debian/control index e3d86ed80..8345fa9de 100644 --- a/ubuntu/maverick/applications/kdesvn/debian/control +++ b/ubuntu/maverick/applications/kdesvn/debian/control @@ -52,6 +52,7 @@ Architecture: any Replaces: kdesvn-kio-plugins-kde3 (<< 4:3.5.13) Breaks: kdesvn-kio-plugins-kde3 (<< 4:3.5.13) Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: kdesdk-kio-plugins-trinity Description: subversion I/O slaves for Trinity This packages includes KIO slaves for svn, svn+file, svn+http, svn+https, svn+ssh. This allows you to access subversion repositories |