diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-12-06 11:09:49 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-12-06 11:09:49 +0100 |
| commit | 0d1416257df38f0dcd62b2cd4ec2c91eb87a2260 (patch) | |
| tree | 9cfeca7ba7aa3997d70a20d4e245e2b978152b7d /ubuntu/maverick/applications/tdesvn | |
| parent | 7971a216ffb39774a606f62250213d634418bd17 (diff) | |
| parent | 3f6c8810956e8e919d98299132e4482132314dd6 (diff) | |
| download | tde-packaging-0d1416257df38f0dcd62b2cd4ec2c91eb87a2260.tar.gz tde-packaging-0d1416257df38f0dcd62b2cd4ec2c91eb87a2260.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/tdesvn')
| -rw-r--r-- | ubuntu/maverick/applications/tdesvn/debian/control | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ubuntu/maverick/applications/tdesvn/debian/control b/ubuntu/maverick/applications/tdesvn/debian/control index 546f06f55..5a36a8620 100644 --- a/ubuntu/maverick/applications/tdesvn/debian/control +++ b/ubuntu/maverick/applications/tdesvn/debian/control @@ -32,6 +32,7 @@ Description: TQt wrapper library for subversion (development files) [Trinity] Package: tdesvn-trinity Section: devel Architecture: any +Conflicts: libsvnqt4-trinity Replaces: kdesvn-kde3 (<< 4:14.0.0~), kdesvn-trinity (<< 4:14.0.0~) Breaks: kdesvn-kde3 (<< 4:14.0.0~), kdesvn-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version}) |