TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

Resolve conflict and circular dependency in tdesvn on Debian and Ubuntu

Browse Source 
This resolves Bug 2252

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/3/head
Slávek Banko 9 years ago
parent 972e86c4eb
commit e287d00bba
9 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File

1
debian/lenny/applications/tdesvn/debian/control vendored
Unescape View File

@ -32,7 +32,6 @@ Description: TQt wrapper library for subversion (development files) [Trinity]
Package: tdesvn-trinity Package: tdesvn-trinity
Section: devel Section: devel
Architecture: any Architecture: any
Conflicts: libsvnqt4-trinity
Replaces: kdesvn-trinity (<< 4:14.0.0~) Replaces: kdesvn-trinity (<< 4:14.0.0~)
Breaks: kdesvn-trinity (<< 4:14.0.0~) Breaks: kdesvn-trinity (<< 4:14.0.0~)
Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})

2
debian/lenny/applications/tdesvn/debian/libsvnqt-trinity-dev.install vendored
Unescape View File

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib*/*.so debian/tmp/opt/trinity/lib*/libsvnqt.so
debian/tmp/opt/trinity/include/svnqt/ debian/tmp/opt/trinity/include/svnqt/

4
debian/lenny/applications/tdesvn/debian/rules vendored
Unescape View File

@ -30,4 +30,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
DEB_BUILD_PARALLEL = true DEB_BUILD_PARALLEL = true
binary-install/tdesvn-trinity:: 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/

1
debian/squeeze/applications/tdesvn/debian/control vendored
Unescape View File

@ -32,7 +32,6 @@ Description: TQt wrapper library for subversion (development files) [Trinity]
Package: tdesvn-trinity Package: tdesvn-trinity
Section: devel Section: devel
Architecture: any Architecture: any
Conflicts: libsvnqt4-trinity
Replaces: kdesvn-trinity (<< 4:14.0.0~) Replaces: kdesvn-trinity (<< 4:14.0.0~)
Breaks: kdesvn-trinity (<< 4:14.0.0~) Breaks: kdesvn-trinity (<< 4:14.0.0~)
Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})

2
debian/squeeze/applications/tdesvn/debian/libsvnqt-trinity-dev.install vendored
Unescape View File

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib*/*.so debian/tmp/opt/trinity/lib*/libsvnqt.so
debian/tmp/opt/trinity/include/svnqt/ debian/tmp/opt/trinity/include/svnqt/

4
debian/squeeze/applications/tdesvn/debian/rules vendored
Unescape View File

@ -30,4 +30,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
DEB_BUILD_PARALLEL = true DEB_BUILD_PARALLEL = true
binary-install/tdesvn-trinity:: 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/

1
ubuntu/maverick/applications/tdesvn/debian/control
Unescape View File

@ -32,7 +32,6 @@ Description: TQt wrapper library for subversion (development files) [Trinity]
Package: tdesvn-trinity Package: tdesvn-trinity
Section: devel Section: devel
Architecture: any Architecture: any
Conflicts: libsvnqt4-trinity
Replaces: kdesvn-kde3 (<< 4:14.0.0~), kdesvn-trinity (<< 4:14.0.0~) 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~) Breaks: kdesvn-kde3 (<< 4:14.0.0~), kdesvn-trinity (<< 4:14.0.0~)
Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})

2
ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install
Unescape View File

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib*/*.so debian/tmp/opt/trinity/lib*/libsvnqt.so
debian/tmp/opt/trinity/include/svnqt/ debian/tmp/opt/trinity/include/svnqt/

4
ubuntu/maverick/applications/tdesvn/debian/rules
Unescape View File

@ -30,4 +30,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
DEB_BUILD_PARALLEL = true DEB_BUILD_PARALLEL = true
binary-install/tdesvn-trinity:: 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/

Write Preview
Loading…
Cancel
Save