diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2019-10-05 14:52:50 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2019-10-05 14:53:20 +0200 |
commit | e22e8583639e1de59d8a9c1ee228d1bece8b5516 (patch) | |
tree | bd5a10679b3d13e278bf011557043fe29536525d /dilos | |
parent | caa568f2f0ca3b77f93f1f277725ecd2c38f50e8 (diff) | |
download | tde-packaging-e22e8583639e1de59d8a9c1ee228d1bece8b5516.tar.gz tde-packaging-e22e8583639e1de59d8a9c1ee228d1bece8b5516.zip |
DilOS tqt3: Fix conflicts related to packages that have been split for multiarch.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'dilos')
-rw-r--r-- | dilos/dependencies/tqt3/debian/control | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dilos/dependencies/tqt3/debian/control b/dilos/dependencies/tqt3/debian/control index a01ae2fa8..e0ba5bd40 100644 --- a/dilos/dependencies/tqt3/debian/control +++ b/dilos/dependencies/tqt3/debian/control @@ -35,7 +35,7 @@ Package: libtqt3-mt-data Architecture: all Multi-Arch: foreign Section: libs -Conflicts: libtqt3-mt (<< 4:14.1.0~) +Conflicts: libtqt3-mt (<< 4:14.0,7~) Depends: ${shlibs:Depends} Description: Data for TQt GUI Library (Threaded runtime version), Version 3 This is the Trolltech TQt library, version 3. It's necessary for @@ -114,7 +114,7 @@ Multi-Arch: no Section: libdevel Replaces: libtqt3-mt-dev (<< 4:14.0.0~) Breaks: libtqt3-mt-dev (<< 4:14.0.0~) -Conflicts: libtqt3-mt (<< 4:14.1.0~) +Conflicts: libtqt3-mt (<< 4:14.0.7~) Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), @@ -205,7 +205,7 @@ Package: tqt3-designer-plugins Architecture: any Multi-Arch: same Section: devel -Conflicts: tqt3-designer (<< 4:14.1.0~) +Conflicts: tqt3-designer (<< 4:14.0.7~) Depends: ${shlibs:Depends} Description: TQt3 Designer plugins This package contains plugins for TQt3 Designer |