diff options
Diffstat (limited to 'ubuntu/_base/dependencies/tqt3/debian')
18 files changed, 347 insertions, 426 deletions
diff --git a/ubuntu/_base/dependencies/tqt3/debian/README.Debian b/ubuntu/_base/dependencies/tqt3/debian/README.Debian index e48fe37ea..4458531f5 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/README.Debian +++ b/ubuntu/_base/dependencies/tqt3/debian/README.Debian @@ -136,9 +136,7 @@ Designer or extend the Designer as well as utilizing the Qt Assistant by calling it from within your program, install tqt3-apps-dev, which contains the static libraries and header files retquired for this functionality. -For Embedded Developers, the program tqvfb (Qt Virtual Frambuffer) and -maketqpf (embedded fonts tool)have been packaged into -qt3-dev-tools-embedded. For developers that work on migrating their program +For developers that work on migrating their program from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find additional tools in the tqt3-dev-tools-compat. @@ -246,26 +244,6 @@ A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called KDE programs. Install your application's system wide configuration file to /etc/tqt3. -Q: I'm compiling a program and I have a compile error due to a missing -include. Why isn't that include not present in the Debian packages anymore -? It compiled with older versions of Debian packages of Qt ! - -A: This may be due to two reasons: either the package still uses the old -includes from Qt 1.x or 2.x that got basically renamed by Trolltech due to -the naming convention. The filenames are now all following the scheme - -ClassName -> classname.h. - -Therefore, if you are the developer of the affected program, change your -sources according to this scheme. Qt ships with tqtrename140, a tool to -help developers migrate their API to the Qt 3 version, -which can help you in the transition upgrade to Qt 3. - -If you are affected by this as a packager, notify upstream to fix those -problems and in the meanwhile use libtqt3-compat-headers as a build -dependency which includes the compatibility headers that just include the -right files from the new API again. - Q: I have a question not covered by this FAQ and README file. Who should I turn to ? diff --git a/ubuntu/_base/dependencies/tqt3/debian/compat b/ubuntu/_base/dependencies/tqt3/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/compat +++ b/ubuntu/_base/dependencies/tqt3/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/dependencies/tqt3/debian/control b/ubuntu/_base/dependencies/tqt3/debian/control index b394a2f95..a0f53d3a9 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/control +++ b/ubuntu/_base/dependencies/tqt3/debian/control @@ -2,7 +2,7 @@ Source: tqt-x11-free Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4), +Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libnsl-dev | libc6-dev (<<2.32~), 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), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, @@ -124,7 +124,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libxft-dev, libaudio-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}), libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version}) -Recommends: libtqt3-compat-headers, libcups2-dev +Recommends: libcups2-dev Suggests: libtqt3-i18n, tqt3-doc Description: TQt development files (Threaded) TQt is a C++ class library optimized for graphical user interface @@ -132,13 +132,6 @@ Description: TQt development files (Threaded) for building threaded TQt applications as well as the libtqui.so symlink and the necessary header files for libtqui.so. (See README.Debian and the TQt Documentation for instructions on libtqui.so) - . - WARNING: If you plan to build some older TQt3 applications, you will - most probably have to install the libtqt3-compat-headers package. It - contains all the headers which are not part of the official TQt3 API - anymore but which are still used by some programs. So if you encounter - problems with missing header files, please install this package first - before you send a bugreport. Package: libtqt3-headers Architecture: all @@ -152,23 +145,6 @@ Description: TQt3 header files with TQt3. If you want to compile or develop programs which use TQt3, you have to install this package. -Package: libtqt3-compat-headers -Architecture: all -Multi-Arch: foreign -Section: devel -Replaces: libtqt3-compat-headers (<< 4:14.0.0~) -Breaks: libtqt3-compat-headers (<< 4:14.0.0~) -Depends: libtqt3-headers (= ${binary:Version}) -Recommends: libtqt3-mt-dev -Description: TQt 1.x and 2.x compatibility includes - This package contains header files that are intended for build - compatibility for applications that build with TQt3 but still use - deprecated includes. It is meant as an intermediate solution and - these header files are not part of the official TQt3 API. - All sourcecode that is still using the headers of this package is - subject to be changed to use the new header files which are in - libtqt3-headers. - Package: tqt3-dev-tools Architecture: any Multi-Arch: foreign @@ -210,17 +186,27 @@ Depends: ${shlibs:Depends} Description: TQt3 Designer plugins This package contains plugins for TQt3 Designer +Package: libtqt3-apps-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Conflicts: tqt3-apps-dev (<< 4:14.1.0~) +Depends: ${shlibs:Depends}, libtqt3-mt (= ${binary:Version}) +Description: TQt3 Developer applications development libraries + This package contains additional libraries that ship with the applications + included with TQt - the TQt Designer and the TQt Assistant. + Package: tqt3-apps-dev Architecture: any Multi-Arch: no Section: devel Replaces: tqt3-apps-dev (<< 4:14.0.0~) Breaks: tqt3-apps-dev (<< 4:14.0.0~) -Depends: libtqt3-mt-dev +Depends: libtqt3-mt-dev, libtqt3-apps-dev Description: TQt3 Developer applications development files This package is intended for developers who want to develop applications - using the additional static libraries that ship with the applications - included with TQt; the TQt Designer and the TQt Assistant. + using the additional libraries that ship with the applications + included with TQt - the TQt Designer and the TQt Assistant. It allows integrating additional enhancements into the TQt Designer respectively faciliate the TQt Assistant from within your TQt application to interactively call the Assistant for displaying online help that the @@ -275,21 +261,6 @@ Description: The TQt3 Configuration Application CJK-fonts or other non-latin scripts, you will most likely want to install this package. -Package: tqt3-dev-tools-embedded -Architecture: any -Multi-Arch: foreign -Section: devel -Replaces: tqt3-dev-tools-embedded (<< 4:14.0.0~) -Breaks: tqt3-dev-tools-embedded (<< 4:14.0.0~) -Recommends: libtqt3-mt-dev -Depends: ${shlibs:Depends} -Description: Tools to develop embedded TQt applications - This package contains applications only suitable for developing - applications with TQt Embedded and/or Qtopia. It provides the QVFB - program for simulating an embedded device desktop as well as maketqpf - for converting fonts to embedded fonts suitable for being utilized - by TQt Embedded applications. - Package: tqt3-dev-tools-compat Architecture: any Multi-Arch: foreign @@ -299,7 +270,7 @@ Breaks: tqt3-dev-tools-compat (<< 4:14.0.0~) Recommends: libtqt3-mt-dev Depends: ${shlibs:Depends} Description: Conversion utilities for TQt3 development - This package contains some older TQt tools (namely tqtrename140, + This package contains some older TQt tools (namely tqm2ts, tqtmergetr, tqtfindtr and msg2tqm). These tools are needed only by application developers who need to migrate any TQt application written for TQt 1.x or 2.x over to TQt 3.x. The purpose of the tools are to @@ -313,7 +284,7 @@ Multi-Arch: foreign Section: libs Replaces: libtqt3-i18n (<< 4:14.0.0~) Breaks: libtqt3-i18n (<< 4:14.0.0~) -Recommends: libtqt3-mt +Recommends: libtqt3-mt | libtqt3-mt-t64 Description: i18n files for TQt3 library This package contains the internationalization files for the TQt library. TQt applications that are internationalized will need to depend on this package diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-apps-dev.install new file mode 100644 index 000000000..eea094136 --- /dev/null +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-apps-dev.install @@ -0,0 +1,3 @@ +usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so.* diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install deleted file mode 100644 index d2bcbd7d6..000000000 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install +++ /dev/null @@ -1,48 +0,0 @@ -usr/include/tqt3/ntqapp.h -usr/include/tqt3/ntqarray.h -usr/include/tqt3/ntqbitarry.h -usr/include/tqt3/ntqbttngrp.h -usr/include/tqt3/ntqchkbox.h -usr/include/tqt3/ntqclipbrd.h -usr/include/tqt3/ntqcollect.h -usr/include/tqt3/ntqcollection.h -usr/include/tqt3/ntqcombo.h -usr/include/tqt3/ntqconnect.h -usr/include/tqt3/ntqdatetm.h -usr/include/tqt3/ntqdrawutl.h -usr/include/tqt3/ntqdstream.h -usr/include/tqt3/ntqfiledef.h -usr/include/tqt3/ntqfiledlg.h -usr/include/tqt3/ntqfileinf.h -usr/include/tqt3/ntqfontinf.h -usr/include/tqt3/ntqfontmet.h -usr/include/tqt3/ntqgrpbox.h -usr/include/tqt3/ntqintcach.h -usr/include/tqt3/ntqiodev.h -usr/include/tqt3/ntqlcdnum.h -usr/include/tqt3/ntqlined.h -usr/include/tqt3/ntqmenudta.h -usr/include/tqt3/ntqmetaobj.h -usr/include/tqt3/ntqmlined.h -usr/include/tqt3/ntqmsgbox.h -usr/include/tqt3/ntqmultilinedit.h -usr/include/tqt3/ntqobjcoll.h -usr/include/tqt3/ntqobjdefs.h -usr/include/tqt3/ntqpdevmet.h -usr/include/tqt3/ntqpmcache.h -usr/include/tqt3/ntqpntarry.h -usr/include/tqt3/ntqpopmenu.h -usr/include/tqt3/ntqprndlg.h -usr/include/tqt3/ntqprogbar.h -usr/include/tqt3/ntqprogdlg.h -usr/include/tqt3/ntqpsprn.h -usr/include/tqt3/ntqpushbt.h -usr/include/tqt3/ntqqueue.h -usr/include/tqt3/ntqradiobt.h -usr/include/tqt3/ntqrangect.h -usr/include/tqt3/ntqscrbar.h -usr/include/tqt3/ntqsocknot.h -usr/include/tqt3/ntqtabdlg.h -usr/include/tqt3/ntqtstream.h -usr/include/tqt3/ntqwidcoll.h -usr/include/tqt3/ntqwindefs.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install index 92ebc61fb..b22eb1913 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install @@ -1,273 +1,268 @@ usr/include/tqt3/private/* -usr/include/tqt3/ntqabstractlayout.h -usr/include/tqt3/ntqaccel.h -usr/include/tqt3/ntqaccessible.h -usr/include/tqt3/ntqaction.h +usr/include/tqt3/tqaccel.h +usr/include/tqt3/tqaccessible.h +usr/include/tqt3/tqaction.h usr/include/tqt3/ntqapplication.h -usr/include/tqt3/ntqasciicache.h -usr/include/tqt3/ntqasciidict.h -usr/include/tqt3/ntqasyncimageio.h -usr/include/tqt3/ntqasyncio.h -usr/include/tqt3/ntqbig5codec.h -usr/include/tqt3/ntqbitarray.h -usr/include/tqt3/ntqbitmap.h -usr/include/tqt3/ntqbrush.h -usr/include/tqt3/ntqbuffer.h -usr/include/tqt3/ntqbutton.h -usr/include/tqt3/ntqbuttongroup.h -usr/include/tqt3/ntqcache.h -usr/include/tqt3/ntqcanvas.h -usr/include/tqt3/ntqcdestyle.h -usr/include/tqt3/ntqcheckbox.h -usr/include/tqt3/ntqcleanuphandler.h -usr/include/tqt3/ntqclipboard.h -usr/include/tqt3/ntqcolor.h -usr/include/tqt3/ntqcolordialog.h -usr/include/tqt3/ntqcombobox.h -usr/include/tqt3/ntqcommonstyle.h -usr/include/tqt3/ntqcompactstyle.h -usr/include/tqt3/ntqconnection.h -usr/include/tqt3/ntqcstring.h -usr/include/tqt3/ntqcursor.h -usr/include/tqt3/ntqdatabrowser.h -usr/include/tqt3/ntqdatastream.h -usr/include/tqt3/ntqdatatable.h -usr/include/tqt3/ntqdataview.h -usr/include/tqt3/ntqdatetime.h -usr/include/tqt3/ntqdatetimeedit.h -usr/include/tqt3/ntqdeepcopy.h -usr/include/tqt3/ntqdesktopwidget.h -usr/include/tqt3/ntqdial.h -usr/include/tqt3/ntqdialog.h -usr/include/tqt3/ntqdict.h -usr/include/tqt3/ntqdir.h -usr/include/tqt3/ntqdns.h -usr/include/tqt3/ntqdockarea.h -usr/include/tqt3/ntqdockwindow.h -usr/include/tqt3/ntqdom.h -usr/include/tqt3/ntqdragobject.h -usr/include/tqt3/ntqdrawutil.h -usr/include/tqt3/ntqdropsite.h -usr/include/tqt3/ntqeditorfactory.h -usr/include/tqt3/ntqerrormessage.h -usr/include/tqt3/ntqeucjpcodec.h -usr/include/tqt3/ntqeuckrcodec.h -usr/include/tqt3/ntqevent.h -usr/include/tqt3/ntqeventloop.h -usr/include/tqt3/ntqfeatures.h -usr/include/tqt3/ntqfile.h -usr/include/tqt3/ntqfiledialog.h -usr/include/tqt3/ntqfileinfo.h -usr/include/tqt3/ntqfocusdata.h -usr/include/tqt3/ntqfont.h -usr/include/tqt3/ntqfontdatabase.h -usr/include/tqt3/ntqfontdialog.h -usr/include/tqt3/ntqfontinfo.h -usr/include/tqt3/ntqfontmetrics.h -usr/include/tqt3/ntqframe.h -usr/include/tqt3/ntqftp.h -usr/include/tqt3/ntqgarray.h -usr/include/tqt3/ntqgb18030codec.h -usr/include/tqt3/ntqgbkcodec.h -usr/include/tqt3/ntqgcache.h -usr/include/tqt3/ntqgdict.h -usr/include/tqt3/ntqgeneric.h -usr/include/tqt3/ntqgif.h -usr/include/tqt3/ntqglist.h -usr/include/tqt3/ntqglobal.h -usr/include/tqt3/ntqgplugin.h -usr/include/tqt3/ntqgrid.h -usr/include/tqt3/ntqgridview.h -usr/include/tqt3/ntqgroupbox.h -usr/include/tqt3/ntqguardedptr.h -usr/include/tqt3/ntqgvector.h -usr/include/tqt3/ntqhbox.h -usr/include/tqt3/ntqhbuttongroup.h -usr/include/tqt3/ntqheader.h -usr/include/tqt3/ntqhgroupbox.h -usr/include/tqt3/ntqhostaddress.h -usr/include/tqt3/ntqhttp.h -usr/include/tqt3/ntqiconset.h -usr/include/tqt3/ntqiconview.h -usr/include/tqt3/ntqimage.h -usr/include/tqt3/ntqimageformatplugin.h -usr/include/tqt3/ntqinputcontext.h -usr/include/tqt3/ntqinputcontextfactory.h -usr/include/tqt3/ntqinputcontextplugin.h -usr/include/tqt3/ntqinputdialog.h -usr/include/tqt3/ntqintcache.h -usr/include/tqt3/ntqintdict.h -usr/include/tqt3/ntqinterlacestyle.h -usr/include/tqt3/ntqiodevice.h -usr/include/tqt3/ntqjiscodec.h -usr/include/tqt3/ntqjpegio.h -usr/include/tqt3/ntqjpunicode.h -usr/include/tqt3/ntqkeycode.h -usr/include/tqt3/ntqkeysequence.h -usr/include/tqt3/ntqlabel.h -usr/include/tqt3/ntqlayout.h -usr/include/tqt3/ntqlcdnumber.h -usr/include/tqt3/ntqlibrary.h -usr/include/tqt3/ntqlineedit.h -usr/include/tqt3/ntqlistbox.h -usr/include/tqt3/ntqlistview.h -usr/include/tqt3/ntqlocale.h -usr/include/tqt3/ntqlocalfs.h -usr/include/tqt3/ntqmainwindow.h -usr/include/tqt3/ntqmap.h -usr/include/tqt3/ntqmemarray.h -usr/include/tqt3/ntqmenubar.h -usr/include/tqt3/ntqmenudata.h -usr/include/tqt3/ntqmessagebox.h -usr/include/tqt3/ntqmetaobject.h -usr/include/tqt3/ntqmime.h -usr/include/tqt3/ntqmngio.h -usr/include/tqt3/ntqmotifstyle.h -usr/include/tqt3/ntqmotifplusstyle.h -usr/include/tqt3/ntqmovie.h -usr/include/tqt3/ntqmultilineedit.h -usr/include/tqt3/ntqmutex.h -usr/include/tqt3/ntqnamespace.h -usr/include/tqt3/ntqnetwork.h -usr/include/tqt3/ntqnetworkprotocol.h -usr/include/tqt3/ntqnp.h -usr/include/tqt3/ntqobject.h -usr/include/tqt3/ntqobjectcleanuphandler.h -usr/include/tqt3/ntqobjectdefs.h -usr/include/tqt3/ntqobjectdict.h -usr/include/tqt3/ntqobjectlist.h -usr/include/tqt3/ntqpaintdevice.h -usr/include/tqt3/ntqpaintdevicemetrics.h -usr/include/tqt3/ntqpainter.h -usr/include/tqt3/ntqpair.h -usr/include/tqt3/ntqpalette.h -usr/include/tqt3/ntqpen.h -usr/include/tqt3/ntqpicture.h -usr/include/tqt3/ntqpixmap.h -usr/include/tqt3/ntqpixmapcache.h -usr/include/tqt3/ntqplatinumstyle.h -usr/include/tqt3/ntqpngio.h -usr/include/tqt3/ntqpoint.h -usr/include/tqt3/ntqpointarray.h -usr/include/tqt3/ntqpolygonscanner.h -usr/include/tqt3/ntqpopupmenu.h -usr/include/tqt3/ntqprintdialog.h -usr/include/tqt3/ntqprinter.h -usr/include/tqt3/ntqprocess.h -usr/include/tqt3/ntqprogressbar.h -usr/include/tqt3/ntqprogressdialog.h -usr/include/tqt3/ntqptrcollection.h -usr/include/tqt3/ntqptrdict.h -usr/include/tqt3/ntqptrlist.h -usr/include/tqt3/ntqptrqueue.h -usr/include/tqt3/ntqptrstack.h -usr/include/tqt3/ntqptrvector.h -usr/include/tqt3/ntqpushbutton.h -usr/include/tqt3/ntqradiobutton.h -usr/include/tqt3/ntqrangecontrol.h -usr/include/tqt3/ntqrect.h -usr/include/tqt3/ntqregexp.h -usr/include/tqt3/ntqregion.h -usr/include/tqt3/ntqrtlcodec.h -usr/include/tqt3/ntqscrollbar.h -usr/include/tqt3/ntqscrollview.h -usr/include/tqt3/ntqsemaphore.h -usr/include/tqt3/ntqsemimodal.h -usr/include/tqt3/ntqserversocket.h -usr/include/tqt3/ntqsession.h -usr/include/tqt3/ntqsessionmanager.h -usr/include/tqt3/ntqsettings.h -usr/include/tqt3/ntqsgistyle.h -usr/include/tqt3/ntqshared.h -usr/include/tqt3/ntqsignal.h -usr/include/tqt3/ntqsignalmapper.h -usr/include/tqt3/ntqsignalslotimp.h -usr/include/tqt3/ntqsimplerichtext.h -usr/include/tqt3/ntqsize.h -usr/include/tqt3/ntqsizegrip.h -usr/include/tqt3/ntqsizepolicy.h -usr/include/tqt3/ntqsjiscodec.h -usr/include/tqt3/ntqslider.h -usr/include/tqt3/ntqsocket.h -usr/include/tqt3/ntqsocketdevice.h -usr/include/tqt3/ntqsocketnotifier.h -usr/include/tqt3/ntqsortedlist.h -usr/include/tqt3/ntqsound.h -usr/include/tqt3/ntqspinbox.h -usr/include/tqt3/ntqsplashscreen.h -usr/include/tqt3/ntqsplitter.h -usr/include/tqt3/ntqsql.h -usr/include/tqt3/ntqsqlcursor.h -usr/include/tqt3/ntqsqldatabase.h -usr/include/tqt3/ntqsqldriver.h -usr/include/tqt3/ntqsqldriverplugin.h -usr/include/tqt3/ntqsqleditorfactory.h -usr/include/tqt3/ntqsqlerror.h -usr/include/tqt3/ntqsqlfield.h -usr/include/tqt3/ntqsqlform.h -usr/include/tqt3/ntqsqlindex.h -usr/include/tqt3/ntqsqlpropertymap.h -usr/include/tqt3/ntqsqlquery.h -usr/include/tqt3/ntqsqlrecord.h -usr/include/tqt3/ntqsqlresult.h -usr/include/tqt3/ntqsqlselectcursor.h -usr/include/tqt3/ntqstatusbar.h -usr/include/tqt3/ntqstring.h -usr/include/tqt3/ntqstringlist.h -usr/include/tqt3/ntqstrlist.h -usr/include/tqt3/ntqstrvec.h -usr/include/tqt3/ntqstyle.h -usr/include/tqt3/ntqstylefactory.h -usr/include/tqt3/ntqstyleplugin.h -usr/include/tqt3/ntqstylesheet.h -usr/include/tqt3/ntqsyntaxhighlighter.h -usr/include/tqt3/ntqt.h -usr/include/tqt3/ntqtabbar.h -usr/include/tqt3/ntqtabdialog.h -usr/include/tqt3/ntqtable.h -usr/include/tqt3/ntqtabwidget.h -usr/include/tqt3/ntqtextbrowser.h -usr/include/tqt3/ntqtextcodec.h -usr/include/tqt3/ntqtextcodecfactory.h -usr/include/tqt3/ntqtextcodecplugin.h -usr/include/tqt3/ntqtextedit.h -usr/include/tqt3/ntqtextstream.h -usr/include/tqt3/ntqtextview.h -usr/include/tqt3/ntqthread.h -usr/include/tqt3/ntqthreadstorage.h -usr/include/tqt3/ntqtimer.h -usr/include/tqt3/ntqtl.h -usr/include/tqt3/ntqtoolbar.h -usr/include/tqt3/ntqtoolbox.h -usr/include/tqt3/ntqtoolbutton.h -usr/include/tqt3/ntqtooltip.h -usr/include/tqt3/ntqtranslator.h -usr/include/tqt3/ntqtsciicodec.h -usr/include/tqt3/ntqurl.h -usr/include/tqt3/ntqurlinfo.h -usr/include/tqt3/ntqurloperator.h -usr/include/tqt3/ntqutfcodec.h -usr/include/tqt3/ntquuid.h -usr/include/tqt3/ntqvalidator.h -usr/include/tqt3/ntqvaluelist.h -usr/include/tqt3/ntqvaluestack.h -usr/include/tqt3/ntqvaluevector.h -usr/include/tqt3/ntqvariant.h -usr/include/tqt3/ntqvbox.h -usr/include/tqt3/ntqvbuttongroup.h -usr/include/tqt3/ntqvfbhdr.h -usr/include/tqt3/ntqvgroupbox.h -usr/include/tqt3/ntqwaitcondition.h -usr/include/tqt3/ntqwhatsthis.h -usr/include/tqt3/ntqwidget.h -usr/include/tqt3/ntqwidgetintdict.h -usr/include/tqt3/ntqwidgetlist.h -usr/include/tqt3/ntqwidgetplugin.h -usr/include/tqt3/ntqwidgetstack.h -usr/include/tqt3/ntqwindowdefs.h -usr/include/tqt3/ntqwindowsstyle.h -usr/include/tqt3/ntqwinexport.h -usr/include/tqt3/ntqwizard.h -usr/include/tqt3/ntqwmatrix.h -usr/include/tqt3/ntqworkspace.h -usr/include/tqt3/ntqxml.h +usr/include/tqt3/tqasciicache.h +usr/include/tqt3/tqasciidict.h +usr/include/tqt3/tqasyncimageio.h +usr/include/tqt3/tqasyncio.h +usr/include/tqt3/tqbig5codec.h +usr/include/tqt3/tqbitarray.h +usr/include/tqt3/tqbitmap.h +usr/include/tqt3/tqbrush.h +usr/include/tqt3/tqbuffer.h +usr/include/tqt3/tqbutton.h +usr/include/tqt3/tqbuttongroup.h +usr/include/tqt3/tqcache.h +usr/include/tqt3/tqcanvas.h +usr/include/tqt3/tqcdestyle.h +usr/include/tqt3/tqcheckbox.h +usr/include/tqt3/tqcleanuphandler.h +usr/include/tqt3/tqclipboard.h +usr/include/tqt3/tqcolor.h +usr/include/tqt3/tqcolordialog.h +usr/include/tqt3/tqcombobox.h +usr/include/tqt3/tqcommonstyle.h +usr/include/tqt3/tqcompactstyle.h +usr/include/tqt3/tqconnection.h +usr/include/tqt3/tqcstring.h +usr/include/tqt3/tqcursor.h +usr/include/tqt3/tqdatabrowser.h +usr/include/tqt3/tqdatastream.h +usr/include/tqt3/tqdatatable.h +usr/include/tqt3/tqdataview.h +usr/include/tqt3/tqdatetime.h +usr/include/tqt3/tqdatetimeedit.h +usr/include/tqt3/tqdeepcopy.h +usr/include/tqt3/tqdesktopwidget.h +usr/include/tqt3/tqdial.h +usr/include/tqt3/tqdialog.h +usr/include/tqt3/tqdict.h +usr/include/tqt3/tqdir.h +usr/include/tqt3/tqdns.h +usr/include/tqt3/tqdockarea.h +usr/include/tqt3/tqdockwindow.h +usr/include/tqt3/tqdom.h +usr/include/tqt3/tqdragobject.h +usr/include/tqt3/tqdrawutil.h +usr/include/tqt3/tqdropsite.h +usr/include/tqt3/tqeditorfactory.h +usr/include/tqt3/tqerrormessage.h +usr/include/tqt3/tqeucjpcodec.h +usr/include/tqt3/tqeuckrcodec.h +usr/include/tqt3/tqevent.h +usr/include/tqt3/tqeventloop.h +usr/include/tqt3/tqfeatures.h +usr/include/tqt3/tqfile.h +usr/include/tqt3/tqfiledialog.h +usr/include/tqt3/tqfileinfo.h +usr/include/tqt3/tqfocusdata.h +usr/include/tqt3/tqfont.h +usr/include/tqt3/tqfontdatabase.h +usr/include/tqt3/tqfontdialog.h +usr/include/tqt3/tqfontinfo.h +usr/include/tqt3/tqfontmetrics.h +usr/include/tqt3/tqframe.h +usr/include/tqt3/tqftp.h +usr/include/tqt3/tqgarray.h +usr/include/tqt3/tqgb18030codec.h +usr/include/tqt3/tqgbkcodec.h +usr/include/tqt3/tqgcache.h +usr/include/tqt3/tqgdict.h +usr/include/tqt3/tqgif.h +usr/include/tqt3/tqglist.h +usr/include/tqt3/tqglobal.h +usr/include/tqt3/tqgplugin.h +usr/include/tqt3/tqgrid.h +usr/include/tqt3/tqgridview.h +usr/include/tqt3/tqgroupbox.h +usr/include/tqt3/tqguardedptr.h +usr/include/tqt3/tqgvector.h +usr/include/tqt3/tqhbox.h +usr/include/tqt3/tqhbuttongroup.h +usr/include/tqt3/tqheader.h +usr/include/tqt3/tqhebrewcodec.h +usr/include/tqt3/tqhgroupbox.h +usr/include/tqt3/tqhostaddress.h +usr/include/tqt3/tqhttp.h +usr/include/tqt3/tqiconset.h +usr/include/tqt3/tqiconview.h +usr/include/tqt3/tqimage.h +usr/include/tqt3/tqimageformatplugin.h +usr/include/tqt3/tqinputcontext.h +usr/include/tqt3/tqinputcontextfactory.h +usr/include/tqt3/tqinputcontextplugin.h +usr/include/tqt3/tqinputdialog.h +usr/include/tqt3/tqintcache.h +usr/include/tqt3/tqintdict.h +usr/include/tqt3/tqinterlacestyle.h +usr/include/tqt3/tqiodevice.h +usr/include/tqt3/tqjiscodec.h +usr/include/tqt3/tqjpegio.h +usr/include/tqt3/tqjpunicode.h +usr/include/tqt3/tqkeycode.h +usr/include/tqt3/tqkeysequence.h +usr/include/tqt3/tqlabel.h +usr/include/tqt3/tqlayout.h +usr/include/tqt3/tqlcdnumber.h +usr/include/tqt3/tqlibrary.h +usr/include/tqt3/tqlineedit.h +usr/include/tqt3/tqlistbox.h +usr/include/tqt3/tqlistview.h +usr/include/tqt3/tqlocale.h +usr/include/tqt3/tqlocalfs.h +usr/include/tqt3/tqmainwindow.h +usr/include/tqt3/tqmap.h +usr/include/tqt3/tqmemarray.h +usr/include/tqt3/tqmenubar.h +usr/include/tqt3/tqmenudata.h +usr/include/tqt3/tqmessagebox.h +usr/include/tqt3/tqmetaobject.h +usr/include/tqt3/tqmime.h +usr/include/tqt3/tqmngio.h +usr/include/tqt3/tqmotifstyle.h +usr/include/tqt3/tqmotifplusstyle.h +usr/include/tqt3/tqmovie.h +usr/include/tqt3/tqmultilineedit.h +usr/include/tqt3/tqmutex.h +usr/include/tqt3/tqnamespace.h +usr/include/tqt3/tqnetwork.h +usr/include/tqt3/tqnetworkprotocol.h +usr/include/tqt3/tqnp.h +usr/include/tqt3/tqobject.h +usr/include/tqt3/tqobjectcleanuphandler.h +usr/include/tqt3/tqobjectdefs.h +usr/include/tqt3/tqobjectdict.h +usr/include/tqt3/tqobjectlist.h +usr/include/tqt3/tqpaintdevice.h +usr/include/tqt3/tqpaintdevicemetrics.h +usr/include/tqt3/tqpainter.h +usr/include/tqt3/tqpair.h +usr/include/tqt3/tqpalette.h +usr/include/tqt3/tqpen.h +usr/include/tqt3/tqpicture.h +usr/include/tqt3/tqpixmap.h +usr/include/tqt3/tqpixmapcache.h +usr/include/tqt3/tqplatinumstyle.h +usr/include/tqt3/tqpngio.h +usr/include/tqt3/tqpoint.h +usr/include/tqt3/tqpointarray.h +usr/include/tqt3/tqpolygonscanner.h +usr/include/tqt3/tqpopupmenu.h +usr/include/tqt3/tqprintdialog.h +usr/include/tqt3/tqprinter.h +usr/include/tqt3/tqprocess.h +usr/include/tqt3/tqprogressbar.h +usr/include/tqt3/tqprogressdialog.h +usr/include/tqt3/tqptrcollection.h +usr/include/tqt3/tqptrdict.h +usr/include/tqt3/tqptrlist.h +usr/include/tqt3/tqptrqueue.h +usr/include/tqt3/tqptrstack.h +usr/include/tqt3/tqptrvector.h +usr/include/tqt3/tqpushbutton.h +usr/include/tqt3/tqradiobutton.h +usr/include/tqt3/tqrangecontrol.h +usr/include/tqt3/tqrect.h +usr/include/tqt3/tqregexp.h +usr/include/tqt3/tqregion.h +usr/include/tqt3/tqscrollbar.h +usr/include/tqt3/tqscrollview.h +usr/include/tqt3/tqsemaphore.h +usr/include/tqt3/tqserversocket.h +usr/include/tqt3/tqsessionmanager.h +usr/include/tqt3/tqsettings.h +usr/include/tqt3/tqsgistyle.h +usr/include/tqt3/tqshared.h +usr/include/tqt3/tqsignal.h +usr/include/tqt3/tqsignalmapper.h +usr/include/tqt3/tqsignalslotimp.h +usr/include/tqt3/tqsimplerichtext.h +usr/include/tqt3/tqsize.h +usr/include/tqt3/tqsizegrip.h +usr/include/tqt3/tqsizepolicy.h +usr/include/tqt3/tqsjiscodec.h +usr/include/tqt3/tqslider.h +usr/include/tqt3/tqsocket.h +usr/include/tqt3/tqsocketdevice.h +usr/include/tqt3/tqsocketnotifier.h +usr/include/tqt3/tqsound.h +usr/include/tqt3/tqspinbox.h +usr/include/tqt3/tqsplashscreen.h +usr/include/tqt3/tqsplitter.h +usr/include/tqt3/tqsql.h +usr/include/tqt3/tqsqlcursor.h +usr/include/tqt3/tqsqldatabase.h +usr/include/tqt3/tqsqldriver.h +usr/include/tqt3/tqsqldriverplugin.h +usr/include/tqt3/tqsqleditorfactory.h +usr/include/tqt3/tqsqlerror.h +usr/include/tqt3/tqsqlfield.h +usr/include/tqt3/tqsqlform.h +usr/include/tqt3/tqsqlindex.h +usr/include/tqt3/tqsqlpropertymap.h +usr/include/tqt3/tqsqlquery.h +usr/include/tqt3/tqsqlrecord.h +usr/include/tqt3/tqsqlresult.h +usr/include/tqt3/tqsqlselectcursor.h +usr/include/tqt3/tqstatusbar.h +usr/include/tqt3/tqstring.h +usr/include/tqt3/tqstringlist.h +usr/include/tqt3/tqstrlist.h +usr/include/tqt3/tqstrvec.h +usr/include/tqt3/tqstyle.h +usr/include/tqt3/tqstylefactory.h +usr/include/tqt3/tqstyleplugin.h +usr/include/tqt3/tqstylesheet.h +usr/include/tqt3/tqsyntaxhighlighter.h +usr/include/tqt3/tqt3.h +usr/include/tqt3/tqt.h +usr/include/tqt3/tqtabbar.h +usr/include/tqt3/tqtabdialog.h +usr/include/tqt3/tqtable.h +usr/include/tqt3/tqtabwidget.h +usr/include/tqt3/tqtextbrowser.h +usr/include/tqt3/tqtextcodec.h +usr/include/tqt3/tqtextcodecfactory.h +usr/include/tqt3/tqtextcodecplugin.h +usr/include/tqt3/tqtextedit.h +usr/include/tqt3/tqtextstream.h +usr/include/tqt3/tqtextview.h +usr/include/tqt3/tqthread.h +usr/include/tqt3/tqthreadstorage.h +usr/include/tqt3/tqtimer.h +usr/include/tqt3/tqtl.h +usr/include/tqt3/tqtoolbar.h +usr/include/tqt3/tqtoolbox.h +usr/include/tqt3/tqtoolbutton.h +usr/include/tqt3/tqtooltip.h +usr/include/tqt3/tqtranslator.h +usr/include/tqt3/tqtsciicodec.h +usr/include/tqt3/tqurl.h +usr/include/tqt3/tqurlinfo.h +usr/include/tqt3/tqurloperator.h +usr/include/tqt3/tqutfcodec.h +usr/include/tqt3/tquuid.h +usr/include/tqt3/tqvalidator.h +usr/include/tqt3/tqvaluelist.h +usr/include/tqt3/tqvaluestack.h +usr/include/tqt3/tqvaluevector.h +usr/include/tqt3/tqvariant.h +usr/include/tqt3/tqvbox.h +usr/include/tqt3/tqvbuttongroup.h +usr/include/tqt3/tqvgroupbox.h +usr/include/tqt3/tqwaitcondition.h +usr/include/tqt3/tqwhatsthis.h +usr/include/tqt3/tqwidget.h +usr/include/tqt3/tqwidgetintdict.h +usr/include/tqt3/tqwidgetlist.h +usr/include/tqt3/tqwidgetplugin.h +usr/include/tqt3/tqwidgetstack.h +usr/include/tqt3/tqwindowdefs.h +usr/include/tqt3/tqwindowsstyle.h +usr/include/tqt3/tqwinexport.h +usr/include/tqt3/tqwizard.h +usr/include/tqt3/tqwmatrix.h +usr/include/tqt3/tqworkspace.h +usr/include/tqt3/tqxml.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs index dbd9a5d19..59a51ee13 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs @@ -1,4 +1,5 @@ -README +README.md README.immodule +README.Qt3 README-QT.TXT PLATFORMS diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install index c86cba1b1..6ef3618a7 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install @@ -5,7 +5,7 @@ usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc usr/include/tqt3/ntqconfig.h -usr/include/tqt3/ntqgl.h -usr/include/tqt3/ntqglcolormap.h +usr/include/tqt3/tqgl.h +usr/include/tqt3/tqglcolormap.h usr/include/tqt3/ntqmodules.h -usr/include/tqt3/ntqwidgetfactory.h +usr/include/tqt3/tqwidgetfactory.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs index dbd9a5d19..59a51ee13 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs @@ -1,4 +1,5 @@ -README +README.md README.immodule +README.Qt3 README-QT.TXT PLATFORMS diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install index 33303e90c..023c39399 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install @@ -1,4 +1,4 @@ usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.* usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.* -usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libqmng.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libtqmng.so usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/inputmethods/*.so diff --git a/ubuntu/_base/dependencies/tqt3/debian/qt_plugins_3.3rc b/ubuntu/_base/dependencies/tqt3/debian/qt_plugins_3.3rc index e193b495c..6a411f315 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/qt_plugins_3.3rc +++ b/ubuntu/_base/dependencies/tqt3/debian/qt_plugins_3.3rc @@ -1,4 +1,4 @@ [usr] lib/trinity/plugins/styles/plastik.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-09-29T20:06:31^e -lib/tqt3/plugins/imageformats/libqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e +lib/tqt3/plugins/imageformats/libtqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules index ddc008924..37a09ad05 100755 --- a/ubuntu/_base/dependencies/tqt3/debian/rules +++ b/ubuntu/_base/dependencies/tqt3/debian/rules @@ -25,6 +25,13 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) +ifeq ($(DEB_TIME64_API),true) +DEB_TIME64_SUFFIX = -t64 +else +DEB_TIME64_SUFFIX = +endif + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL ?= true @@ -44,7 +51,7 @@ endif #hurd # build variables (directorys) DEBIAN = $(shell pwd)/debian -P_LIBS = $(DEBIAN)/libtqt3-mt +P_LIBS = $(DEBIAN)/libtqt3-mt$(DEB_TIME64_SUFFIX) P_DOC = $(DEBIAN)/tqt3-doc P_APPSDEV = $(DEBIAN)/tqt3-apps-dev P_HEADERS = $(DEBIAN)/libtqt3-headers @@ -139,6 +146,22 @@ endif post-patches:: dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libtqt3-mt\." | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libtqt3-mt$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libtqt3-mt\\)$$/\\1$(DEB_TIME64_SUFFIX)/" \ + -e "s/^\\(Replaces\\|Breaks\\): \\(libtqt3-mt\\)\\( \|$$\)/\\1: \\2, \\2$(DEB_TIME64_SUFFIX)\\3/" \ + -e "s/\\(libtqt3-mt\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +endif build build-arch: libqt-thread-stamp build-indep: @@ -162,17 +185,12 @@ libqt-thread-stamp: post-patches # archives get accidentally stripped by make install. Copy over unstripped ones for now. -cp lib/lib*.a $(TMP_INSTALL)/usr/lib/ - cp bin/tqtrename140 $(TMP_INSTALL)/usr/bin/ cp bin/tqtfindtr $(TMP_INSTALL)/usr/bin/ # build tqtconv2ui cd tools/designer/tools/tqtconv2ui && $(MAKE) cp bin/tqtconv2ui $(TMP_INSTALL)/usr/bin/tqtconv2ui - # build tqvfb - cd tools/tqvfb/ && $(MAKE) - cp tools/tqvfb/tqvfb $(TMP_INSTALL)/usr/bin/tqvfb - # install qmake.cache file install -d $(P_QTMTDEV)/usr/share/tqt3/ cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache @@ -191,10 +209,10 @@ clean:: if [ -f "src/Makefile" ]; then \ $(MAKE) -C src clean; $(MAKE) -C plugins/src distclean; $(MAKE) -C tools distclean; \ - $(MAKE) -C tools/maketqpf distclean; $(MAKE) -C tools/qconfig distclean; $(MAKE) -C tools/tqvfb distclean; \ + $(MAKE) -C tools/qconfig distclean; \ $(MAKE) -C tools/msg2tqm distclean; $(MAKE) -C tools/tqtmergetr distclean; $(MAKE) -C tools/qembed distclean; \ $(MAKE) -C tools/designer/tools/tqtconv2ui distclean; $(MAKE) -C tools/designer/tools/tqtcreatecw distclean; \ - $(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \ + $(MAKE) -C tools/designer/plugins/glade distclean; \ $(MAKE) -C config.tests/unix/largefile distclean; $(MAKE) -C qmake distclean; \ fi @@ -225,6 +243,20 @@ clean:: dh_clean +ifeq ($(DEB_TIME64_API),true) + # revert library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "\.t64$$" | \ + while read a; do \ + mv $$a $${a%.t64}; \ + done + ls -d debian/* | \ + grep -E "/libtqt3-mt$(DEB_TIME64_SUFFIX)\." | \ + xargs -r rm + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif + install: build dh_testdir @@ -367,11 +399,6 @@ binary-arch: build install cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/tqt3/ rm -rf `pwd`/debian/tqt3-apps-dev/usr/include/tqt3/preferences.ui.h - ## tqvfb package - install -m644 -D `pwd`/tools/tqvfb/pda.skin `pwd`/debian/tqt3-dev-tools-embedded/etc/tqt3/tqvfb/pda.skin - install -m644 -D `pwd`/tools/tqvfb/pda_down.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/tqvfb/pda_down.png - install -m644 -D `pwd`/tools/tqvfb/pda_up.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/tqvfb/pda_up.png - # remove utterly ugle symlink rm -rf `pwd`/debian/tqt3-dev-tools//usr/share/tqt3/mkspecs/linux-g++/linux-g++ @@ -424,7 +451,7 @@ binary-arch: build install dh_link -ptqt3-dev-tools usr/share/tqt3/doc/html usr/share/doc/tqt3-dev-tools/html # copy README.Debian - for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done + for a in libtqt3-mt-dev libtqt3-mt$(DEB_TIME64_SUFFIX) tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done # install the qmake binary rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake @@ -461,14 +488,11 @@ binary-arch: build install dh_makeshlibs -a $(IBASE) -V dh_installdeb -a $(IBASE) dh_perl -a $(IBASE) - dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt/usr/lib + dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt$(DEB_TIME64_SUFFIX)/usr/lib # fix shlibdeps madness for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done - # fix conffiles file for tqt3-dev-tools-embedded - echo "/etc/tqt3/tqvfb/pda.skin" > `pwd`/debian/tqt3-dev-tools-embedded/DEBIAN/conffiles - dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install index d60b07fc7..d3cfad18a 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install @@ -1,4 +1,4 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.* -usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.* -usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.* -usr/include/tqt3/ntqassistantclient.h +usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so +usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so +usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so +usr/include/tqt3/tqassistantclient.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links index 72bd7093a..60fe91b77 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links @@ -1,8 +1,8 @@ /usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so /usr/share/tqt3/lib/libtqteditor.so /usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so /usr/share/tqt3/lib/libtqtdesignercore.so /usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so /usr/share/tqt3/lib/libtqassistantclient.so /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install index 56e0156b5..5975d4bb9 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install @@ -1,4 +1,3 @@ -usr/bin/tqtrename140 usr/bin/tqm2ts usr/bin/tqtmergetr usr/bin/tqtfindtr diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install deleted file mode 100644 index 38a249f41..000000000 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/maketqpf -usr/bin/tqvfb diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links deleted file mode 100644 index 72baff7fd..000000000 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/maketqpf /usr/share/tqt3/bin/maketqpf -/usr/bin/tqvfb /usr/share/tqt3/bin/tqvfb diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs b/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs index f08fd0f02..2630a416c 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs @@ -1,2 +1,3 @@ FAQ +README.md README-QT.TXT |