diff options
| author | Timothy Pearson <[email protected]> | 2014-11-21 11:15:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-11-21 11:15:33 -0600 |
| commit | 7c049bcf308e79f20245ccede0eab613368dfb51 (patch) | |
| tree | 427cbbb7f6d06eee573cf7ae56e7cab0f034a821 | |
| parent | 4abc907c28bc5b8f0ca466532def158ba562522f (diff) | |
| download | tde-packaging-7c049bcf308e79f20245ccede0eab613368dfb51.tar.gz tde-packaging-7c049bcf308e79f20245ccede0eab613368dfb51.zip | |
Makke tdesvn-trinity conflict with libsvnqt4-trinity on Debian and Ubuntu
This resolves Bug 2193
| -rw-r--r-- | debian/lenny/applications/tdesvn/debian/control | 1 | ||||
| -rw-r--r-- | debian/squeeze/applications/tdesvn/debian/control | 1 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/tdesvn/debian/control | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/debian/lenny/applications/tdesvn/debian/control b/debian/lenny/applications/tdesvn/debian/control index 43c9d4924..cb8ab2df4 100644 --- a/debian/lenny/applications/tdesvn/debian/control +++ b/debian/lenny/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-trinity (<< 4:14.0.0~) Breaks: kdesvn-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version}) diff --git a/debian/squeeze/applications/tdesvn/debian/control b/debian/squeeze/applications/tdesvn/debian/control index 43c9d4924..cb8ab2df4 100644 --- a/debian/squeeze/applications/tdesvn/debian/control +++ b/debian/squeeze/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-trinity (<< 4:14.0.0~) Breaks: kdesvn-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version}) 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}) |