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>

9 files changed, 12 insertions, 9 deletions

diff --git a/debian/lenny/applications/tdesvn/debian/control b/debian/lenny/applications/tdesvn/debian/control
index cb8ab2df4..43c9d4924 100644
--- a/debian/lenny/applications/tdesvn/debian/control
+++ b/debian/lenny/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})
diff --git a/debian/lenny/applications/tdesvn/debian/libsvnqt-trinity-dev.install b/debian/lenny/applications/tdesvn/debian/libsvnqt-trinity-dev.install
index fb3c81018..14b087527 100644
--- a/debian/lenny/applications/tdesvn/debian/libsvnqt-trinity-dev.install
+++ b/debian/lenny/applications/tdesvn/debian/libsvnqt-trinity-dev.install
@@ -1,2 +1,2 @@
-debian/tmp/opt/trinity/lib*/*.so
+debian/tmp/opt/trinity/lib*/libsvnqt.so
 debian/tmp/opt/trinity/include/svnqt/
diff --git a/debian/lenny/applications/tdesvn/debian/rules b/debian/lenny/applications/tdesvn/debian/rules
index 0e1c5995b..ab716e5c1 100755
--- a/debian/lenny/applications/tdesvn/debian/rules
+++ b/debian/lenny/applications/tdesvn/debian/rules
@@ -30,4 +30,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 DEB_BUILD_PARALLEL = true
 
 binary-install/tdesvn-trinity::
-	mv debian/tdesvn-trinity/usr/share/man debian/tdesvn-trinity/opt/trinity/share/
+	# remove libsvnqt.so* from tdesvn-trinity - are included in libsvnqt4-trinity
+	rm debian/$(cdbs_curpkg)/opt/trinity/lib*/libsvnqt.so*
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
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})
diff --git a/debian/squeeze/applications/tdesvn/debian/libsvnqt-trinity-dev.install b/debian/squeeze/applications/tdesvn/debian/libsvnqt-trinity-dev.install
index fb3c81018..14b087527 100644
--- a/debian/squeeze/applications/tdesvn/debian/libsvnqt-trinity-dev.install
+++ b/debian/squeeze/applications/tdesvn/debian/libsvnqt-trinity-dev.install
@@ -1,2 +1,2 @@
-debian/tmp/opt/trinity/lib*/*.so
+debian/tmp/opt/trinity/lib*/libsvnqt.so
 debian/tmp/opt/trinity/include/svnqt/
diff --git a/debian/squeeze/applications/tdesvn/debian/rules b/debian/squeeze/applications/tdesvn/debian/rules
index c198cb5ab..ca472273e 100755
--- a/debian/squeeze/applications/tdesvn/debian/rules
+++ b/debian/squeeze/applications/tdesvn/debian/rules
@@ -30,4 +30,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 DEB_BUILD_PARALLEL = true
 
 binary-install/tdesvn-trinity::
-	mv debian/tdesvn-trinity/usr/share/man debian/tdesvn-trinity/opt/trinity/share/
+	# remove libsvnqt.so* from tdesvn-trinity - are included in libsvnqt4-trinity
+	rm debian/$(cdbs_curpkg)/opt/trinity/lib*/libsvnqt.so*
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
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})
diff --git a/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install b/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install
index fb3c81018..14b087527 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install
+++ b/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install
@@ -1,2 +1,2 @@
-debian/tmp/opt/trinity/lib*/*.so
+debian/tmp/opt/trinity/lib*/libsvnqt.so
 debian/tmp/opt/trinity/include/svnqt/
diff --git a/ubuntu/maverick/applications/tdesvn/debian/rules b/ubuntu/maverick/applications/tdesvn/debian/rules
index c198cb5ab..ca472273e 100755
--- a/ubuntu/maverick/applications/tdesvn/debian/rules
+++ b/ubuntu/maverick/applications/tdesvn/debian/rules
@@ -30,4 +30,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 DEB_BUILD_PARALLEL = true
 
 binary-install/tdesvn-trinity::
-	mv debian/tdesvn-trinity/usr/share/man debian/tdesvn-trinity/opt/trinity/share/
+	# remove libsvnqt.so* from tdesvn-trinity - are included in libsvnqt4-trinity
+	rm debian/$(cdbs_curpkg)/opt/trinity/lib*/libsvnqt.so*
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/