diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-08-30 12:43:14 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-08-30 12:44:13 +0200 |
| commit | b4b0ac7240b78240895cbac6f6987129c51fc78d (patch) | |
| tree | 7d9cb98cdb0c54d409ee69f1acc00c0357c62732 /debian/squeeze/applications/tdesvn/debian/control | |
| parent | 54fe524d8218f840e78b96b64f3b06a0de135d07 (diff) | |
| download | tde-packaging-b4b0ac7240b78240895cbac6f6987129c51fc78d.tar.gz tde-packaging-b4b0ac7240b78240895cbac6f6987129c51fc78d.zip | |
Resolve conflict and circular dependency in tdesvn on Debian and Ubuntu
This resolves Bug 2252
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e287d00bbabad8472469d9e826ce6a6b4cb59b55)
Diffstat (limited to 'debian/squeeze/applications/tdesvn/debian/control')
| -rw-r--r-- | debian/squeeze/applications/tdesvn/debian/control | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/debian/squeeze/applications/tdesvn/debian/control b/debian/squeeze/applications/tdesvn/debian/control index cb8ab2df4..43c9d4924 100644 --- a/debian/squeeze/applications/tdesvn/debian/control +++ b/debian/squeeze/applications/tdesvn/debian/control @@ -32,7 +32,6 @@ 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}) |