Branch: master

7c049bcf 2014-11-21 11:15:33 Timothy Pearson
Makke tdesvn-trinity conflict with libsvnqt4-trinity on Debian and Ubuntu
This resolves Bug 2193
M debian/lenny/applications/tdesvn/debian/control
M debian/squeeze/applications/tdesvn/debian/control
M ubuntu/maverick/applications/tdesvn/debian/control
diff --git a/debian/lenny/applications/tdesvn/debian/control b/debian/lenny/applications/tdesvn/debian/control
index 43c9d49..cb8ab2d 100644
--- a/debian/lenny/applications/tdesvn/debian/control
+++ b/debian/lenny/applications/tdesvn/debian/control
@@ -32,6 +32,7 @@
 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 43c9d49..cb8ab2d 100644
--- a/debian/squeeze/applications/tdesvn/debian/control
+++ b/debian/squeeze/applications/tdesvn/debian/control
@@ -32,6 +32,7 @@
 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 546f06f..5a36a86 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/control
+++ b/ubuntu/maverick/applications/tdesvn/debian/control
@@ -32,6 +32,7 @@
 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})