From e287d00bbabad8472469d9e826ce6a6b4cb59b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 30 Aug 2015 12:43:14 +0200 Subject: Resolve conflict and circular dependency in tdesvn on Debian and Ubuntu This resolves Bug 2252 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- ubuntu/maverick/applications/tdesvn/debian/control | 1 - 1 file changed, 1 deletion(-) (limited to 'ubuntu/maverick/applications/tdesvn/debian/control') diff --git a/ubuntu/maverick/applications/tdesvn/debian/control b/ubuntu/maverick/applications/tdesvn/debian/control index 5a36a8620..546f06f55 100644 --- a/ubuntu/maverick/applications/tdesvn/debian/control +++ b/ubuntu/maverick/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-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}) -- cgit v1.2.1