Attachment 2534 Details for Bug 2252 – tde-packaging : fix tdesvn conflicts on Debian and Ubuntu

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tde-packaging : fix tdesvn conflicts on Debian and Ubuntu

tde-packaging-fix-tdesvn-conflicts.diff (text/plain), 5.31 KB, created by Slávek Banko on 2015-07-14 19:10:56 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2015-07-14 19:10:56 CDT

Size: 5.31 KB

patch

obsolete

>diff --git a/debian/lenny/applications/tdesvn/debian/control b/debian/lenny/applications/tdesvn/debian/control
>index cb8ab2d..43c9d49 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 fb3c810..14b0875 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 0e1c599..fa3adf0 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 cb8ab2d..43c9d49 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 fb3c810..14b0875 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 c198cb5..4f88909 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 5a36a86..546f06f 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 fb3c810..14b0875 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 c198cb5..4f88909 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/

Actions: View | Diff

Attachments on bug 2252: 2534