From 088c723926b643846b55753414c8d511ea441d5b Mon Sep 17 00:00:00 2001 From: Denis Kozadaev Date: Thu, 30 Jan 2020 22:13:12 +0300 Subject: [PATCH] DilOS: fix tqt3 dependencies Signed-off-by: Denis Kozadaev --- dilos/dependencies/tqt3/debian/changelog | 6 ------ dilos/dependencies/tqt3/debian/control | 13 +++++++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dilos/dependencies/tqt3/debian/changelog b/dilos/dependencies/tqt3/debian/changelog index 9931729c7..3e813531e 100644 --- a/dilos/dependencies/tqt3/debian/changelog +++ b/dilos/dependencies/tqt3/debian/changelog @@ -1,9 +1,3 @@ -tqt-x11-free (3:3.3.8-d-0ubuntu0+dilos1) unstable; urgency=low - - * Build for DilOS. - - -- DilOS Team Sat, 24 Aug 2019 21:29:22 +0300 - tqt-x11-free (3:3.3.8-d-0ubuntu0) maverick; urgency=low * Upload of 3.3.8d (working revision) from GIT diff --git a/dilos/dependencies/tqt3/debian/control b/dilos/dependencies/tqt3/debian/control index a01ae2fa8..baf04db31 100644 --- a/dilos/dependencies/tqt3/debian/control +++ b/dilos/dependencies/tqt3/debian/control @@ -11,7 +11,8 @@ Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cpio, libxext-dev (>= 4.3.0. libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev, default-libmysqlclient-dev | libmysqlclient-dev, flex, libpq-dev, postgresql-server-dev-all (>= 117~) | libpq-dev (<< 9.3.3-2~), libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, - firebird-dev [!solaris-any] | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc armel !solaris-any] | firebird2-dev [i386 amd64 !solaris-any] + firebird-dev [!solaris-any] | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc armel !solaris-any] | firebird2-dev [i386 amd64 !solaris-any], + libkrb5-dev [solaris-any] Section: libs Priority: optional Standards-Version: 3.8.4 @@ -23,7 +24,7 @@ Multi-Arch: same Section: libs Replaces: libtqt3-mt (<< 4:14.0.0~) Breaks: libtqt3-mt (<< 4:14.0.0~) -Depends: libtqt3-mt-data (= ${binary:Version}), ${shlibs:Depends}, fontconfig +Depends: libtqt3-mt-data (= ${binary:Version}), ${shlibs:Depends}, fontconfig, libaudio2 [solaris-any] Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4) Suggests: libtqt3-mt-psql, libtqt3-mt-mysql, libtqt3-mt-odbc Description: TQt GUI Library (Threaded runtime version), Version 3 @@ -35,7 +36,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.0~) 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 +115,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.0~) 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), @@ -122,7 +123,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3), libpng-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libaudio-dev, libgl1-mesa-dev | libgl-dev, - libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}), + libglu1-mesa-dev | libglu-dev, libc6-dev [!solaris-any], libtqt3-mt (= ${binary:Version}), libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version}) Recommends: libtqt3-compat-headers, libcups2-dev Suggests: libtqt3-i18n, tqt3-doc @@ -205,7 +206,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.0~) Depends: ${shlibs:Depends} Description: TQt3 Designer plugins This package contains plugins for TQt3 Designer