[Pkg-kde-commits] rev 1255 - in people/chrsmrtn: . qt-x11-free qt-x11-free/debian qt-x11-free/debian/maintain qt-x11-free/debian/maintain/man qt-x11-free/debian/patches

Christopher Martin chrsmrtn-guest@costa.debian.org
Thu, 07 Jul 2005 04:47:29 +0000


Author: chrsmrtn-guest
Date: 2005-07-07 04:47:25 +0000 (Thu, 07 Jul 2005)
New Revision: 1255

Added:
   people/chrsmrtn/qt-x11-free/
   people/chrsmrtn/qt-x11-free/debian/
   people/chrsmrtn/qt-x11-free/debian/README.Debian
   people/chrsmrtn/qt-x11-free/debian/changelog
   people/chrsmrtn/qt-x11-free/debian/compat
   people/chrsmrtn/qt-x11-free/debian/control
   people/chrsmrtn/qt-x11-free/debian/copyright
   people/chrsmrtn/qt-x11-free/debian/libqt3-compat-headers.install
   people/chrsmrtn/qt-x11-free/debian/libqt3-headers.install
   people/chrsmrtn/qt-x11-free/debian/libqt3-i18n.install
   people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.docs
   people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.install
   people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.links
   people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-ibase.install
   people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-mysql.install
   people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-odbc.install
   people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-psql.install
   people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-sqlite.install
   people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.install
   people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.links
   people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.postrm
   people/chrsmrtn/qt-x11-free/debian/maintain/
   people/chrsmrtn/qt-x11-free/debian/maintain/assistant.desktop
   people/chrsmrtn/qt-x11-free/debian/maintain/build-examples.sh
   people/chrsmrtn/qt-x11-free/debian/maintain/designer-qt3.desktop
   people/chrsmrtn/qt-x11-free/debian/maintain/linguist.desktop
   people/chrsmrtn/qt-x11-free/debian/maintain/man/
   people/chrsmrtn/qt-x11-free/debian/maintain/man/createcw.1
   people/chrsmrtn/qt-x11-free/debian/maintain/man/designer.1
   people/chrsmrtn/qt-x11-free/debian/maintain/man/findtr.1
   people/chrsmrtn/qt-x11-free/debian/maintain/man/linguist.1
   people/chrsmrtn/qt-x11-free/debian/maintain/man/makeqpf.1
   people/chrsmrtn/qt-x11-free/debian/maintain/man/mergetr.1
   people/chrsmrtn/qt-x11-free/debian/maintain/man/msg2qm.1
   people/chrsmrtn/qt-x11-free/debian/maintain/man/qembed.1
   people/chrsmrtn/qt-x11-free/debian/maintain/man/qt20fix.1
   people/chrsmrtn/qt-x11-free/debian/maintain/man/qtconfig.1
   people/chrsmrtn/qt-x11-free/debian/maintain/man/qvfb.1
   people/chrsmrtn/qt-x11-free/debian/maintain/mkpatch.sh
   people/chrsmrtn/qt-x11-free/debian/maintain/qtconfig.desktop
   people/chrsmrtn/qt-x11-free/debian/patches/
   people/chrsmrtn/qt-x11-free/debian/patches/00list
   people/chrsmrtn/qt-x11-free/debian/patches/00list.mips
   people/chrsmrtn/qt-x11-free/debian/patches/00list.mipsel
   people/chrsmrtn/qt-x11-free/debian/patches/02_various_fixes.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/03_qt_fontlist_fix.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/04_qsql_odbc.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/06_disable_rpath.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/07_use_libtool.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/08_thread_default.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/09_amd64_lib64.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/14_fix_kmenu.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/17_fix_qfontdatabase_cpp.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/21_fix_mips_mipsel.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/30_gcc4_build.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch
   people/chrsmrtn/qt-x11-free/debian/qt3-apps-dev.install
   people/chrsmrtn/qt-x11-free/debian/qt3-apps-dev.links
   people/chrsmrtn/qt-x11-free/debian/qt3-assistant.install
   people/chrsmrtn/qt-x11-free/debian/qt3-assistant.menu
   people/chrsmrtn/qt-x11-free/debian/qt3-designer.install
   people/chrsmrtn/qt-x11-free/debian/qt3-designer.menu
   people/chrsmrtn/qt-x11-free/debian/qt3-designer.postinst
   people/chrsmrtn/qt-x11-free/debian/qt3-designer.prerm
   people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools-compat.install
   people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools-embedded.install
   people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools-embedded.links
   people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.install
   people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.links
   people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.postinst
   people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.prerm
   people/chrsmrtn/qt-x11-free/debian/qt3-doc.doc-base
   people/chrsmrtn/qt-x11-free/debian/qt3-doc.docs
   people/chrsmrtn/qt-x11-free/debian/qt3-doc.links
   people/chrsmrtn/qt-x11-free/debian/qt3-linguist.install
   people/chrsmrtn/qt-x11-free/debian/qt3-linguist.menu
   people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.install
   people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.menu
   people/chrsmrtn/qt-x11-free/debian/rules
Log:
Qt3 - the next package?


Added: people/chrsmrtn/qt-x11-free/debian/README.Debian
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/README.Debian	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/README.Debian	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,366 @@
+Qt for Debian README
+--------------------
+
+1. Preface
+
+This README is intended to give developers and users exact information
+about how the qt-x11-free package provided by TrollTech AS has been packaged
+for Debian in case you either want to faciliate it for development 
+of applications and libraries or plugins using the Qt class library. With 
+qt-x11-3.1.1, the Debian packages have been massively restructured to get 
+the most out of theoriginal Qt package and spit the contents up into 
+several packages so that they make the most sensefor several groups of 
+users; developers, application users, translators of Qt-based 
+applications and Debian packagers who are packaging applications developed 
+with Qt.2. 
+
+2. General Overview
+
+As Qt is a huge package that contains a complete environment for 
+developers, it needs to be split up into several packages that make it 
+easier for everyone else to handle it and not to require 
+unnecessary disk space for end-users. Additionally, Qt can be configured 
+in several ways - and therefore also used in several ways. Qt development 
+usually requires the environment variable QTDIR. As Debian is placing 
+libraries and header files in a quite specific filesystem order, this 
+usually breaks setting a single environment variable to meet the 
+requirements of packages. Therefore, symlinks are used to set up the system 
+to meet both, the Debian filesystem standard and the QTDIR variable. All of 
+Qt (so the QTDIR path) is available in /usr/share/qt3. If you need to set 
+QTDIR, do export QTDIR=/usr/share/qt3
+
+The Qt packages itself are built in two different versions: dynamic 
+non-threaded and threaded. Each of these builds have specific differences 
+that you need to watch out for. The Qt package for Debian is optimized 
+on working with the threaded version, so application developers are advised 
+to use libqt-mt.so (by installing libqt3-mt-dev) for development. 
+The specific configuration differences are: 
+
+a) non-threaded(shared library)
+
+The non-threaded library has some restrictions for the developer of Qt 
+applications, where some are Debian specific and some Qt specific: 
+- the library is called libqt.so and is placed under /usr/lib. 
+- the plugins built with this version are always using the extension 
+  <plugin>-non-mt.so, to indicate that they are to be used with the non-mt 
+  (multithreaded) version. The plugins itself will install into the same 
+  directory where the threaded version is placing its plugins too, so 
+  that applications will all find the Qt plugins independed of the 
+  version of Qt that they make use of. 
+- Qt OpenGL is not supported in the non-threaded version due to the fact 
+  that OpenGL on Debian is built threaded. If you write any program that 
+  you explicitely link against -lqt and that does make use of the QGL 
+  classes, you will get symbol referencing errors. Change the linking 
+  stage to link your application against the threaded version,-lqt-mt.
+- The libqui library is not available for non-threaded programs. That means 
+  in case a program that links against the non-threaded Qt library (-lqt) 
+  and is also linking against libqui.so (-lqui) will not link. Instead, 
+  change the linking of the program to -lqt-mt -lqui to make that work. 
+
+For other notes, see c) common build configuration.
+
+
+b) threaded (shared library)
+
+The threaded library version is the one supporting the maximum of Qt's 
+options and is to be preferred by application developers. The reasons for 
+that are mainly that it allows the use of threading as well as OpenGL, in 
+addition to that the project that makes the most use out of Qt, the KDE 
+project (http://www.kde.org) uses the threaded version by default also. 
+That means that a KDE user always already has the threaded library loaded 
+in his machine's memory. To have the minimum demands and maximum 
+performance for your application at run-time for the user's machine, it is 
+therefore best to link the application against the threaded version. 
+
+NB: for Debian package maintainers: If the Qt application you are building 
+links against -lqt, change the Makefiles in a way that it links against 
+-lqt-mt. Contact the author of the application you package to change the 
+linking from -lqt to -lqt-mt (because all other distributions are doing the 
+same, defaulting on the threaded version). The library itself is called 
+libqt-mt.so and is to be found under /usr/lib.
+ 
+c) common build configuration
+
+As far as the common build configuration goes, we note explicitely that the 
+Debian package of Qt will in very rare cases break the compilation (most 
+likely the linking) of applications on Debian which use Qt, in particular 
+utilizing styles in an incorrect way by deriving from one of the styles 
+that ship with Qt. In case you are a Debian packager and encounter 
+problems, either contact me (nolden@kde.org) or the Qt package maintainer. 
+We will tell you why things don't work and what you should communicate on 
+with the programmers of your application that you are packaging. The build 
+configuration generally is intended to provide a Qt version that is as 
+small as possible in terms of the memory size it requires. Therefore, 
+everything inside Qt that can be compiled as plugins has been compiled that 
+way. This includes: 
+
+- imageformats: jpeg and mng - codecs (for languages like arab, japanese 
+  etc provided with Qt) 
+- sql drivers for databases (MySQL, ODBC and PostgreSQL)
+
+The only exception is the imageformat png which has been compiled built-in 
+due to the fact that there is literally no program that uses no icons at 
+all and icons are to be used preferrably in png format. The plugins are all 
+located under /usr/lib/qt3/plugins (threaded and non-threaded). This is 
+also the install location you should choose as a package maintainer for 
+qt-plugins so the user doesn't have to customize his library path for 
+loading Qt plugins. The only exception is that KDE delivers a set of Qt 
+plugins as well (mainly styles and designer plugins); those are placed in 
+/usr/lib/kde3/plugins. Plugins compiled with the non-threaded version have 
+their names changed from plugin.so to plugin-non-mt.so. If you'repackaging 
+plugins and provide them for the non-threaded Qt version as well, adapt the 
+name of the non-threaded linked version in this scheme. Due to the fact 
+that we configured the maximum possible extend of Qt to build pugins, 
+developers who derive from a class that is a plugin will get linker errors. 
+To make that explicitely clear, we added a libqt3-plugin-headers package 
+that contains the header files belonging to the plugins. This way you will 
+get errors at compile time already if the developer falsely used the styles 
+or other plugin code directly, assuming that this code is built-in into the 
+qt library. However, for reasons of completeness we created this additional 
+package. 
+
+QMotif Extension: As this code is only available in commercial environments 
+(and produces a static library libqmotif.a anyway that those commercial 
+applications have to be linked against in addition to Qt), we left out all 
+header files of the libqt3-headers package that are belonging to this 
+QMotif extension.
+
+Oracle Database driver, Sybase & Microsoft SQL Server driver: Those drivers 
+are only available in a commercial version of Qt due to license 
+incompatibilities with the GPL. If you need to faciliate those drivers, 
+please visit http://www.trolltech.com and have a read at 
+http://doc.trolltech.com/3.0/sql-driver.html.
+  
+3. Packages (End-User) 
+
+The Qt built has been split up into several packages that allow for easy 
+installation for all types of users. The End-user usually only requires to 
+have the following packages installed to run an application that links 
+against Qt:
+
+Non-Threaded version:libqt3 (the library libqt.so.*)
+
+Optionally depending on the program's requirements:
+
+libqt3-odbc (ODBC driver)
+libqt3-mysql (MySQL driver)
+libqt3-psql (PostgreSQL driver)
+
+Threaded version:libqt3-mt (the library libqt-mt.so.* and libqui.so.* for 
+loading designer-made user interfaces at runtime).
+
+Optionally depending on the program's requirements:
+
+libqt3-mt-odbc
+libqt3-mt-mysql
+libqt3-mt-psql 
+
+In addition to the libraries, it may make sense to install the program 
+qtconfig to customize the look and behaviorof Qt programs. If you have KDE 
+installed, the KDE control center will take this task automatically in most 
+cases. qtconfig is available in the package qt3-qtconfig.
+
+Also, Qt programs can make use of the online-help tool that ships with Qt, 
+the Qt Assistant. The Assistant can be installed with the package 
+qt3-assistant.
+
+Qt Configuration files
+----------------------
+Qt programs most often use QSettings to store their information in configuration
+files. With Qt 3.2, the new option --sysconfdir has been introduced that allows
+us to use /etc/qt3 as the system-wide location where qt-program specific global
+configuration files can go. If you're a programmer that wants to get familiar with
+that, please look at the examples, documentation and the code in designer or
+assistant as well as qtconfig.
+
+4. Packages (Package maintainers)
+
+In addition to the library, a package maintainer will require an additional 
+set of packages to compile a package that requires Qt. Depending on the 
+version of the qt library, you will require a different set of packages; 
+the most common option should be to make your application link against the 
+multi-threaded version (-mt).Packages necessary for compiling Qt 
+applications from source:
+
+libqt3-mt-dev   (use libqt3-dev for linking against -lqt, this package only 
+                contains the .so files and the header file for libqui.so)
+
+libqt3-headers  (header files for libqt and libqt-mt)
+ 
+qt3-dev-tools  (this package contains the tools uic and moc as well as 
+qmake, required for building Qt applications) 
+
+If, however, you encounter an older program not to compile with this set 
+read the FAQ at the end of this document.
+
+5. Packages (Developers)
+
+In addition to the packages that packagers require, a developer usually 
+will require the Qt API documentationas well as tools like the assistant, 
+linguist or designer. However, you should be fine with installing the API 
+documentation that you can browse with a webbrowser, optionally with the 
+assistant. They are available in /usr/share/doc/qt3-doc/html.
+For a regular development environment, install qt3-designer and qt3-doc.
+
+For faciliating Qt's extended environment to write plugins for the Qt 
+Designer or extend the Designer as well as utilizing the Qt Assistant by 
+calling it from within your program, install qt3-apps-dev, which contains
+the static libraries and header files required for this functionality.
+
+For Embedded Developers, the program qvfb (Qt Virtual Frambuffer) and 
+makeqpf (embedded fonts tool)have been packaged into 
+qt3-dev-tools-embedded. 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 qt3-dev-tools-compat.
+
+For using the QTranslator class and where to find the qm-file for qt as 
+well as where to place your translations,see the next section.
+
+If your program doesn't compile with those settings in case you have 
+started your project with Qt 1.x or 2.x, please read the FAQ section at the 
+end of this document.
+
+Another addition is that the qconfig.h file is auto-generated during configure.
+This means it is architecture specific and depends on the configure arguments.
+Therefore it is packaged in their respective versions two times, once
+with libqt3-dev for the non-threaded version, and once with libqt3-mt-dev
+for the threaded version. As this file appears twice, these two packages
+are a) architecture depending and b) conflicting with each other.
+We see the good point in this that developers and packagers can't confuse
+their packages with having the development files for both Qt builds
+installed at the same time and will preferrably use libqt3-mt, reducing
+the risk for accidential builds against libqt.
+
+.qmake.cache files are delivered with libqt3-dev and libqt3-mt-dev. They are 
+shipped as .qmake.cache in /usr/share/qt3/.qmake.cache, which makes sense
+as they are build-dependent and the -dev packages are conflicting anyway, so
+in case you need them for building Qt examples or other packages provided by
+Trolltech relying on the configuration that Qt was build with, use these file
+as required by your package.
+
+5. Packages (Translators)
+
+In order to translate a Qt program into any other language, the Qt 3 way to 
+do this is to let the developer create a ts-file containing the strings 
+that the program exposes on the user interface. The tools to create the 
+ts-file and to create the final qm (Q-message binary) file, lupdate and 
+lrelease, are included in qt3-dev-tools.The single translator that only 
+gets provided the ts file and has to return a translated ts file, it 
+is absolutely enough to install qt3-linguist; the package qt3-assistant can 
+be installed to access the online-help for the Qt Linguist itself.
+In case you're converting an application using Qt prior to Qt 3, you may 
+want to uitilize the qt3-dev-tools-compat which include the necessary tools 
+to convert older qm files to the new ts file standard.
+
+Locations of message translations: 
+
+Qt ships with a set of translations for the strings used inside Qt. Those 
+translations will be installed into /usr/share/qt3/translations (qm files 
+only), which equals $QTDIR/translations respectively 
+qInstallPath() + QString( "/translations" ). 
+
+The configure option --translationdir has been set to /usr/share/qt3/translations
+accordingly since it was introduced in Qt 3.2. 
+
+To correctly enable your program to display the translations to the Qt 
+library and to load the translation of the program itself, we currently 
+suggest to either install your translations along with any other data files 
+into/usr/share/<appname>/, translation files into the subdirectory 
+translations (that is /usr/share/<appname>/translations) The code that your 
+application should use to load the Qt translation will have to look like 
+the following:    
+
+int main( int argc, char **argv )
+    {
+        QApplication app( argc, argv );
+
+        // translation file for Qt
+        QTranslator qt( 0 );
+        qt.load( QString( "qt_" ) + QTextCodec::locale(), qInstallPath() + 
+        QString( "/translations" );
+        app.installTranslator( &qt );
+
+        // translation file for application strings
+        QTranslator myapp( 0 );
+        myapp.load( QString( "myapp_" ) + QTextCodec::locale(), "." ); 
+        // use a substitue for $prefix/share/appname/translations here      
+        app.installTranslator( &myapp );
+
+6. Frequently Asked Questions
+
+Using Qt for Debian as a developer or packager 
+----------------------------------------------
+
+Q: I want to compile a source package that utilizes qmake to build the 
+Makefiles. What do I need to do to makeit work ?
+
+A: qmake requires two environment variables to be set, QTDIR and QMAKESPEC. 
+To make it work, do
+export QTDIR=/usr/share/qt3
+export QMAKESPEC=linux-g++
+
+Then run qmake -o Makefile <projectfile>.pro
+
+After that, the Makefile is correctly created to build your application on 
+Debian. As a packager, export thosetwo variables in the rules file before 
+calling qmake.
+
+Q: I have an application that when linking gives me symbol referencing 
+errors to Q*Style. Why does my applicationnot link correctly ?
+
+A: The author of the program is using the styles that ship with Qt directly 
+instead of using the QStylePlugin interface.If you are the author of the 
+program, change your program to use QStylePlugin. If you are a packager, 
+write to theauthor of the program that he is assuming that the styles 
+shipped with Qt are built-in to the library which is not the case on Debian 
+and that he please should fix this and use QStylePlugin.
+
+Q: Where are all the examples and tutorials ? And how do I build them ?
+
+A: Qt ships with examples and tutorials; so does the Linguist and Designer. 
+The tutorials and examples are compressed tarballs which you can unpack with 
+tar -zxvf into your home directory. Change into the qt3-examples directory
+and run the provided ./build-examples script. All Qt examples and tutorials,
+including those for designer and the linguist, will be compiled. You will
+notice however, that those examples that inherit from style classes which
+are not built-in into Qt but configured as a plugin will not compile due
+to the fact that they can't link to the Qt library. 
+
+Q: I'm writing a pure Qt application and I want to ship it with a default 
+configuration file. Where does that global configuration file go if I make 
+use of the QSettings class ? 
+
+A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called
+--sysconfdir which we intentionally set to /etc/qt3 similar to /etc/kde3 for
+KDE programs. Install your application's system wide configuration file
+to /etc/qt3. 
+
+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 two tools, qt20fix and 
+qtrename140, 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 libqt3-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 ?
+
+A: Please turn to Ralf Nolden (nolden@kde.org) or Martin Loschwitz 
+(madkiss@madkiss.org) for any questions regarding Qt on Debian.
+
+ -- Ralf Nolden <nolden@kde.org>  Sun, 26 Jan 2003 20:39:19 +0100
+ -- Ralf Nolden <nolden@kde.org>  Mon,  1 Sep 2003 19:24:16 +0200
+    * update for qt-3.2.1

Added: people/chrsmrtn/qt-x11-free/debian/changelog
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/changelog	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/changelog	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,1817 @@
+qt-x11-free (3:3.3.4-4) unstable; urgency=low
+
+  * Move the package to the Debian Qt/KDE team. Thanks to Martin Loschwitz for
+    all his work over the years.
+
+  +++ Changes by Christopher Martin:
+
+  * Add sundry fixes from KDE's qt-copy. (Closes: #303065)
+
+  * No longer build non-threaded libraries. (Closes: #180326)
+
+  * Added a libqt3c102-mt-dbg package. (Closes: #235396)
+
+  * Fix qt3-designer's appearance in the KDE menu. (Closes: #290402)
+
+  * Don't use lib64 on amd64. (Closes: #311562)
+
+  * Don't duplicate the information in the qvfb manpage. (Closes: #282217)
+
+  * Make the Qt3 documentation available from /usr/share/doc/qt3-doc, and
+    therefore also usable in dwww and doc-central. (Closes: #185900)
+    (Closes: #284407, #294630)
+
+  * Add linguist manpage. Thanks to Jeremy Laine. (Closes: #268882)
+
+  * Include createcw source for qt3-designer. (Closes: #305919)
+
+  * Add missing qvfbhdr.h. (Closes: #182366)
+
+  * Bump libfreetype6-dev build-depends to >= 2.1.10 to work around API
+    breakage.
+
+  * Enable tablet support.
+
+  * Build jpeg and mng support into Qt, not as plugins.
+
+  * Revamp the OpenGL linking patch, and add patches for gcc4.
+
+  * Many minor changes to improve lintian compliance.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  6 Jul 2005 22:36:54 -0400
+
+qt-x11-free (3:3.3.4-3) unstable; urgency=medium
+
+  * ML: Remove an utterly ugly symlink for linux-g++ that pointed to my
+        $HOME -- Trolltech strikes again!
+
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 15 Apr 2005 15:17:00 +0200
+
+qt-x11-free (3:3.3.4-2) unstable; urgency=medium
+
+  * ML: Try adding back the qt{-mt}.pc-files, let's see whether they work
+  * ML: No others changes but re-building to get this into Sarge
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 2 Apr 2005 13:02:00 +0100
+
+qt-x11-free (3:3.3.4-1) experimental; urgency=low
+
+  * ML: New upstream release Qt 3.3.4 packages for Debian (Closes: #292422)
+  * ML: patches/0048-qclipboard_hack_80072.patch: Fix the clipboard stuff 
+        (Closes: #295828)
+  * ML: patches/0061-qscrollview-propagate-horizontal-wheelevent.patch: Fix
+        problems with horizontal scrollview
+  * ML: Took patch from BTS by Andreas Jochens to fix the FTBFS on the amd64
+        architecture (Closes: #288405)
+  * ML: patches/19_security_fixes.dpatch: Removed this patch, incorporated 
+        into upstream now.
+  * ML: patches/20_qlocale_compile_arm.dpatch: Removed, incorporated into
+        upstream as well.
+  * ML: patches/17_fix_qfontdatabase_cpp.dpatch: Disabled for now, seems to 
+        be fixed by upstream according to changelog
+
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 18 Mar 2005 15:57:00 +0100
+
+qt-x11-free (3:3.3.3-8) unstable; urgency=high
+
+  * ML: debian/control.in: Correct the Build-Depends: line to reflect latest
+        changes for libpng and libmysql (Closes: #284441)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 14 Jan 2005 12:17:00 +0100
+
+qt-x11-free (3:3.3.3-7) unstable; urgency=high
+
+  * ML: debian/patches/21_fix_mips_mipsel.dpatch: To make it compile, even
+        define => QMAKE_CFLAGS += -Wa,-xgot -- thanks to Thiemo Seufer
+
+ -- Martin Loschwitz <madkiss@debian.org>  Tue, 16 Nov 2004 19:37:00 +0100
+
+qt-x11-free (3:3.3.3-6) unstable; urgency=high
+
+  * ML: Addedd debian/patches/21_fix_mips_mipsel.dpatch to make the beast
+    compile on MIPS/MIPSel again 
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sun, 14 Nov 2004 16:44:00 +0100
+
+qt-x11-free (3:3.3.3-5) unstable; urgency=high
+
+  * ML: Acknowledging NMU by Matthias Klose, thanks. (Closes: #270202)
+  * ML: patches/04_qsql_odbc.dpatch: Fix Compilation of the iodbc stuff,
+    breakage caused by invalid redefinitions of variables (Closes: #278781)
+  * debian/rules: Delete .obj-directories in the clean-Target as requested
+    by Fabio Massimo Di Nitto (thanks for noticing this)
+ 
+ -- Martin Loschwitz <madkiss@debian.org>  Sun, 31 Oct 2004 10:51:00 +0100
+  
+qt-x11-free (3:3.3.3-4.1) unstable; urgency=high
+
+  * NMU, maintainer doesn't show any reaction.
+  * On arm-linux, configure using -DQT_QLOCALE_USES_FCVT. Seems to be a
+    known issue, mentioned in the 3.3.2 release notes, but nowhere in
+    the 3.3.3 sources. Great! Thanks to Paul Brook and Jan Niehusmann for
+    the investigations. Closes: #270202.
+  * Riku Voipio: Added patch: 20_qlocale_compile_arm.dpatch.
+  * debian/patches/00list: add 20_qlocale_compile_arm.dpatch.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 18 Sep 2004 17:01:16 +0200
+
+qt-x11-free (3:3.3.3-4) unstable; urgency=high
+
+  * ML: Applied patch from Marcus Meissner to fix broken XPM DoS not yet 
+        fixed upstream [src/kernel/qimage.cpp, CAN-2004-0692]
+  * ML: Applied patch forwarded by Marcus Meissner to fix broken GIF DoS
+        unfixed upstream [src/kernel/qasyncimageio.cpp, CAN-2004-0693]
+  * ML: urgency=high to get security fixes into sarge as quick as possible
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sun, 22 Aug 2004 11:48:00 +0200
+
+qt-x11-free (3:3.3.3-3) unstable; urgency=high
+
+  * ML:  Exchanged the dangling symlinks in /usr/share/qt3/lib with working
+         symlinks to /usr/lib (thanks to Aurelien Jarno) (Closes: #266284)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Tue, 17 Aug 2004 17:35:00 +0200
+
+qt-x11-free (3:3.3.3-2) unstable; urgency=high
+
+  * ML: Bring back the goddamn qmake binary that silently disappeared (thank 
+        you Trolltech for replacing it with a symlink) (Closes: #265958)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Mon, 16 Aug 2004 00:31:00 +0200
+
+qt-x11-free (3:3.3.3-1) unstable; urgency=high
+
+  * ML: debian/control: Turned libqt3-headers and libqt3-compat-headers into
+        Architecture: any. This should avoid blocking packages from testing
+  * ML: debian/control: Added a patch by Robert Millan to add control.in to 
+        fix breakage with iBase and OSes != Linux (Closes: #265413)
+  * ML: debian/patches/16_fix_opengl_check.dpatch: Make QLibrary search for
+        libGL.so.1, no dependency on libgl-dev packages (Closes: #264928)
+  * ML: debian/patches/17_fix_qfontdatabase_cpp.dpatch: A patch taken from
+        Lars Knoll via kde mailing list; fixes a problem with fond handling
+  * ML: Re-Build against the latest iodbc to get back shlibs of it; previous 
+        version didn't have shlins accidentally (kudos to Adrian Bunk)
+  * ML: New Upstream Version (Qt 3.3.3), urgency is high to push this into
+        sarge as soon as possible (Qt 3.2 is not acceptable)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 14 Aug 2004 21:05:00 +0200
+
+qt-x11-free (3:3.3.2-5) unstable; urgency=medium
+  
+  * ML: debian/rules: Fixed the debhelper calls, dh tried to install the
+        iBase stuff (Architecture: i386) even on non-i386 architectures.
+  * ML: Enable iBase for all Operating Systems instead of only for Linux
+        on i386 (thanks to Robert Millan again)
+  * ML: Severity is medium to not hold up KDE and tiff transition
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 08 Aug 2004 10:50:00 +0200
+
+qt-x11-free (3:3.3.2-4) unstable; urgency=low
+
+  * ML: iBase seems to be similar to the black helicopters. Once they got
+        you there is no way to get rid of them. Disabled the iBase-Plugin
+        for all arches except x86 - hopefully.
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 07 Aug 2004 22:13:00 +0200
+
+qt-x11-free (3:3.3.2-3) unstable; urgency=low
+  
+  * ML: debian/control: Switch from Firebird1 to Firebird2
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 07 Aug 2004 16:33:00 +0200
+
+qt-x11-free (3:3.3.2-2) unstable; urgency=low
+
+  * ML: Let's have another try, this time with the right target distribution
+
+  (verbatim copy of the 3:3.3.2-1 upload changelog follows)
+
+  * ML: New Upstream (Qt 3.3.2) fixes:
+          - Strange line /usr/lib/libqt-mt.la (Closes: #216063)
+          - The wishlist-bugreport for it can be closed (Closes: #235394)
+  * ML: Fixed the description of the following packages:
+          - libqt3c102-mt-psql (Closes: #209735)
+          - libqt3c102-mt-odbc (Closes: #209932)
+          - qt3-examples (Closes: #210046)
+          - libqt3c102-mt-mysql (Closes: #210097)
+  * ML: Made qt3-assistant depend on qt3-doc (Closes: #256183)
+  * ML: Adopted patches by Robert Millan to make Qt build on Hurd
+          - Added patches/15_unify_declarations_glibc.dpatch
+          - Fixed debian/rules to avoid E2BIG on Hurd
+          Thanks, Robert!
+  * ML: Use libmysqlclient12 instead of libmysqlclient10 (Closes: #188622)
+  * ML: Use the OpenGL-libraries via dlopen (Closes: #257705)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 07 Aug 2004 13:08:00 +0200
+
+qt-x11-free (3:3.3.2-1) experimental; urgency=low
+
+  * ML: New Upstream (Qt 3.3.2) fixes:
+          - Strange line /usr/lib/libqt-mt.la (Closes: #216063)
+          - The wishlist-bugreport for it can be closed (Closes: #235394)
+  * ML: Fixed the description of the following packages:
+          - libqt3c102-mt-psql (Closes: #209735)
+          - libqt3c102-mt-odbc (Closes: #209932)
+          - qt3-examples (Closes: #210046)
+          - libqt3c102-mt-mysql (Closes: #210097)
+  * ML: Made qt3-assistant depend on qt3-doc (Closes: #256183)
+  * ML: Adopted patches by Robert Millan to make Qt build on Hurd
+          - Added patches/15_unify_declarations_glibc.dpatch
+          - Fixed debian/rules to avoid E2BIG on Hurd
+          Thanks, Robert!
+  * ML: Use libmysqlclient12 instead of libmysqlclient10 (Closes: #188622)
+  * ML: Use the OpenGL-libraries via dlopen (Closes: #257705)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 07 Aug 2004 09:50:00 +0200
+   
+qt-x11-free (3:3.3.2-0pre2) experimental; urgency=low
+
+  * ML: Added qaccessible.h to the list of headers
+  * ML: Removed unnecessary dependencies again
+  * ML: Added patch to fix KDE menu problem
+  * ML: Build and include the source in upload now
+
+ -- Martin Loschwitz <madkiss@debian.org>  Mon, 14 Jun 2004 21:23:00 +0200
+
+qt-x11-free (3:3.3.2-0pre1) experimental; urgency=low
+
+  * ML: First public version of packages for Qt 3.3
+  * ML: Added packages for ibase and SQLite RDBMSs
+  * ML: Necessary Adaptions from the Qt 3.2 to Qt 3.3 packages
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 12 Jun 2004 21:09:00 +0200
+
+qt-x11-free (3:3.2.3-3) unstable; urgency=low
+
+  * ML: Re-enabled STL support in Qt (Closes: #194475, #242633)
+  * ML: Enabled XRandr support (Closes: #253593)
+  * ML: Fixed FTBFS cursed by XCursor (Closes: #246198)
+  * ML: Split xlibs-dev dependencies (Closes: #253325)
+  * ML: Disabled the Xinerama_pic-hack (XFree 4.3 made it useless)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Thu, 10 Jun 2004 12:07:00 +0200
+
+
+qt-x11-free (3:3.2.3-2) unstable; urgency=low
+
+  * ML: Rebuild to get back PIC-libs
+
+ -- Martin Loschwitz <madkiss@debian.org>  Thu, 22 Jan 2004 15:23:00 +0100
+
+qt-x11-free (3:3.2.3-1) unstable; urgency=low
+
+  * ML: New upstream release (Qt 3.2.3) (Closes: #218464)
+  * ML: Add Replaces: for libqt3-emb (<= 3:3.0.3-1) (Closes: #218290)
+  * ML: Tuned libqt3-i18n package description (Closes: #208904)
+  * ML: Tuned qt3-qtconfig package description (Closes: #209259)
+  * ML: Removed some patches that were merged by upstream (#1, #8, #9, #10)
+  * ML: Don't include any of the .pc files; they're unsupported now
+  * ML: Don't include any of the .la files: they're not working now
+
+ -- Martin Loschwitz <madkiss@debian.org>  Tue, 06 Jan 2004 09:54:00 +0100
+
+qt-x11-free (3:3.2.1-6) unstable; urgency=low
+
+  * ML: Added dependency to libqt3{-mt}-dev for xlibs-pic (Closes: #213855)
+  * ML: Sanify qmake.conf files to have existing paths instead of $(QTDIR)
+  * ML: Sanify qt{-mt}.pc files to have correct values
+  * ML: Bumped Standards-Version to 3.6.1 (No changes)
+  * ML: Added debian/compat
+  * ML: Added patch by Simon Hausmann to fix generation of pkgcof files
+  
+ -- Martin Loschwitz <madkiss@debian.org>  Sun, 05 Oct 2003 11:24:00 +0200
+ 
+qt-x11-free (3:3.2.1-5) unstable; urgency=low
+
+  * ML: Let's build styles into the library, instead of as plugins 
+        (Closes: #197157)
+  * ML: Added build dependency for libaudio-dev to libqt3{-mt}-dev
+        (Closes: #210628, #210994, #212530)
+  * ML: Removed broken patches for mips and mipsel
+        (Closes: #210366)
+  * ML: Added patch by Dirk Mueller to fix kdesktop and other applications
+
+ -- Martin Loschwitz <madkiss@debian.org>  Mon, 29 Sep 2003 19:35:00 +0200
+
+qt-x11-free (3:3.2.1-4) unstable; urgency=low
+
+  * ML: re-add the fontlist fix from previous versions 
+  * ML: Added dependencies for libxft2-dev, libxrender-dev and libxcursor-dev
+        to the -dev packages (Closes: #208421)
+  * ML: Changed description of libqt3-plugins-headers package
+  * ML: Added patch by Lars Knoll to prevent generation of bogus mouse events
+  * RN: move unixmake2.cpp patch (approved by TT)
+  * RN: add qlineedit.cpp patch (approved by TT)
+  * RN: re-add pkg-config files
+ 
+ -- Martin Loschwitz <madkiss@debian.org>  Wed, 3 Sep 2003 18:30:00 +0200
+
+qt-x11-free (3:3.2.1-3) unstable; urgency=low
+
+  * ML: Added patches/01_fix_mips_mipsel.dpatch (hopefully fixes mips[el] build)
+  * ML: Merged the patch added in previous release with the above one
+  * ML: For -1: Pass --sysconfdir and --translationdir options to ./configure
+  * ML: Enable support for Xcursor in debian/rules (on Ralf's request)
+  * RN: Copy qmake.cache file to the appropriate location (/usr/share/qt3/)
+  * RN: Include fix for unixmake2.cpp (libtool and pkgconfig)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sun, 31 Aug 2003 18:41:00 +0200
+
+qt-x11-free (3:3.2.1-2) unstable; urgency=low
+
+  * ML: Build the qmake tool with -O2 as optimization flag (Closes: #207915)
+  * ML: Call dh_gencontrol with -a in debian/rules (Closes: #207917)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 30 Aug 2003 21:16:00 +0200
+
+qt-x11-free (3:3.2.1-1) unstable; urgency=low
+
+  * ML: New upstream version (Qt 3.2.1) (Closes: #204650)
+  * ML: Include all icon files for the Qt designer -- hopefully
+
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 29 Aug 2003 14:59:00 +0200
+
+qt-x11-free (3:3.1.1-9) unstable; urgency=low
+
+  * ML: debian/control: Point out that libqt3-compat-headers might be of
+        importance (with Recommends and addition to package description,
+        Ben, I hope this satisfies you for now) 
+  * ML: debian/rules Fix for-fork with patch from BTS (Closes: #188536)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Tue, 15 Jul 2003 19:45:00 +0200
+
+qt-x11-free (3:3.1.1-8) unstable; urgency=low
+
+  * ML: Apply patch from Kevin Puetz to fix font listing (Closes: #189750)
+  * ML: Don't rely on /usr/share/doc, remove qtrc crap (Closes: #189755)
+  * ML: Give the qt3-things a higher priority than the qt2 ones (Closes: #189755)
+  * ML: debian/qt3-qtconfig.menu: Moved to Settings section (Closes: #183827)
+  * ML: debian/copyright: Mention Qt3.1 instead of Qt2.2 (Closes: #185161)
+  * ML: debian/libqt3-plugins-headers: Added qinterlacestyle.h (Closes: #182259)
+  * ML: Have libqt3-dev and libqt3-mt-dev in the libdevel section
+  * RN: debian/control: Add libxft2-dev as dependency for -dev-packages
+  
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 10 May 2003 14:55:00 +0200
+ 
+qt-x11-free (3:3.1.1-7) unstable; urgency=low
+
+  * ML: The "Arg, can somebody purge typod please?"-release
+    - debian/control: Fixed corrupt Build-Depends: line
+    - debian/patches: Made the xinerama_pic patch i386-only
+    - debian/control: Removed unnecessary xlibs-pic Depends:
+
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 07 Feb 2003 15:44:00 +0100
+
+qt-x11-free (3:3.1.1-6) unstable; urgency=low
+
+  * ML: Build with lXinerama_pic (for -fPIC) (Closes: #176071, #175075)
+  * ML: debian/rules: Convert to dpatch package
+  * ML: debian/control: Change Maintainer Address
+  * ML: debian/control: Have fontconfig as Depends:
+  * ML: debian/control: Fix {Build-}Dependencies for GLU libs (Closes: #182184)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Tue, 06 Feb 2003 18:40:00 +0100
+
+qt-x11-free (3:3.1.1-5) unstable; urgency=low
+
+  * ML: Added Build-Dependency for xlibmesa-glu-dev to fix FTBFS
+  * ML: Updated debian/patches/01 to reflect latest qt-copy changes
+  * ML: Removed patch for hppa (was needed to fix FTBFS)
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Sat, 22 Feb 2003 08:47:00 +0100
+ 
+qt-x11-free (3:3.1.1-4) unstable; urgency=low
+
+  * RN: debian/rules: remove byacc commands
+  * RN: debian/rules: Change back to srcdir = builddir mechanism
+  * RN: debian/patches: Help to remove some unused patches
+  * RN: debian/maintain: Help to get rid of copying qmake.conf files around
+  * RN: debian/rules: Clean up the 'clean' target, make it work again
+  * RN: debian/qt3-doc.links: Fix breakage for man-link
+  * RN: debian/libqt3{mt-dev,dev}: Create plugins symlink
+  * ML: debian/control: Remove xlibmesa-dev dependencies (Closes: #181202)
+  * ML: debian/control: Change libqt3-headers back to arch=all
+  * ML: debian/patches: Added patch to make sure hppa compiles as it should
+  * ML: Create seperate qconfig.h files for non-mt/mt (Conflicts for -dev!)
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Tue, 18 Feb 2003 19:26:00 +0100
+ 
+qt-x11-free (3:3.1.1-3) unstable; urgency=low
+
+  * RN: debian/libqt3-plugins-headers.install: Removed headers for codecs
+  * RN: debian/rules: Fix paths in .prl-files after build has finished
+  * RN: debian/libqt3-headers.install: Include some more includes files
+  * ML: Ship src/attic as .tar.gz in libqt3-compat-headers (it's obsolete, anyway)
+  * ML: Broke out qt3-examples package (saves place in -doc-package and makes sense)
+  * ML: debian/maintain/qmake*.conf: Applied patch by Brian Nelson (Closes: #180326)
+  * ML: Added debian/maintain/fixqc.sh to fix qmake.cache files during install
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Wed, 12 Feb 2003 16:31:00 +0100
+ 
+qt-x11-free (3:3.1.1-2pre3v1) unstable; urgency=low
+
+  * New package: libqt3-compat-headers (Thanks to Ralf Nolden again)
+  * debian/patches/01_qtcopy_20030206.dpatch: Updated to qtcopy from 20030206
+  * debian/libqt3-mt-dev.install: Move QGL classes here since QGL only works with mt
+  * debian/rules: Install .prl files to /usr/share/qt3/lib/
+  * debian/rules: Include logo32.png is every html-documentation
+  * debian/libqt3c102-mt.links: Symlinks for libqui
+  * debian/maintain/{qtconfig,assistant}.desktop: Fix section in menu file
+  * debian/rules: Include qmake documentation
+  * debian/rules: remove qwindowsxpstyle.h
+  * debian/rules: Moved README.Debian to -dev-packages (Closes: #179932)
+  * debian/README.Debian: New Version with max 75 chars per line (Closes: #179408)
+  * debian/control: Corrected Suggests: fields (Closes: #179838)
+  * deban/maintain/qtconfig.desktop: New Version, works Ok now (Closes: #179773)
+  * debian/control: libqt3c102-mt now conflicts with libqui1-emb (Closes: #179759)
+  * debian/control: qt3-dev-tools now conflicts with qte3-designer (Closes: #179761)
+  * debian/qt3-dev-tools.links: Make setting of QMAKESPEC unnecessary (Closes: #178296)
+  * debian/qt3-doc.doc-base: Finally, fix doc-base stuff (Closes: #155566)
+  * debian/control: libqt3c102 and -mt don't conflict with libqt (Closes: #179768)
+  * debian/control: Depend on xlibmesa-gl-dev | libgl-dev
+  * debian/control: Added Conflicts: for unofficial libqt3c-packages (Closes: #180078)
+  * debian/rules: Don't provide static libraries any longer (Waiting for policy approval!)
+  * debian/rules: Header-directory now is /usr/include/qt3
+  * debian/rules: build the -non-mt version before the -mt-version
+  * For 3:3.1.1-2: Added Conflicts: for qt3-dev-tools <-> uic (Closes: #179396)
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Sat, 8 Feb 2003 09:34:00 +0100
+
+qt-x11-free (3:3.1.1-2) unstable; urgency=low
+
+  * debian/qt3-dev-tools.install: Include mkspecs for qmake (Closes: #179410)
+  * debian/rules: Include logo32.png in qt3-docs (Closes: #179437)
+  * debian/control: qt3-dev-tools now has Conflicts: for libqt-dev (moc!)
+  * debian/control: Fix Build-Depends: to be xlibmesa-gl-dev instead of -glu-dev.
+  * debian/*.links: Readded symlinks for /usr/share/qt3/bin/ (Closes: #179411)
+  * debian/rules: Remove undocumented Symlinks (they are deprecated)
+  * -dev-packages should not depend on libqt3-plugins-headers (Closes: #179429)
+  * This was fixed in 3:3.1.1-1 (Closes: #179155)
+  * debian/maintain/qmake*.conf: Fix errors causing FTBFS on hppa/alpha (Closes: #179582)
+  * debian/control: Make libqt3-dev/-mt-dev depend on xlibmesa-gl-dev (Closes: #179573)
+  
+ -- Martin Loschwitz <madkiss@madkiss.org>  Mon, 3 Feb 2003 12:49:00 +0100
+ 
+qt-x11-free (3:3.1.1-1) unstable; urgency=low
+
+  * The packages have been redesigned radically.
+    - New packages: libqt3-headers, libqt3-i18n, libqt3-plugins-headers,
+      qt3-apps-dev, qt3-assistant, qt3-designer, qt3-dev-tools-compat,
+      qt3-dev-tools-embedded, qt3-dev-tools, qt3-linguist, qt3-qtconfig (Closes: #178914)
+    - Please refer to package descriptions for more detailed informations.
+    - As you can see above, QtConfig was moved into its own package. (Closes: #153538)
+    - Also made sure that qt3-designer contains libcppeditor.so (Closes: #155792)
+  * Special Thanks for advising and help with this release goes to Ralf Nolden
+  * debian/control: Make libqt3/libqt3-mt depend on fontconfig (Closes: #174825, #173951)
+  * debian/control: Transist package to g++-3.2 (Closes: #159263, #135813, #178484, #176616)
+  * Package rebuilt, thus some bugs fixed. (Closes: #178698, #174959, #176827)
+  * debian/rules: Provide conv2ui, also qvfb was added back. (Closes: #173932)
+  * Bugs against packages in stable distribution don't make much sense.
+    Additionally, this is not a bug but a feature (Qt2 <-> Qt3 conflict) (Closes: #178660)
+  * Same as above. Additionally, please make sure to use libqt3-mt-dev instead
+    of libqt3-dev (Closes: #168317)
+  * This bug definetely can not happen anymore, since Qt3 takes care of
+    creation of debian/tmp-install (Closes: #163075)
+  * debian/README.Debian: Updated and extended by Ralf Nolden
+  * debian/patches/02_missing_manpages.dpatch: Don't apply against qt-copy
+  * debian/patches/10_qvfb_cpp.dpatch: Fix qvfb to meet our needs
+  * debian/patches/11_designer_fix.dpatch: Fix designer breakage
+  * debian/patches/12_plugins_fix.dpatch: Build all available plugins
+  * debian/patches/13_qtcopy_20030128.dpatch: Include qt-copy 20030128
+  * debian/*: Various other little fixes and cleanups
+  * debian/rules: Moved /usr/share/qt to be /usr/share/qt3
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Wed, 29 Jan 2003 26:58:00 +0100
+
+qt-x11-free (2:3.1.1+cvs.20021220-1) unstable; urgency=low
+
+  * New Upstream version (Qt 3.1.1, using qt-copy from KDE project)
+  * Special thanks goes to Kevin Puetz for support and work on this release
+  * debian/patches/: Removed patches 05 and 06 and added correct -I's to rules
+  * debian/rules: don't build unthreaded plugins with QT_THREAD_SUPPORT (Closes: #172793)
+  * debian/control: Fix description of libqt3-helper (Closes: #72754)
+  * debian/rules: Moved libqui to libqt3-helper (Closes: #173539, #173537)
+  * debian/libqt3-dev.install: Only include useful bits for qmake
+  * debian/maintain/qmake-hppa.conf: Added -ftemplate-depth-99 (Closes: #173086)
+  * debian/rules: Make sure OpenGL support is enabled on threaded builds
+  * debian/rules: Use new srcdir != builddir technology, large cleanup
+  * debian/rules: Fixed path for html-files (remove the double html)
+  * debian/control: Added Replaces: to libqt3-helper for libqt3 (Closes: #173288)
+  * debian/rules: Removed all those ugly wrapper scripts (bah!)
+  * debian/control: Added build-dependency for Xft2 - thus Xft2 enabled
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Fri, 20 Dec 2002 17:53:00 +0100
+ 
+qt-x11-free (2:3.1.0+cvs.20021205-1) unstable; urgency=low
+
+  * New Upstream version (Qt 3.1.0, using qt-copy from KDE project) (Closes: #167001)
+  * debian/control: Make libqt3-dev depending on correct packages (Closes: #167475)
+  * debian/rules: Enabled Qt support for cups
+  * debian/overrides/: Added overrides-files for various packages
+  * debian/control: depend on libaudio instead of nas-lib
+  * debian/control: Updated Standards-Version to 3.8.0
+  * debian/rules: Use DH_COMPAT=4
+  * debian/rules: Converted to dh_install
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Thu, 05 Dec 2002 14:10:00 +0100
+ 
+qt-x11-free (2:3.0.5-4) unstable; urgency=low
+
+  * debian/09_assistant.dpatch: Fix doc-dir-path for Qt-assistant (Closes: #148924)
+  * debian/10_sizet_64bit.dpatch: Fix for 64bit machines (Closes: #159364)
+  * debian/11_qsql_odbc.dpatch: build with libiodbc2-dev
+  * debian/control: Build-Depend on libiodbc2-dev (Closes: #161352, #161353)
+  * qt3-doc _should_ be Recommends (assistant/qt3-tools needs it) (Closes: #149428)
+  * debian/rules: Fixed the 'clean'-target (Closes: #159264)
+  * debian/libqt3-dev.links: Symlink for /usr/share/qt/lib (Closes: #152507, #152509)
+  * debian/control: Updates Standards-Version
+  * debian/control: Tried to solve the dependency hell a bit
+  * debian/control: Removed libqt3 Suggests for anti-aliasing-howto
+  * debian/rules: Re-enabled NAS (Network Audio System)
+  * Must be a local problem (there ARE files in libqt3-dev) (Closes: #159674)
+  * Not a Qt bug; has been fixed probably long time ago (Closes: #154976)
+  
+ -- Martin Loschwitz <madkiss@madkiss.org>  Thu, 15 Oct 2002 09:29:00 +0200
+
+qt-x11-free (2:3.0.5-3) unstable; urgency=low
+
+  * Sometimes our buildds do strange things (Closes: #155258)
+  * debian/rules: added shlibdeps-path for libqt3-mt.
+  * debian/rules: libqt3-mysql, libqt3-odbc and libqt3-psql contain the
+    unthreaded plugins now (Closes: #152022)
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Thu, 9 Aug 2002 22:18:00 +0200
+     
+qt-x11-free (2:3.0.5-2) unstable; urgency=low
+
+  * debian/control: qt3-dev and qt3-doc are "Priority: extra" now.
+  * debian/rules: Fix alpha and hppa build (Closes: #150917)
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Thu, 2 Aug 2002 12:43:00 +0200
+
+qt-x11-free (2:3.0.5-1) unstable; urgency=low
+
+  * debian/control: New Maintainer (Closes: #153534)
+  * debian/maintain: fix hppa build (qmake-hppa.conf) (Closes: #150917)
+  * debian/changelog: New upstream version 3.0.5 (Closes: #153266)
+  * debian/rules: We use dpatch now, thanks to Gergely Nagy
+  * Moved wrapper files and configs to debian/maintain/
+  * debian/maintain/assistant.sh: not include content double
+  * configure: Set "QT_INSTALL_PLUGINS" correct
+  * Changed some includes in the SQL-files to make them working
+  * debian/control: Fix some build dependencies
+  * debian/patches: All patches against upstream can be found here now.
+  * debian/control: Depend on libpng3-dev (Closes: #154234).
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Sat, 27 Jul 2002 13:51:00 +0200
+     
+qt-x11-free (2:3.0.4-2) unstable; urgency=low
+
+  * Fix hppa build hopefully (Closes: #150917)
+  * Build cleanup
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 26 Jun 2002 13:28:00 -0700
+
+qt-x11-free (2:3.0.4-1) unstable; urgency=low
+
+  * New upstream version
+  * Fix qt-designer html access (Closes: #149505)
+  * Build postgresql modules 
+  * This was fixed a while ago.  (Closes: #134637)
+  * Build static libs again.  yuk!  Who the heck uses these anymore? 
+    (Closes: #147084)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 16 Jun 2002 12:25:00 -0700
+
+qt-copy (2:3.0.3-20020329-7) unstable; urgency=low
+
+  * move html files to html subdir...really...I mean it. (Closes: #149076)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 06 Jun 2002 11:31:00 -0700
+
+qt-copy (2:3.0.3-20020329-6) unstable; urgency=low
+
+  * Remove unused doc dirs. (Closes: #148595)
+  * move html files to html subdir 
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 30 May 2002 22:58:00 -0700
+
+qt-copy (2:3.0.3-20020329-5) unstable; urgency=low
+
+  * Fix assistant by providing a wrapper (Closes: #146255)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 May 2002 17:21:00 -0700
+
+qt-copy (2:3.0.3-20020329-4) unstable; urgency=low
+
+  * Remove extra .'s from descriptions
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 03 May 2002 23:20:00 -0700
+
+qt-copy (2:3.0.3-20020329-3) unstable; urgency=low
+
+  * Fix priority (Closes: #145193)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 30 Apr 2002 00:27:00 -0700
+
+qt-copy (2:3.0.3-20020329-2) unstable; urgency=low
+
+  * Fix overwrite issue (Closes: #141803, #141639)
+  * Re-add all the additional man pages 
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 23 Apr 2002 00:27:00 -0700
+
+qt-copy (2:3.0.3-20020329-1) unstable; urgency=low
+
+  * Updated qt-copy to fix a few other bugs (Closes: #140462)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 29 Mar 2002 09:08:00 -0700
+
+qt-copy (2:3.0.3-20020314-5) unstable; urgency=low
+
+  * Fix potential crash...thanks Daniel
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 23 Mar 2002 02:30:00 -0700
+
+qt-copy (2:3.0.3-20020314-4) unstable; urgency=low
+
+  * Don't build motif style as a plugin.  It's pretty much the default so
+    let's have that builtin.
+  * Fix plugin pathing...actually this was a bug in the configure script
+    where it wasn't setting the proper items in the qconfig.h file
+    (Closes: #139449)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Mar 2002 10:36:00 -0700
+
+qt-copy (2:3.0.3-20020314-3) unstable; urgency=low
+
+  * Since this is still in incoming..change from a build-conflict to a 
+    versioned depend
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 16 Mar 2002 11:00:00 -0700
+
+qt-copy (2:3.0.3-20020314-2) unstable; urgency=low
+ 
+  * Build-Conflict with libpng2-dev since it provides libpng-dev and we don't
+    want any of those problems.
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 15 Mar 2002 20:00:00 -0700
+
+qt-copy (2:3.0.3-20020314-1) unstable; urgency=low
+
+  * New upstream version.  
+  * Includes updated zlib code
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 14 Mar 2002 12:31:00 -0700
+
+qt-copy (2:3.0.2-20020306-1) unstable; urgency=low
+
+  * New upstream version.  Using qt-copy as it provides a bunch of fixes
+    for 3.0.2. (Closes: #135865)
+  * Fix suggests for libqt3-psql
+  * link to new png.  Need this otherwise we are stuck with using the old
+    png library for quite some time.
+  * Fix cleanup (Closes: #135859)
+  * Include -mt versions of plugins.
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 06 Mar 2002 23:37:00 -0700
+
+qt-copy (2:3.0.0.0-4) unstable; urgency=low
+
+  * Fix qmake.cache inclusion (Closes: #118623)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Nov 2001 11:37:00 -0700
+
+qt-x11-free (2:3.0.0.0-3) unstable; urgency=low
+
+  * wrap uic so QTDIR is set for it...makes plugins happier
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 31 Oct 2001 09:19:00 -0700
+
+qt-x11-free (2:3.0.0.0-2) unstable; urgency=low
+
+  * Enable gl support.  If it get's whacky like qt2 did we'll break it
+    off into it's own package.  But until then we'll just do it this way.
+  * Fix wrapper (Closes: #116734)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 22 Oct 2001 12:55:00 -0700
+
+qt-x11-free (2:3.0.0.0-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Oct 2001 11:54:00 -0700
+
+qt-x11-free (2:3.0.0-0beta6-4) unstable; urgency=low
+
+  * Don't compile in xinerama support...lets actually build on all archs
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 09 Oct 2001 16:00:00 -0700
+
+qt-x11-free (2:3.0.0-0beta6-3) unstable; urgency=low
+
+  * Properly include private include files
+  * Provide links from /usr/bin/ qt bins to /usr/share/qt/bin
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Oct 2001 16:00:00 -0700
+
+qt-x11-free (2:3.0.0-0beta6-2) unstable; urgency=low
+
+  * Properly include include files (Closes: #114357)
+  * Pass variables onto designer (Closes: #114271)
+  * Add new variable to qmake.sh (Closes: #113341)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 03 Oct 2001 16:11:00 -0700
+
+qt-x11-free (2:3.0.0-0beta6-1) unstable; urgency=low
+
+  * New upstream beta
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Oct 2001 11:04:00 -0700
+
+qt-x11-free (2:3.0.0-0beta5-2) unstable; urgency=low
+
+  * Fix shlibs (Closes: #113055)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 23 Sep 2001 18:41:00 -0700
+
+qt-x11-free (2:3.0.0-0beta5-1) unstable; urgency=low
+
+  * New upstream beta
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 18 Sep 2001 09:56:00 -0700
+
+qt-x11-free (2:3.0.0-0beta4-2) unstable; urgency=low
+
+  * Provide threaded QT library
+  * Cleanup deps
+  * Set shlibs files
+  * Remove -O2 from alpha build and add -mieee
+  * don't use gcc3 for alpha build anymore
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 08 Sep 2001 09:57:00 -0700
+
+qt-x11-free (2:3.0.0-0beta4-1) unstable; urgency=low
+
+  * New upstream beta
+  * Lintian error cleanup
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 29 Aug 2001 20:52:00 -0700
+
+qt-x11-free (2:3.0.0-0beta3-2) unstable; urgency=low
+ 
+  * Fix path issues for documentation (Closes: #109255)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Aug 2001 00:01:00 -0700
+
+qt-x11-free (2:3.0.0-0beta3-1) unstable; urgency=low
+ 
+  * new upstream beta
+  * Include mkspecs bits for qmake
+  * include qmake wrapper
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 27 Jul 2001 03:36:00 -0700
+
+qt-x11-free (2:3.0.0-0beta2-3) unstable; urgency=low
+ 
+  * drop Optimization down for other archs
+  * *should* fix m68k build (Closes: #104043)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 17 Jul 2001 15:47:00 -0700
+
+qt-x11-free (2:3.0.0-0beta2-2) unstable; urgency=low
+ 
+  * actually include libqxt.so so people can build packages against it
+  * Remove the suggests for anti-aliasing-howto from the plugin packages
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Jul 2001 03:50:00 -0700
+
+qt-x11-free (2:3.0.0-0beta2-1) unstable; urgency=low
+ 
+  * New upstream beta
+  * Ok, now we break out libqxt0
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Jul 2001 12:46:00 -0700
+
+qt-x11-free (3.0.0-0beta1-6) unstable; urgency=low
+ 
+  * Add missing build-depend for flex (Closes: #102978, #102984)
+  * Add conflict with libqxt0 (Closes: #102959)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 01 Jul 2001 08:32:00 -0700
+
+qt-x11-free (3.0.0-0beta1-5) unstable; urgency=low
+ 
+  * ok..I'll get this stuff worked out soon.  Fix gl build bits
+    (Closes: #102849)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 30 Jun 2001 00:27:00 -0700
+
+qt-x11-free (3.0.0-0beta1-4) unstable; urgency=low
+ 
+  * Include qmake in libqt3-dev package
+  * Build database modules and provide seperate packages for them
+  * Build styles and provide them in libqt3 package
+  * Actually install designer plugins...guess that might help.
+  * More build cleanup...properly build all the tools/* modules
+  * Update build-depends
+  * Actually include linguist desktop file
+  * Include interface files as well
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 28 Jun 2001 22:03:00 -0700
+
+qt-x11-free (3.0.0-0beta1-3) unstable; urgency=low
+ 
+  * Fix libqui1 deps (Closes: #100804)
+  * Fix qmake symlink (Closes: #100964)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Jun 2001 19:40:00 -0700
+
+qt-x11-free (3.0.0-0beta1-2) unstable; urgency=low
+ 
+  * Fix dependencies for libqt3-dev...grrr
+  * Fix description for qt3-tools
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Jun 2001 21:00:00 -0700
+
+qt-x11-free (3.0.0-0beta1-1) unstable; urgency=low
+ 
+  * New upstream beta version
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 26 May 2001 11:06:00 -0700
+
+qt-x11 (2:2.3.0-final-5) unstable; urgency=low
+ 
+  * Fix LD PATH problems due to new fakeroot routines (Closes: #98068)
+  * Get rid of gl specific package and just build main package with gl support
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 May 2001 00:25:00 -0700
+
+qt-x11 (2:2.3.0-final-4) unstable; urgency=low
+ 
+  * Fix konsole accents (Closes: #96678)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 11 May 2001 10:27:00 -0700
+
+qt-x11 (2:2.3.0-final-3) unstable; urgency=low
+ 
+  * More alpha tweaks (only remove optimization for CXXFLAGS)
+  * Update bulid flags (Closes: #90334)
+  * Updating shlibs to stop problem with people using old libqt2 packages
+  * Several upstream fixes pulled out of the qt-copy CVS tree on KDE's
+    CVS Repository
+  * Build fixes for systems that do not have qt installed on them already
+  * Remove old Xft build hacks since we are using x4.0.3 now
+  * Update build-depends since we now require x4.0.3
+  * Build libqt2-mt with opengl support (Closes: #91989)
+  * Build static libs with opengl support as well
+  * Remove old -dev provides which fixes buildd problems
+  * Get rid of 2.2 dummy packages libqt2.2 and libqt2.2-gl
+  * Update Build-Depends and other Depends that were pointing to provided or
+    pseudo packages.  Have them point to a real package | pseudo package.
+  * Add new kde menu tag to qt-designer
+  * Add new libqxt0 pacakge so that in the future we don't have a confliction
+    with libqt3 and libqt2 since most likely libqxt soname won't change.
+  * Adding in lintian overrides finally
+  * Updating standards version
+  * Remove old hacks in debian/rules
+  * Should fix pure_virtual problems (Closes: #94676)
+  * Apply i18n patches (qclipboard, qstring, xim)
+  * Building with system png again
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 01 May 2001 22:42:00 -0700
+
+qt-x11 (2:2.3.0-final-2) unstable; urgency=low
+ 
+  * test build
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 07 Mar 2001 13:26:00 -0700
+
+qt-x11 (2:2.3.0-final-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Applied xft workaround patch
+  * versioning the depends
+  * Adding in alpha specific build code so that it will build out of the
+    box.
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Mar 2001 13:26:00 -0700
+
+qt-x11 (2:2.3.0-beta1-3) unstable; urgency=low
+ 
+  * Various patches applied from qt-copy branch of kde cvs.  These include
+    several upstream fixes that were done post beta-1 and will be a part of
+    the next release.
+      LANG=he_IL.iso8859-8 will work correctly now.
+      .fontguess file now accepts quoted font names (so you can use font anmes 
+        with white space inside)
+  * Konq's combobox works again
+  * Include xt extension (Closes: #88147)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 01 Mar 2001 09:17:00 -0700
+
+qt-x11 (2:2.3.0-beta1-2) unstable; urgency=low
+ 
+   * Fix grave bug with xft (Closes: #87758)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 26 Feb 2001 23:22:00 -0700
+
+qt-x11 (2:2.3.0-beta1-1) unstable; urgency=low
+ 
+   * New upstream version
+   * Don't clean everything out of bin/ after each stage as some pieces are
+     scripts that don't get built
+   * Fix Depends for libqutil1
+   * Change version for kde-designer replace/conflicts so that one can actually
+     install kde-designer (Closes: #87223)
+   * Change doc package to qt-doc
+   * Let's go back to libqt2 and get away from libqt2.x. Providing migration
+     packages as to not totally hose people up right away.  These will go
+     away prior to freeze.
+   * Build with XFT support - Anti Aliasing
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 23 Feb 2001 06:23:00 -0700
+
+qt-x11 (2:2.2.4-5) unstable; urgency=low
+ 
+   * Fix qt-mt package (Closes: #85132)
+     building of the tools cause the mt library to get hosed somehow
+   * Fix -dev depends for mt-dev
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 17 Feb 2001 00:42:00 -0700
+
+qt-x11 (2:2.2.4-4) unstable; urgency=low
+ 
+   * Break out uic and libqutil.  This allows for developers not to need
+     qt-designer to build packages and also takes care of the fact that
+     libqutil is common.
+   * Changing dev packages to libqt-dev and libqt-mt-dev 
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 15 Feb 2001 02:30:00 -0700
+
+qt-x11 (2:2.2.4-3) unstable; urgency=low
+ 
+   * Fix pathing for qt-designer for #85493
+   * Change qt-designer's Depends on qt2.2-doc to Recommends (Closes: #85486)
+   * Adding in Perl depends properly for libqt2.2-dev
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 10 Feb 2001 17:30:00 -0700
+
+qt-x11 (2:2.2.4-2) unstable; urgency=low
+  
+   * Include findtr (Closes: 85439)
+   * Build against new libmng
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 09 Feb 2001 16:30:00 -0700
+
+qt-x11 (2:2.2.4-1) unstable; urgency=low
+ 
+   * New upstream version
+     On X11, popup menus do not grab the keyboard anymore, but rely on and 
+     enforce the application to have focus. This works around an X11 bug
+     where deadkeys do not work while the keyboard is grabbed.
+     See QT changelog for full list of updates
+   * Installing ui templates so that Designer doesn't complain.
+   * Adding in suggests for tmake
+   * Moving libqutil and uic over to designer package where they belong
+   * Moving away from /usr/lib/qt2 - 
+        /usr/share/qt would have links for include/docs/man
+        it will also store all other pieces such as the ui templates for
+        designer.  
+   * Cleaning up post/pre scripts, docs, etc. libqt2.2 package doesn't need
+     development docs and information...move it into -dev package
+   * Creating createcw and associated libs for use with designer
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 02 Feb 2001 16:30:00 -0700
+
+qt2.2 (2:2.2.3-12) unstable; urgency=low
+ 
+   * Only build designer once, using the shared libraries. This will cut
+     down on build time.
+   * Moving man pages into /usr/share/man tree
+   * Do not duplicate header files for examples and tools.  
+   * Don't copy the tools/ directory tree since we build them already, if
+     someone wants the source to them they can dl the orig.tar.gz
+   * Don't remove the Makefile's during a clean so that we can include them 
+     with the examples and tutorial
+   * Adding in a Debian menu entry for QT Designer
+   * Cleaning up descriptions to show where man pages were (since they were
+     still being referenced in the -dev package
+   * Adding note in README.Debian on how to build the examples and tutorial
+   * Compressing tutorial and examples to save on space by default.  People
+     can then uncompress them if them want to use them.
+   * Cleaning up post/pre scripts
+   * Cleaning up diff
+   * Upstream patch applied for "dead keys" in qpopups - this is part of a
+     fix for Bug 82967.
+   * fix for setNamedColor parsing problem
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 27 Jan 2001 07:25:00 -0700
+
+qt2.2 (2:2.2.3-11) unstable; urgency=low
+ 
+   * Removing libpth-dev from depends
+   * One more upstream crash/bug fix in qasyncimageio
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 24 Jan 2001 18:41:00 -0700
+
+qt2.2 (2:2.2.3-10) unstable; urgency=low
+ 
+   * Fixing libqt2.2-dev dependencies.  Adding libz-dev, xlibs-dev, libpng2-dev,
+     libjpeg62-dev, libmng-dev. (Closes: #83298)
+   * Adding uic information to libqt2.2-dev's description
+   * More crash fixes for graphics manipulation
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 23 Jan 2001 14:13:00 -0700
+
+qt2.2 (2:2.2.3-9) unstable; urgency=low
+ 
+   * Fix a crash problem with qimage
+   * More i18n
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 22 Jan 2001 00:10:00 -0700
+
+qt2.2 (2:2.2.3-8) unstable; urgency=low
+ 
+   * More upstream fixes...moving towards 2.2.4
+     i18n work
+     bug fixes
+   * Removing old i18n patches 
+   * fixing qt-designer section
+   * Build against new version of MNG
+   * Update build-depends
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 20 Jan 2001 01:28:00 -0700
+
+qt2.2 (2:2.2.3-7) unstable; urgency=low
+ 
+   * Moving tools/ includes to /usr/share/doc/qt2.2-doc/tools/includes
+     Apparantly they were causing problems with some apps
+   * Updating build-depends
+   * New upstream fixes
+     printing when your display has a resolution != 75 dpi
+     true type and type1 fonts will now get embedded into the document. This
+     fixes printing in almost all 8bit locales, *if* you are using these
+     fonts.
+     OK button fix
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 17 Jan 2001 16:05:00 -0700
+
+qt2.2 (2:2.2.3-6) unstable; urgency=low
+ 
+   * New i18n patches - submitted upstream finally it seems
+   * Cleanup of build-depends and depends.  
+   * Creating a non-kde designer package
+   * Upstream i18n updates out of future 2.2.4 release.
+   * Fix print dialog problem - thanks to Michael Lachmann <dirk@santafe.edu>
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 15:30:00 -0700
+
+qt2.2 (2:2.2.3-5) unstable; urgency=low
+ 
+   * Cleaning up depends/provides/conflicts
+     We are the only qt package for unstable so lets act like it.
+   * new i18n patch for qpsprinter
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 10 Jan 2001 16:00:00 -0700
+
+qt2.2 (2:2.2.3-4) unstable; urgency=low
+ 
+   * New i18n patches
+   * More build fixes
+    
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 03:31:00 -0700
+
+qt2.2 (2:2.2.3-3) unstable; urgency=low
+ 
+  * Applying Anti-Aliasing patch
+  * Adjusting Build-Depends as we now must have the latest X4
+  * Adding libfreetyp6-dev to Build-Depends
+  * Fixing document links (Closes: #79876)
+  * New i18n patch update for qpsprinter
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 01:13:00 -0700
+
+qt2.2 (2:2.2.3-2) unstable; urgency=low
+ 
+  * More build fixes...arggg...
+  * Applying new i18n patches for 2.2.3 and removing old 2.2.2 hacks
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 14 Dec 2000 16:27:00 -0700
+
+qt2.2 (2:2.2.3-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Cleaning up build process
+  * Removing Mesa specific GL code as before
+  * Including new tools - qconfig, qvfb, makeqpf, and qembed
+  * Applying qscrollview patch from QT via <j.w.greven@student.utwente.nl>
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Dec 2000 14:45:00 -0700
+
+qt2.2 (2:2.2.2-12) unstable; urgency=low
+ 
+  * New ad hoc xim patch - amazing what happens when you have no other choice 
+  * Updating shlibs
+  * More build-depends and depends work
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 11 Dec 2000 09:09:00 -0700
+
+qt2.2 (2:2.2.2-11) unstable; urgency=low
+ 
+  * Removing xim patch since it's been weeks without a fix for the problems
+    it causes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Dec 2000 06:30:00 -0700
+
+qt2.2 (2:2.2.2-10) unstable; urgency=low
+ 
+  * Friggen dependency loops.
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Dec 2000 01:00:00 -0700
+
+qt2.2 (2:2.2.2-9) unstable; urgency=low
+  
+  * Fixing broken shlibs...arggg
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 02 Dec 2000 23:12:00 -0700
+
+qt2.2 (2:2.2.2-8) unstable; urgency=low
+ 
+  * Creating libqt2.2-gl package.  Recommendations from upstream folks to
+    only compile in GL support as necessary due to stability issues and the
+    fact that we do have users that require GL support in QT has led me to
+    move GL support out of the main QT package.  libqt2.2 conflicts/replaces
+    libqt2.2-gl while libqt2.2-gl replaces libqt2.2.  
+  * Adding in missing build-depends
+  * More build cleanup
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 30 Nov 2000 15:15:00 -0700
+
+qt2.2 (2:2.2.2-7) unstable; urgency=low
+ 
+  * New i18n patches
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 29 Nov 2000 07:52:00 -0700
+
+qt2.2 (2:2.2.2-6) unstable; urgency=low
+ 
+  * New i18n patches 
+  * Adding in a replaces for libqt1g-dev and qt1g-dev
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 25 Nov 2000 03:40:00 -0700
+
+qt2.2 (2:2.2.2-5) unstable; urgency=low
+ 
+  * Removing nas support per popular demand
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 20 Nov 2000 15:45:00 -0700
+
+qt2.2 (2:2.2.2-4) unstable; urgency=low
+ 
+  * Moving threaded version of libqt to libqt2.2-mt to cut down on size of
+    main package and still allow for those who need the threaded version to
+    obtain it.
+  * Fixing up dependencies for xlibs vs xlib6g for ports that do not have 
+    xlibs
+  * Fixing shlibs
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Nov 2000 20:14:00 -0700
+
+qt2.2 (2:2.2.2-4) unstable; urgency=low
+  
+  * Fixing up thread support again
+  * Fixing the last lintian error
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Nov 2000 08:30:00 -0700
+
+qt2.2 (2:2.2.2-3.1) unstable; urgency=low
+ 
+  * Fixing QGLWidget problem (Closes: #77248)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 16 Nov 2000 21:30:00 -0700
+
+qt2.2 (2:2.2.2-3) unstable; urgency=low
+ 
+  * Applying uic patch from upstream
+  * Adding in versioned replace (Closes: #77147)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 16 Nov 2000 07:15:00 -0700
+
+qt2.2 (2:2.2.2-2.1) unstable; urgency=low
+ 
+  * Removing thread support as it still seems unstable
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 16 Nov 2000 07:15:00 -0700
+
+qt2.2 (2:2.2.2-2) unstable; urgency=low
+ 
+  * contains new i18n patches
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 16 Nov 2000 02:00:00 -0700
+
+qt2.2 (2:2.2.2-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Does not contain any i18n patches
+  * compiled with nas sound support
+  * mesa specific GL code removed manually
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 14 Nov 2000 20:00:00 -0700
+
+qt2.2 (2:2.2.1-11) unstable; urgency=low
+ 
+  * Manually removing Mesa specific GL code from qt
+  * New i18n patch
+  * Cleaned up diff file
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Nov 2000 03:00:00 -0700
+
+qt2.2 (2:2.2.1-10) unstable; urgency=low
+ 
+  * New i18n patches (Closes: #75830)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Nov 2000 16:00:00 -0700
+                                                                                
+qt2.2 (2:2.2.1-9.2) unstable; urgency=low
+ 
+  * Fix to /usr/lib/qt2/man link problem (Closes: #75622)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 05 Nov 2000 22:00:00 -0700
+                                                                                
+qt2.2 (2:2.2.1-9.1) unstable; urgency=low
+ 
+  * Build against X4 libs
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 12:00:00 -0700
+                                                                                
+qt2.2 (2:2.2.1-9) unstable; urgency=low
+
+  * More opengl cleanup
+  * Removing i18n patches as they are causing problems in some apps
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 01 Nov 2000 23:00:00 -0700
+
+qt2.2 (2:2.2.1-8) unstable; urgency=low
+ 
+  * Re-adding opengl support until another solution is created
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 16:28:00 -0700
+
+qt2.2 (2:2.2.1-7) unstable; urgency=low
+ 
+  * Round 42..heh...let's try the png fix again
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 18 Oct 2000 23:54:00 -0700
+                                                                                
+qt2.2 (2:2.2.1-6) unstable; urgency=low
+ 
+  * Hopefully fix png image viewing crashing
+  * adding in links for /usr/lib/qt2/man and /usr/lib/qt2/doc
+  * Fixing compression of html files
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 18 Oct 2000 00:15:00 -0700
+                                                                                
+qt2.2 (2:2.2.1-5) unstable; urgency=low
+ 
+  * Minor dependency fix for libqt2.2-dev's perl necessesity
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 14 Oct 2000 01:00:00 -0700
+
+qt2.2 (2:2.2.1-4) unstable; urgency=low
+ 
+  * Ok, I'm not sure what i did but somehow the i18n patches missed getting
+    applied when I updated the source.  Re-Applying them.  (Closes: #74713)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 13 Oct 2000 23:30:00 -0700
+
+qt2.2 (2:2.2.1-3) unstable; urgency=low
+ 
+  * Putting includes for examples into qt2.2-doc package (Closes: #74479)
+  * adding in some build options recommended by upstream that will reduce
+    the amount of memory used by apps linked against qt as well as reduce
+    the size of the resulting library significantly
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 11 Oct 2000 02:30:00 -0700
+                                                                                
+qt2.2 (2:2.2.1-2) unstable; urgency=low
+ 
+  * More build cleanup
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Oct 2000 03:45:00 -0700
+
+qt2.2 (2:2.2.1-1) unstable; urgency=low
+ 
+  * Including new version of upstream source code (they buggered something)
+  * Applying i18n patches for 2.2.1
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Oct 2000 22:00:00 -0700
+                                                                                
+qt2.2 (2:2.2.1-0) unstable; urgency=low
+ 
+  * New upstream version
+  * Building with thread support turned on (Closes: #72994)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 20:00:00 -0700
+                                                                                
+qt2.2 (2:2.2.0-20000906-9) unstable; urgency=low
+
+  * Fixing up some dependencies and build-depends
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 26 Sep 2000 17:30:00 -0700
+
+qt2.2 (2:2.2.0-20000906-8) unstable; urgency=low
+
+  * Appling font patch to fix infinate loop and XFree4 (Closes: #72374)
+  * Fixing /usr/include/qt after removing alternatives
+  * Adding in a conflict for libqt1g-dev
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 24 Sep 2000 22:00:00 -0700
+
+qt2.2 (2:2.2.0-20000906-7) unstable; urgency=low
+ 
+  * Finally adding in a fix for dangling manpage (Closes: #67375)
+  * Getting rid of alternatives since this will be the only qt package
+  * Adding libmng support
+  * Fixing up build-depends
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 23 Sep 2000 00:30:00 -0700
+
+qt2.2 (2:2.2.0-20000906-6) unstable; urgency=low
+ 
+  * More cleanup of build process to better handle mergetr and msg2qm
+  * Should fix problem with mesa linking (Closes: #71829)
+  * Applying m17n patches (Closes: #71820)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 17:30:00 -0700
+
+qt2.2 (2:2.2.0-20000906-5) unstable; urgency=low
+ 
+  * Fixing problem with missing mergetr and msg2qm
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 12 Sep 2000 09:00:00 -0700
+
+qt2.2 (2:2.2.0-20000906-4) unstable; urgency=low
+
+  * Building against utahglx instead of mesa to get around hardcoded Mesa
+    items
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 10 Sep 2000 19:00:00 -0700
+
+qt2.2 (2:2.2.0-20000906-3) unstable; urgency=low
+
+  * Fixing src -> sub-src problem in rules file (should help alpha build)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 15:15:00 -0700
+
+qt2.2 (2:2.2.0-20000906-2) unstable; urgency=low
+ 
+  * Removing designer build pieces
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 08 Sep 2000 00:15:00 -0700
+
+qt2.2 (2:2.2.0-20000906-1) unstable; urgency=low
+ 
+  * Working out build issues
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Sep 2000 15:00:00 -0700
+
+qt2.2 (2:2.2.0-20000906-0) unstable; urgency=low
+
+  * New upstream stable release 
+  * Includes designer and is under a dual license. QPL and GPL
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 06 Sep 2000 07:45:00 -0700
+
+qt2.2-copy (2:2.2.0-20000821-0.3) unstable; urgency=low
+
+  * Building other tools (mergetr, msg2qm, qconfig)
+  * removing replace/conflict with libqt2.1 
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 05 Sep 2000 18:00:00 -0700
+
+qt2.2-copy (2:2.2.0-20000821-0.2) unstable; urgency=low
+
+  * Fixing library issues when building designer
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 17:00:00 -0700
+
+qt2.2-copy (2:2.2.0-20000821-0.1) unstable; urgency=low
+ 
+  * Updating version number to be higher than Debian one
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 28 Aug 2000 06:00:00 -0700
+                                                                                
+qt2.2-copy (2:2.2.0-20000821-0) unstable; urgency=low
+
+  * New upstream CVS version
+  * Providing designer 
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 21 Aug 2000 18:00:00 -0700
+
+qt2.2-copy (2:2.2.0-1.copy.1) unstable; urgency=low
+ 
+  * New upstream beta version
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 00:30:00 -0700      
+
+qt2.2-beta1 (2:2.2.0-0.beta1.0) unstable; urgency=low
+
+  * New upstream beta version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 10 Aug 2000 02:30:00 -0700
+
+qt2.1 (2:2.1.0-1.1) unstable; urgency=low
+ 
+  * Upping the epoch number since the upstream version changes made 2.1.0
+    full release lower than the 2.1.0beta
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 18 May 2000 08:30:00 -0700
+
+qt2.1 (2.1.0-1.1) unstable; urgency=low
+ 
+  * Fixing qt_windows/mac.h include errors
+  * Adding in build depends
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 May 2000 02:30:00 -0700
+
+qt2.1 (2.1.0-1) unstable; urgency=low
+
+  * Applying patches for international support issues provided by
+    Oliver Bolzer
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 25 Apr 2000 17:45:00 -0700
+
+qt2.1 (2.1.0-0) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 19 Apr 2000 05:30:00 -0700
+
+qt2.1beta3 (2.1.0beta3-0) unstable; urgency=low
+
+  * New upstream beta version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 22 Mar 2000 18:00:00 -0700
+
+qt2.1beta2 (2.1.0beta2-1.1) unstable; urgency=low
+ 
+  * Applying qsortedlist.h patch 
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 07 Mar 2000 10:30:00 -0700
+
+qt2.1beta2 (2.1.0beta2-1) unstable; urgency=low
+ 
+  * New upstream beta version
+  * Fixing prerm script
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 06 Mar 2000 00:30:00 -0700
+                                                                          
+qt2.1 (2.1.0-0.beta1.0) unstable; urgency=medium
+
+  * New upstream beta version 
+  * Taking over maintainership temporarily with permission from Heiko
+  * Fixing alternatives issue (Closes: #56997)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 28 Feb 2000 18:00:00 -0700
+
+qt2 (2.0.2-0.7) unstable; urgency=medium
+
+  * Taking out old qt1g confliction (Closes: #54414)
+  * Fixing problem with overwriting moc man pages (Closes: #53067)
+  * NMU
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 09 Jan 2000 12:15:23 -0700
+
+qt2 (2.0.2-0.6) unstable; urgency=medium
+
+  * Compressing man pages (Closes: #51336)
+  * Fixing self dependencies issue with resident qt libs
+  * Adding in an alternative for -dev's libqt.so
+  * NMU
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 30 Nov 1999 23:15:23 -0400
+
+qt2 (2.0.2-0.5) unstable; urgency=medium
+
+  * Adding in a conflict for qt1g..sorry.. (Closes #49507, #49347, #48827)
+  * NMU
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 03 Nov 1999 00:15:23 -0400
+
+qt2 (2.0.2-0.4) unstable; urgency=medium
+
+  * Creating an alternative for /usr/include/qt
+  * NMU
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 03 Nov 1999 00:15:23 -0400
+
+qt2 (2.0.2-0.3) unstable; urgency=medium
+
+  * Changing pathing for doc-base (Closes: #47583)
+  * Setting sections properly in control file
+  * NMU
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 1 Nov 1999 00:15:23 -0400
+
+qt2 (2.0.2-0.2) unstable; urgency=medium
+
+  * Fixing self dependency (Closes: #48254)
+  * Including msg2qm and mergetr (Closes: #47897)
+  * Creating an alternative for moc between qt1 and qt2 (Closes: #44844)
+  * Linking /usr/lib/qt2/include to /usr/include/qt2
+  * Fixing up post/pre scripts to work with debian policy (doc linking stuff)
+  * NMU
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Oct 1999 08:15:23 -0400
+
+qt2 (2.0.2-0.1) unstable; urgency=medium
+
+  * New upstream version
+  * Changing package names to meet policy (Closes: 46229)
+  * NMU
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Oct 1999 08:15:23 -0400
+
+qt2 (2.0.1-0.1) unstable; urgency=medium
+
+  * Rebuild with new gcc (2.95) libs
+  * Changing requirement for -doc from recommends to suggests
+  * Migrating to /usr/share/doc
+  * NMU for the above changes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Sep 1999 14:15:23 -0400
+
+qt2 (2.0.1-0) unstable; urgency=medium
+
+  * bug fix release (new upstream)
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Tue, 20 Jul 1999 09:15:23 +0200
+
+qt2 (2.00-0) unstable; urgency=medium
+
+  * final release
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Mon, 28 Jun 1999 18:08:19 +0200
+
+qt2beta (2.00beta3-19990619-1) unstable; urgency=low
+
+  * new upstream
+  * included below mentioned changes from J.M. Dassen
+  * included extensions: imageio, opengl, xt
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Sat, 19 Jun 1999 13:14:36 +0200
+
+qt2beta (2.0-19990516-2.1) unstable; urgency=low
+
+  * UNRELEASED.
+  * Bumped Standards-Version.
+  * [debian/control] Updated descriptions.
+  * [debian/rules] Strengthened 'clean' to produce better diffs.
+  * [src/Makefile.in] Disabled building of the libraries in "3rdparty" and
+    make use of the Debian libpng and libz packages instead.
+  * [debian/TODO] New.
+  * [debian/shlibs-dbg] Updated.
+  * Added doc-base support.
+  * Fixed a number of lintian complaints:
+    * [debian/control] Section "x11", not "main/x11".
+    * [debian/rules] Install changelogs.
+    * [debian/rules] Correct permission of documentation files.
+    * [debian/rules] Don't install LICENSE.QPL; it's in the copyright file
+      already.
+    * [debian/copyright.in] License is in LICENSE.QPL in the source
+      distribution.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Fri, 21 May 1999 18:59:25 +0200
+
+qt2beta (2.0-19990516-2) unstable; urgency=low
+
+  * skipping the man page steps entirely, since
+    the source doesn't seem to contain manpages, does it?
+  * built on a potato system
+    Thanks to: "Ivan E. Moore II" <rkrusty@tdyc.com>
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Mon, 17 May 1999 13:01:18 -0700
+
+qt2beta (2.0-19990516-1) unstable; urgency=low
+
+  * new checkout.
+  * gif enabled
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Mon, 10 May 1999 15:57:05 +0200
+
+qt2beta (2.0-19990406-1) unstable; urgency=low
+
+  * new checkout.
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Tue,  6 Apr 1999 09:07:14 +0200
+
+qt2beta (2.0-19990316-1) unstable; urgency=low
+
+  * new checkout.
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Tue, 16 Mar 1999 23:35:59 +0100
+
+qt2beta (2.0-19990308-1) unstable; urgency=low
+
+  * new checkout.
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Tue,  9 Mar 1999 00:03:32 +0100
+
+qt2beta (2.0-19990302-1) unstable; urgency=low
+
+  * new upstream beta ... (for coolo@kde.org)
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Tue,  2 Mar 1999 16:08:30 +0100
+
+qt1-snapshot (1.39.19980414-2) unstable; urgency=low
+
+  * insert the correct place (/usr/lib/qt1-snapshot/bin/moc)
+    of moc into the example Makefiles.
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Thu, 16 Apr 1998 17:45:00 +0200
+
+qt1-snapshot (1.39.19980414-1) unstable; urgency=low
+
+  * new upstream
+  * can now coexist with qt1
+  * for further information read  /usr/doc/qt1-snapshot/README.Debian
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Wed, 15 Apr 1998 22:41:36 +0200
+
+qt1 (1.39.19980406-2) unstable; urgency=low
+
+  * added the /usr/lib/qt dir w/ two symlinks
+    -> /usr/include and ->/usr/X11R6/lib
+    to make the QTDIR approach work (now
+    you can set QTDIR=/usr/lib/qt)
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Wed,  8 Apr 1998 11:18:16 +0200
+
+qt1 (1.39.19980406-1) unstable; urgency=low
+
+  * new upstream, used to compile qtscape
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Tue,  7 Apr 1998 11:22:02 +0200
+
+qt1 (1.33-5) frozen; urgency=low
+
+  * correct include and lib dir for the mesa stuff
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Mon,  6 Apr 1998 11:13:40 +0200
+
+qt1 (1.33-4) frozen; urgency=low
+
+  * next try to upload it.  Build with mesa2g-dev
+    instead of the libc5 mesa libs.
+  * /usr/doc/example/qt-doc removed (#16921)
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Sun,  5 Apr 1998 13:58:13 +0200
+
+qt1 (1.33-3) frozen; urgency=low
+
+  * shlibs files now mention the current verion of libqt
+  * include libqgl (#16942, #14410)
+  * include tutorial in qt-doc
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Fri, 27 Mar 1998 13:07:30 +0100
+
+qt1 (1.33-2) frozen; urgency=medium
+
+  * dependency on xlib6 removed (#15905)
+  * include all .html files (#11567)
+  * hopefully lintian proof
+  * used the debhelper tools
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Tue, 24 Mar 1998 23:30:38 +0100
+
+qt1 (1.33-1) unstable; urgency=medium
+
+  * new upstream
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Mon, 23 Mar 1998 20:06:31 +0100
+
+qt1 (1.31-1.3) unstable; urgency=low
+
+  * -1.1 is not processed. maybe a new upload will work ?
+  * non-maintainer release by Andreas Jellinghaus <aj@debian.org>.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Tue, 14 Oct 1997 10:47:14 +0200
+
+qt1 (1.31-1.1) unstable; urgency=low
+
+  * libc6 version.
+  * non-maintainer release by Andreas Jellinghaus <aj@debian.org>.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Tue, 14 Oct 1997 10:47:14 +0200
+
+qt1 (1.31-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Mon, 13 Oct 1997 08:55:58 +0200
+
+qt1 (1.30-1) unstable; urgency=medium
+
+  * new upstream release
+  * changes: examples/tetris/Makefile clean target changed to
+    remove the *.moc file too
+  * src/moc/Makefile touches y.tab.h after cleanup since the
+    original source from troll tech contains it too (but
+    is useless)
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Tue, 30 Sep 1997 22:58:40 +0200
+
+qt1 (1.2.1-1) stable unstable non-free; urgency=medium
+
+  * new upstream release (Bugfix only!)
+
+ -- Heiko Sclittermann <heiko@lotte.sax.de>  Tue, 12 Aug 1997 21:26:13 +0200
+
+qt1 (1.2-5) frozen non-free; urgency=low
+
+  * set the new moc location in the examples and
+    tutorial makefiles.
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Tue, 29 Apr 1997 12:09:03 +0200
+
+qt1 (1.2-4) frozen non-free; urgency=low
+
+  * shlibs file lists version 1.2, since applications compiled
+    agains 1.2 doesn't work with < 1.2
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Fri, 25 Apr 1997 20:04:04 +0200
+
+qt1 (1.2-3) non-free; urgency=low
+
+  * doc no longer depends on the library/binary package,
+    it only suggests it
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Mon, 21 Apr 1997 16:23:49 +0200
+
+qt1 (1.2-2) non-free; urgency=low
+
+  * moc goes to /usr/bin instead of /usr/X11R6/bin
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Thu, 17 Apr 1997 11:49:24 +0200
+
+qt1 (1.2-1) non-free; urgency=medium
+
+  * new upstream version
+  * bug8432 fixed: dependency on xlib6
+  * New include dir is /usr/X11R6/include/qt (according to Xm, XmCxx, ...)
+  * bug8449 fixed: (suggestion) symlink
+        /usr/include/qt -> /usr/X11R6/include/qt  (shouldn't do
+        to much harm)
+  * bug8507/8184 fixed: symlink in example dir
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Fri, 11 Apr 1997 12:46:12 +0200
+
+qt1 (1.1-2) non-free; urgency=low
+
+  * optional instead of extra ....
+  * correctly replace old qt0-doc and old qt0-dev with
+    qt-doc resp. qt-dev
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Fri, 28 Feb 1997 17:08:02 +0100
+
+qt1 (1.1-0) non-free; urgency=medium
+
+  * new upstream release out for about 3 months
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Wed, 12 Feb 1997 09:18:40 +0100
+
+qt1 (1.0-3) contrib; urgency=low
+
+  * should appear in non-free now
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Wed, 11 Dec 1996 19:02:08 +0100
+
+qt1 (1.0-2) frozen unstable; urgency=low
+
+  * nothing new unless distribution code and debian version
+    number -- I hope this will finally place all *deb files
+    in place on master.
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Thu, 5 Dec 1996 09:40:14 +0100
+
+qt1 (1.0-1) unstable; urgency=low
+
+  * new upstream version
+  * dev and doc package are now installed as qt-dev and qt-doc,
+    since only one qt-dev/qt-doc may exist at any time (but
+    qt may exist as qt0 and qt1)
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Fri, 18 Oct 1996 13:32:24 +0200
+
+qt0 (0.99-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Mon, 9 Sep 1996 13:22:03 +0200
+
+qt0 (0.98-1) unstable; urgency=low
+
+  * initial release
+
+ -- Heiko Schlittermann <heiko@lotte.sax.de>  Sun, 8 Sep 1996 13:40:31 +0200

Added: people/chrsmrtn/qt-x11-free/debian/compat
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/compat	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/compat	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1 @@
+4

Added: people/chrsmrtn/qt-x11-free/debian/control
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/control	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/control	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,271 @@
+Source: qt-x11-free
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Isaac Clerencia <isaac@debian.org>, Pierre Habouzit <madcoder@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>, Brian Nelson <pyro@debian.org>, Adeodato Simó <asp16@alu.ua.es>, Riku Voipio <riku.voipio@iki.fi>
+Build-Depends: debhelper (>= 4.1.26), xlibs-static-dev (>= 4.3.0.dfsg.1-4), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-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), libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfreetype6-dev (>= 2.1.10), libiodbc2-dev (>= 3.51.2-4), libmysqlclient12-dev | libmysqlclient-dev, flex, postgresql-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu1-mesa-dev | libglu-dev , libxft-dev, dpatch (>= 1.13), libxrender-dev, libxcursor-dev, firebird2-dev [i386], libsqlite0-dev, type-handling (>= 0.2.1), binutils (>= 2.14.90.0.7)
+Section: libs
+Priority: optional
+Standards-Version: 3.6.1
+
+Package: libqt3c102-mt
+Architecture: any
+Section: libs
+Replaces: qt3-tools (<< 2:3.0.2-20020306-1), libqt3-helper, libqt3, libqt3-mt
+Depends: ${shlibs:Depends}, fontconfig
+Conflicts: libqt3-mt, libqui1-emb, libqt3c-mt
+Suggests: libqt3c102-mt-psql, libqt3c102-mt-mysql, libqt3c102-mt-odbc
+Description: Qt GUI Library (Threaded runtime version), Version 3
+ This is the Trolltech Qt library, version 3. It's necessary for
+ applications that link against the libqt-mt.so.3, e.g. all KDE3 
+ applications.
+
+Package: libqt3c102-mt-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: libqt3c102-mt (= ${Source-Version})
+Description: debugging symbols for libqt3-mt
+ This package contains the debugging symbols associated with libqt3-mt.
+ They will automatically be used by gdb for debugging Qt-related
+ issues.
+
+Package: libqt3c102-mt-mysql
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Replaces: libqt3-mysql (<= 2:3.1.1+cvs.20021220-1)
+Conflicts: libqt3-mt-mysql, libqt3c-mt-mysql
+Description: MySQL database driver for Qt3 (Threaded)
+ This package contains the threaded MySQL plugin for Qt3. Install it if
+ you intend to use or write Qt programs that are to access a MySQL DB.
+
+Package: libqt3c102-mt-odbc
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Replaces: libqt3-odbc (<= 2:3.1.1+cvs.20021220-1)
+Conflicts: libqt3-mt-odbc, libqt3c-mt-odbc
+Description: ODBC database driver for Qt3 (Threaded)
+ This package contains the threaded ODBC plugin for Qt3. Install it if
+ you intend to use or write Qt programs that are to access an ODBC DB.
+
+Package: libqt3c102-mt-psql
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Replaces: libqt3-psql (<= 2:3.1.1+cvs.20021220-1)
+Conflicts: libqt3-mt-psql, libqt3c-mt-psql
+Description: PostgreSQL database driver for Qt3 (Threaded)
+ This package contains the threaded PostgreSQL plugin for Qt3. 
+ Install it if you intend to use or write Qt programs that are 
+ to access a PostgreSQL DB.
+
+Package: libqt3c102-mt-ibase
+Architecture: i386
+Section: libs
+Depends: ${shlibs:Depends}
+Description: InterBase/FireBird database driver for Qt3 (Threaded)
+ This package contains the threaded InterBase/FireBird plugin 
+ for Qt3. Install it if you intend to use or write Qt programs 
+ that are to access an InterBase/FireBird DB.
+ 
+Package: libqt3c102-mt-sqlite
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: SQLite database driver for Qt3 (Threaded)
+ This package contains the threaded SQLite plugin for Qt3. Install 
+ it if you intend to use or write Qt programs that are to access an
+ SQLite DB.
+
+Package: libqt3-mt-dev
+Architecture: any
+Section: libdevel
+Replaces: libqt-mt-dev, libqt3-dev (>= 3.0.5-4), libqt3-helper, libqt3-headers (<= 3:3.1.1-3), libqt3-emb (<= 3:3.0.3-1)
+Depends: xlibs-static-dev (>= 4.3.0.dfsg.1-4), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-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), libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, libc6-dev, libqt3c102-mt (= ${Source-Version}), libqt3-headers (= ${Source-Version}), qt3-dev-tools (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, libaudio-dev
+Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1)
+Recommends: libqt3-compat-headers
+Suggests: libqt3-i18n, qt3-doc
+Description: Qt development files (Threaded)
+ Qt is a C++ class library optimized for graphical user interface
+ development. This package contains the libqt-mt.so symlink, necessary 
+ for building threaded Qt applications as well as the libqui.so symlink 
+ and the necessary header files for libqui.so. (See README.Debian and 
+ the Qt Documentation for instructions on libqui.so)
+ .
+ WARNING: If you plan to build some older Qt3 applications, you will 
+ most probably have to install the libqt3-compat-headers package. It
+ contains all the headers which are not part of the official Qt3 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: libqt3-headers
+Architecture: any
+Section: devel
+Recommends: libqt3-mt-dev
+Replaces: libqt3-mt-dev, libqt3-dev, libqt3-plugins-headers
+Description:  Qt3 header files
+ This package contains all header files for libqt and libqt-mt which come 
+ with Qt3. If you want to compile or develop programs which use Qt3, you 
+ have to install this package.
+
+Package: libqt3-compat-headers
+Architecture: any
+Section: devel
+Depends: libqt3-headers (= ${Source-Version})
+Recommends: libqt3-mt-dev
+Replaces: libqt3-mt-dev (<= 3:3.1.1-2), libqt3-dev (<= 3:3.1.1-2), libqt3-headers (<= 3:3.1.1-2)
+Description: Qt 1.x and 2.x compatibility includes
+ This package contains header files that are intended for build
+ compatibility for applications that build with Qt3 but still use
+ deprecated includes. It is meant as an intermediate solution and 
+ these header files are not part of the official Qt3 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 
+ libqt3-headers.
+
+Package: qt3-dev-tools
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: libqt3-mt-dev | libqt3-dev
+Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev, qt3-doc (<= 3:3.1.1-2)
+Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9)
+Description: Qt3 development tools
+ This package contains all tools that are necessary to build programs
+ that are written using Qt3. These are: qmake, uic and moc.
+ For Qt3 development, you most likely want to install this package.
+ 
+Package: qt3-designer
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: qt3-dev-tools
+Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
+Suggests: qt3-assistant, qt3-doc
+Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc
+Description: Qt3 Designer
+ The Qt Designer is a GUI design program that interactively lets you
+ construct user interfaces for the Qt library. Additionally it lets you
+ create whole project and works together with the database drivers
+ provided by Qt to create applications with easy database accesss through
+ Qt. The resulting user interface files can then be converted to
+ C++ classes using the uic commandline utility which is usually done
+ automatically for the developer with a project management with qmake
+ or automake.
+
+Package: qt3-apps-dev
+Architecture: any
+Section: devel
+Depends: libqt3-mt-dev
+Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
+Description: Qt3 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 Qt; the Qt Designer and the Qt Assistant.
+ It allows integrating additional enhancements into the Qt Designer
+ respectively faciliate the Qt Assistant from within your Qt application
+ to interactively call the Assistant for displaying online help that the
+ developer includes with his application.
+ 
+Package: qt3-linguist
+Architecture: any
+Section: devel
+Suggests: qt3-assistant
+Depends: ${shlibs:Depends}
+Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
+Description: The Qt3 Linguist
+ This package contains the Qt3 Linguist which provides translators a
+ tool perfect for translating any Qt-based application into other
+ languages and can be used and installed independently of any Qt
+ development files by the translator.
+ 
+Package: qt3-assistant
+Architecture: any
+Section: x11
+Depends: ${shlibs:Depends}, qt3-doc
+Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
+Description: The Qt3 assistant application
+ This package contains the Qt3 Assistant, an easy to use frontend for
+ the complete Qt3 documentation and serves as an online help viewer for 
+ any Qt program that wants to give the usesr access to online help.
+ Within the Qt tools it is used as the help viewer for the online help
+ for the Qt3 Designer and Linguist as well as qmake and the Qt 3 API 
+ documentation.
+ .
+ Developers of Qt Application who want to faciliate the Qt Assistant for online
+ help display should refer to the README.Debian file for libqt3-mt-dev and
+ the package qt3-apps-dev.
+ 
+Package: qt3-qtconfig
+Architecture: any
+Section: x11
+Depends: ${shlibs:Depends}
+Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
+Description: The Qt3 Configuration Application
+ The Qt Configuration program allows endusers to configure the look
+ and behavior of any Qt3 application. It is mostly only necessary
+ on systems which don't run KDE because the KDE control center already
+ covers this configuration automatically for the users Qt3 applications
+ according to his desktop settings in KDE. However, if you need to run
+ CJK-fonts or other non-latin scripts, you will most likely want to
+ install this package.
+ 
+Package: qt3-dev-tools-embedded
+Architecture: any
+Section: devel
+Recommends: libqt3-mt-dev
+Depends: ${shlibs:Depends}
+Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
+Description: Tools to develop embedded Qt applications
+ This package contains applications only suitable for developing
+ applications with Qt Embedded and/or Qtopia. It provides the QVFB
+ program for simulating an embedded device desktop as well as makeqpf
+ for converting fonts to embedded fonts suitable for being utilized
+ by Qt Embedded applications.
+
+Package: qt3-dev-tools-compat
+Architecture: any
+Section: devel
+Recommends: libqt3-mt-dev
+Depends: ${shlibs:Depends}
+Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
+Description: Conversion utilities for Qt3 development
+ This package contains some older Qt tools (namely qt20fix qtrename140,
+ qm2ts, mergetr, findtr and msg2qm). These tools are needed only by
+ application developers who need to migrate any Qt application written
+ for Qt 1.x or 2.x over to Qt 3.x. The purpose of the tools are to
+ help fixing the changes with include file renaming as well as migrating
+ the message file format of Qt 2 translation files or any gettext-based
+ translation system to the Qt 3 system.
+
+Package: libqt3-i18n
+Architecture: all
+Section: libs
+Recommends: libqt3c102-mt
+Description: i18n files for Qt3 library
+ This package contains the internationalization files for the Qt library.
+ Qt applications that are internationalized will need to depend on this package
+ for full internationalization support of the application towards the end user.
+ 
+Package: qt3-doc
+Architecture: all
+Section: doc
+Priority: extra
+Replaces: qt-doc
+Suggests: libqt3-headers, qt3-assistant | www-browser
+Description: Qt3 API documentation
+ This package contains the complete API documentation for Qt3.
+ Examples to coding are in qt3-examples. The documentation is provided
+ in HTML and manpage format; the HTML version can be viewed in conjunction
+ with the Qt Assistant.
+
+Package: qt3-examples
+Architecture: all
+Section: doc
+Priority: extra
+Depends: libqt3-mt-dev (= ${Source-Version})
+Description:  Examples for Qt3
+ These are examples provided with Qt3. They may be especially useful for
+ you if you are learning to program in Qt as they cover quite a lot of
+ things that are possible with Qt3.

Added: people/chrsmrtn/qt-x11-free/debian/copyright
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/copyright	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/copyright	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,129 @@
+This is Debian GNU/Linux's prepackaged version of the Qt GUI Development
+library.
+
+This package was put together originally by me, Heiko Schlittermann
+<heiko@lotte.sax.de>, from the sources, which I obtained from
+ftp.troll.no. The changes were very minimal to nothing, - merely
+adding support for the Debian package maintenance scheme, by adding
+various debian/* files and by changing the propagate script to fit the
+Debian GNU/Linux filesystem structure.
+
+This package has since been temporarily taken over by Ivan Moore 
+<rkrusty@debian.org> until Heiko has time to work on it all again.
+
+In Jul 2002, Martin Loschwitz <madkiss@madkiss.org> overtook the package 
+maintenance for the QT3-packages.
+
+Qt 3.3 is dual licensed under the QPL and the GPL
+
+Please refer to /usr/share/common-licenses/GPL for complete GPL license.
+
+			     THE Q PUBLIC LICENSE
+				  version 1.0
+
+		   Copyright (C) 1999-2000 Troll Tech AS, Norway.
+		       Everyone is permitted to copy and
+		       distribute this license document.
+
+The intent of this license is to establish freedom to share and change the
+software regulated by this license under the open source model.
+
+This license applies to any software containing a notice placed by the
+copyright holder saying that it may be distributed under the terms of
+the Q Public License version 1.0.  Such software is herein referred to as
+the Software.  This license covers modification and distribution of the
+Software, use of third-party application programs based on the Software,
+and development of free software which uses the Software.
+
+				 Granted Rights
+
+1. You are granted the non-exclusive rights set forth in this license
+   provided you agree to and comply with any and all conditions in this
+   license.  Whole or partial distribution of the Software, or software
+   items that link with the Software, in any form signifies acceptance of
+   this license.
+
+2. You may copy and distribute the Software in unmodified form provided
+   that the entire package, including - but not restricted to - copyright,
+   trademark notices and disclaimers, as released by the initial developer
+   of the Software, is distributed.
+
+3. You may make modifications to the Software and distribute your
+   modifications, in a form that is separate from the Software, such as
+   patches. The following restrictions apply to modifications:
+
+     a. Modifications must not alter or remove any copyright notices in
+        the Software.
+
+     b. When modifications to the Software are released under this
+        license, a non-exclusive royalty-free right is granted to the
+        initial developer of the Software to distribute your modification
+        in future versions of the Software provided such versions remain
+        available under these terms in addition to any other license(s) of
+        the initial developer.
+
+4. You may distribute machine-executable forms of the Software or
+   machine-executable forms of modified versions of the Software, provided
+   that you meet these restrictions:
+
+     a. You must include this license document in the distribution.
+
+     b. You must ensure that all recipients of the machine-executable forms
+        are also able to receive the complete machine-readable source code
+        to the distributed Software, including all modifications, without
+        any charge beyond the costs of data transfer, and place prominent
+        notices in the distribution explaining this.
+
+     c. You must ensure that all modifications included in the
+        machine-executable forms are available under the terms of this
+        license.
+
+5. You may use the original or modified versions of the Software to
+   compile, link and run application programs legally developed by you
+   or by others.
+
+6. You may develop application programs, reusable components and other
+   software items that link with the original or modified versions of the
+   Software.  These items, when distributed, are subject to the following
+   requirements:
+
+     a. You must ensure that all recipients of machine-executable forms of
+        these items are also able to receive and use the complete
+        machine-readable source code to the items without any charge
+        beyond the costs of data transfer.
+
+     b. You must explicitly license all recipients of your items to use
+        and re-distribute original and modified versions of the items in
+        both machine-executable and source code forms. The recipients must
+        be able to do so without any charges whatsoever, and they must be
+        able to re-distribute to anyone they choose.
+
+
+     c. If the items are not available to the general public, and the
+        initial developer of the Software requests a copy of the items,
+        then you must supply one.
+
+			    Limitations of Liability
+
+In no event shall the initial developers or copyright holders be liable
+for any damages whatsoever, including - but not restricted to - lost
+revenue or profits or other direct, indirect, special, incidental or
+consequential damages, even if they have been advised of the possibility
+of such damages, except to the extent invariable law, if any, provides
+otherwise.
+
+			          No Warranty
+
+The Software and this license document are provided AS IS with NO WARRANTY
+OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE.
+                                 Choice of Law
+
+This license is governed by the Laws of Norway. Disputes shall be settled
+by Oslo City Court.
+
+ The Qt GUI Toolkit is Copyright (C) 1994-2000 Trolltech AS.
+
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ GNU General Public License version 2, which is display below.
+

Added: people/chrsmrtn/qt-x11-free/debian/libqt3-compat-headers.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-compat-headers.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-compat-headers.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,54 @@
+usr/include/qt3/q1xcompatibility.h
+usr/include/qt3/qapp.h
+usr/include/qt3/qarray.h
+usr/include/qt3/qbitarry.h
+usr/include/qt3/qbttngrp.h
+usr/include/qt3/qchkbox.h
+usr/include/qt3/qclipbrd.h
+usr/include/qt3/qcollect.h
+usr/include/qt3/qcollection.h
+usr/include/qt3/qcombo.h
+usr/include/qt3/qconnect.h
+usr/include/qt3/qdatetm.h
+usr/include/qt3/qdrawutl.h
+usr/include/qt3/qdstream.h
+usr/include/qt3/qfiledef.h
+usr/include/qt3/qfiledlg.h
+usr/include/qt3/qfileinf.h
+usr/include/qt3/qfontinf.h
+usr/include/qt3/qfontmet.h
+usr/include/qt3/qgrpbox.h
+usr/include/qt3/qintcach.h
+usr/include/qt3/qiodev.h
+usr/include/qt3/qlcdnum.h
+usr/include/qt3/qlined.h
+usr/include/qt3/qlist.h
+usr/include/qt3/qmenudta.h
+usr/include/qt3/qmetaobj.h
+usr/include/qt3/qmlined.h
+usr/include/qt3/qmsgbox.h
+usr/include/qt3/qmultilinedit.h
+usr/include/qt3/qobjcoll.h
+usr/include/qt3/qobjdefs.h
+usr/include/qt3/qpaintd.h
+usr/include/qt3/qpaintdc.h
+usr/include/qt3/qpdevmet.h
+usr/include/qt3/qpmcache.h
+usr/include/qt3/qpntarry.h
+usr/include/qt3/qpopmenu.h
+usr/include/qt3/qprndlg.h
+usr/include/qt3/qprogbar.h
+usr/include/qt3/qprogdlg.h
+usr/include/qt3/qpsprn.h
+usr/include/qt3/qpushbt.h
+usr/include/qt3/qqueue.h
+usr/include/qt3/qradiobt.h
+usr/include/qt3/qrangect.h
+usr/include/qt3/qscrbar.h
+usr/include/qt3/qsocknot.h
+usr/include/qt3/qstack.h
+usr/include/qt3/qtabdlg.h
+usr/include/qt3/qtstream.h
+usr/include/qt3/qvector.h
+usr/include/qt3/qwidcoll.h
+usr/include/qt3/qwindefs.h

Added: people/chrsmrtn/qt-x11-free/debian/libqt3-headers.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-headers.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-headers.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,271 @@
+usr/include/qt3/private/*
+usr/include/qt3/qabstractlayout.h
+usr/include/qt3/qaccel.h
+usr/include/qt3/qaccessible.h
+usr/include/qt3/qaction.h
+usr/include/qt3/qapplication.h
+usr/include/qt3/qasciicache.h
+usr/include/qt3/qasciidict.h
+usr/include/qt3/qasyncimageio.h
+usr/include/qt3/qasyncio.h
+usr/include/qt3/qbig5codec.h
+usr/include/qt3/qbitarray.h
+usr/include/qt3/qbitmap.h
+usr/include/qt3/qbrush.h
+usr/include/qt3/qbuffer.h
+usr/include/qt3/qbutton.h
+usr/include/qt3/qbuttongroup.h
+usr/include/qt3/qcache.h
+usr/include/qt3/qcanvas.h
+usr/include/qt3/qcdestyle.h
+usr/include/qt3/qcheckbox.h
+usr/include/qt3/qcleanuphandler.h
+usr/include/qt3/qclipboard.h
+usr/include/qt3/qcolor.h
+usr/include/qt3/qcolordialog.h
+usr/include/qt3/qcombobox.h
+usr/include/qt3/qcommonstyle.h
+usr/include/qt3/qcompactstyle.h
+usr/include/qt3/qconnection.h
+usr/include/qt3/qcstring.h
+usr/include/qt3/qcursor.h
+usr/include/qt3/qdatabrowser.h
+usr/include/qt3/qdatastream.h
+usr/include/qt3/qdatatable.h
+usr/include/qt3/qdataview.h
+usr/include/qt3/qdatetime.h
+usr/include/qt3/qdatetimeedit.h
+usr/include/qt3/qdeepcopy.h
+usr/include/qt3/qdesktopwidget.h
+usr/include/qt3/qdial.h
+usr/include/qt3/qdialog.h
+usr/include/qt3/qdict.h
+usr/include/qt3/qdir.h
+usr/include/qt3/qdns.h
+usr/include/qt3/qdockarea.h
+usr/include/qt3/qdockwindow.h
+usr/include/qt3/qdom.h
+usr/include/qt3/qdragobject.h
+usr/include/qt3/qdrawutil.h
+usr/include/qt3/qdropsite.h
+usr/include/qt3/qeditorfactory.h
+usr/include/qt3/qerrormessage.h
+usr/include/qt3/qeucjpcodec.h
+usr/include/qt3/qeuckrcodec.h
+usr/include/qt3/qevent.h
+usr/include/qt3/qeventloop.h
+usr/include/qt3/qfeatures.h
+usr/include/qt3/qfile.h
+usr/include/qt3/qfiledialog.h
+usr/include/qt3/qfileinfo.h
+usr/include/qt3/qfocusdata.h
+usr/include/qt3/qfont.h
+usr/include/qt3/qfontdatabase.h
+usr/include/qt3/qfontdialog.h
+usr/include/qt3/qfontinfo.h
+usr/include/qt3/qfontmetrics.h
+usr/include/qt3/qframe.h
+usr/include/qt3/qftp.h
+usr/include/qt3/qgarray.h
+usr/include/qt3/qgb18030codec.h
+usr/include/qt3/qgbkcodec.h
+usr/include/qt3/qgcache.h
+usr/include/qt3/qgdict.h
+usr/include/qt3/qgeneric.h
+usr/include/qt3/qgif.h
+usr/include/qt3/qglist.h
+usr/include/qt3/qglobal.h
+usr/include/qt3/qgplugin.h
+usr/include/qt3/qgrid.h
+usr/include/qt3/qgridview.h
+usr/include/qt3/qgroupbox.h
+usr/include/qt3/qguardedptr.h
+usr/include/qt3/qgvector.h
+usr/include/qt3/qhbox.h
+usr/include/qt3/qhbuttongroup.h
+usr/include/qt3/qheader.h
+usr/include/qt3/qhgroupbox.h
+usr/include/qt3/qhostaddress.h
+usr/include/qt3/qhttp.h
+usr/include/qt3/qiconset.h
+usr/include/qt3/qiconview.h
+usr/include/qt3/qimage.h
+usr/include/qt3/qimageformatplugin.h
+usr/include/qt3/qinputdialog.h
+usr/include/qt3/qintcache.h
+usr/include/qt3/qintdict.h
+usr/include/qt3/qinterlacestyle.h
+usr/include/qt3/qiodevice.h
+usr/include/qt3/qjiscodec.h
+usr/include/qt3/qjpegio.h
+usr/include/qt3/qjpunicode.h
+usr/include/qt3/qkeycode.h
+usr/include/qt3/qkeysequence.h
+usr/include/qt3/qlabel.h
+usr/include/qt3/qlayout.h
+usr/include/qt3/qlcdnumber.h
+usr/include/qt3/qlibrary.h
+usr/include/qt3/qlineedit.h
+usr/include/qt3/qlistbox.h
+usr/include/qt3/qlistview.h
+usr/include/qt3/qlocale.h
+usr/include/qt3/qlocalfs.h
+usr/include/qt3/qmainwindow.h
+usr/include/qt3/qmap.h
+usr/include/qt3/qmemarray.h
+usr/include/qt3/qmenubar.h
+usr/include/qt3/qmenudata.h
+usr/include/qt3/qmessagebox.h
+usr/include/qt3/qmetaobject.h
+usr/include/qt3/qmime.h
+usr/include/qt3/qmngio.h
+usr/include/qt3/qmotifstyle.h
+usr/include/qt3/qmotifplusstyle.h
+usr/include/qt3/qmovie.h
+usr/include/qt3/qmultilineedit.h
+usr/include/qt3/qmutex.h
+usr/include/qt3/qnamespace.h
+usr/include/qt3/qnetwork.h
+usr/include/qt3/qnetworkprotocol.h
+usr/include/qt3/qnp.h
+usr/include/qt3/qobject.h
+usr/include/qt3/qobjectcleanuphandler.h
+usr/include/qt3/qobjectdefs.h
+usr/include/qt3/qobjectdict.h
+usr/include/qt3/qobjectlist.h
+usr/include/qt3/qpaintdevice.h
+usr/include/qt3/qpaintdevicedefs.h
+usr/include/qt3/qpaintdevicemetrics.h
+usr/include/qt3/qpainter.h
+usr/include/qt3/qpair.h
+usr/include/qt3/qpalette.h
+usr/include/qt3/qpen.h
+usr/include/qt3/qpicture.h
+usr/include/qt3/qpixmap.h
+usr/include/qt3/qpixmapcache.h
+usr/include/qt3/qplatinumstyle.h
+usr/include/qt3/qpngio.h
+usr/include/qt3/qpoint.h
+usr/include/qt3/qpointarray.h
+usr/include/qt3/qpolygonscanner.h
+usr/include/qt3/qpopupmenu.h
+usr/include/qt3/qprintdialog.h
+usr/include/qt3/qprinter.h
+usr/include/qt3/qprocess.h
+usr/include/qt3/qprogressbar.h
+usr/include/qt3/qprogressdialog.h
+usr/include/qt3/qptrcollection.h
+usr/include/qt3/qptrdict.h
+usr/include/qt3/qptrlist.h
+usr/include/qt3/qptrqueue.h
+usr/include/qt3/qptrstack.h
+usr/include/qt3/qptrvector.h
+usr/include/qt3/qpushbutton.h
+usr/include/qt3/qradiobutton.h
+usr/include/qt3/qrangecontrol.h
+usr/include/qt3/qrect.h
+usr/include/qt3/qregexp.h
+usr/include/qt3/qregion.h
+usr/include/qt3/qrtlcodec.h
+usr/include/qt3/qscrollbar.h
+usr/include/qt3/qscrollview.h
+usr/include/qt3/qsemaphore.h
+usr/include/qt3/qsemimodal.h
+usr/include/qt3/qserversocket.h
+usr/include/qt3/qsession.h
+usr/include/qt3/qsessionmanager.h
+usr/include/qt3/qsettings.h
+usr/include/qt3/qsgistyle.h
+usr/include/qt3/qshared.h
+usr/include/qt3/qsignal.h
+usr/include/qt3/qsignalmapper.h
+usr/include/qt3/qsignalslotimp.h
+usr/include/qt3/qsimplerichtext.h
+usr/include/qt3/qsize.h
+usr/include/qt3/qsizegrip.h
+usr/include/qt3/qsizepolicy.h
+usr/include/qt3/qsjiscodec.h
+usr/include/qt3/qslider.h
+usr/include/qt3/qsocket.h
+usr/include/qt3/qsocketdevice.h
+usr/include/qt3/qsocketnotifier.h
+usr/include/qt3/qsortedlist.h
+usr/include/qt3/qsound.h
+usr/include/qt3/qspinbox.h
+usr/include/qt3/qsplashscreen.h
+usr/include/qt3/qsplitter.h
+usr/include/qt3/qsql.h
+usr/include/qt3/qsqlcursor.h
+usr/include/qt3/qsqldatabase.h
+usr/include/qt3/qsqldriver.h
+usr/include/qt3/qsqldriverplugin.h
+usr/include/qt3/qsqleditorfactory.h
+usr/include/qt3/qsqlerror.h
+usr/include/qt3/qsqlfield.h
+usr/include/qt3/qsqlform.h
+usr/include/qt3/qsqlindex.h
+usr/include/qt3/qsqlpropertymap.h
+usr/include/qt3/qsqlquery.h
+usr/include/qt3/qsqlrecord.h
+usr/include/qt3/qsqlresult.h
+usr/include/qt3/qsqlselectcursor.h
+usr/include/qt3/qstatusbar.h
+usr/include/qt3/qstring.h
+usr/include/qt3/qstringlist.h
+usr/include/qt3/qstrlist.h
+usr/include/qt3/qstrvec.h
+usr/include/qt3/qstyle.h
+usr/include/qt3/qstylefactory.h
+usr/include/qt3/qstyleplugin.h
+usr/include/qt3/qstylesheet.h
+usr/include/qt3/qsyntaxhighlighter.h
+usr/include/qt3/qt.h
+usr/include/qt3/qtabbar.h
+usr/include/qt3/qtabdialog.h
+usr/include/qt3/qtable.h
+usr/include/qt3/qtabwidget.h
+usr/include/qt3/qtextbrowser.h
+usr/include/qt3/qtextcodec.h
+usr/include/qt3/qtextcodecfactory.h
+usr/include/qt3/qtextcodecplugin.h
+usr/include/qt3/qtextedit.h
+usr/include/qt3/qtextstream.h
+usr/include/qt3/qtextview.h
+usr/include/qt3/qthread.h
+usr/include/qt3/qthreadstorage.h
+usr/include/qt3/qtimer.h
+usr/include/qt3/qtl.h
+usr/include/qt3/qtoolbar.h
+usr/include/qt3/qtoolbox.h
+usr/include/qt3/qtoolbutton.h
+usr/include/qt3/qtooltip.h
+usr/include/qt3/qtranslator.h
+usr/include/qt3/qtsciicodec.h
+usr/include/qt3/qurl.h
+usr/include/qt3/qurlinfo.h
+usr/include/qt3/qurloperator.h
+usr/include/qt3/qutfcodec.h
+usr/include/qt3/quuid.h
+usr/include/qt3/qvalidator.h
+usr/include/qt3/qvaluelist.h
+usr/include/qt3/qvaluestack.h
+usr/include/qt3/qvaluevector.h
+usr/include/qt3/qvariant.h
+usr/include/qt3/qvbox.h
+usr/include/qt3/qvbuttongroup.h
+usr/include/qt3/qvfbhdr.h
+usr/include/qt3/qvgroupbox.h
+usr/include/qt3/qwaitcondition.h
+usr/include/qt3/qwhatsthis.h
+usr/include/qt3/qwidget.h
+usr/include/qt3/qwidgetintdict.h
+usr/include/qt3/qwidgetlist.h
+usr/include/qt3/qwidgetplugin.h
+usr/include/qt3/qwidgetstack.h
+usr/include/qt3/qwindowdefs.h
+usr/include/qt3/qwindowsstyle.h
+usr/include/qt3/qwinexport.h
+usr/include/qt3/qwizard.h
+usr/include/qt3/qwmatrix.h
+usr/include/qt3/qworkspace.h
+usr/include/qt3/qxml.h

Added: people/chrsmrtn/qt-x11-free/debian/libqt3-i18n.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-i18n.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-i18n.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,8 @@
+usr/share/qt3/translations/qt_ar.qm
+usr/share/qt3/translations/qt_cs.qm
+usr/share/qt3/translations/qt_de.qm
+usr/share/qt3/translations/qt_es.qm
+usr/share/qt3/translations/qt_fr.qm
+usr/share/qt3/translations/qt_he.qm
+usr/share/qt3/translations/qt_ru.qm
+usr/share/qt3/translations/qt_sk.qm

Added: people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.docs
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.docs	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.docs	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,2 @@
+README
+PLATFORMS

Added: people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,9 @@
+usr/lib/libqt-mt.la
+usr/lib/libqt-mt.prl
+usr/lib/libqt-mt.so
+usr/lib/libqui.prl
+usr/lib/libqui.so
+usr/lib/pkgconfig/qt-mt.pc
+usr/include/qt3/qgl.h
+usr/include/qt3/qglcolormap.h
+usr/include/qt3/qwidgetfactory.h

Added: people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.links
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.links	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.links	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,6 @@
+/usr/lib/libqui.prl /usr/share/qt3/lib/libqui.prl
+/usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so
+/usr/lib/libqt-mt.prl /usr/share/qt3/lib/libqt-mt.prl
+/usr/lib/libqt-mt.so.3.3.4 /usr/share/qt3/lib/libqt-mt.so
+/usr/include/qt3 /usr/share/qt3/include
+/usr/lib/qt3/plugins /usr/share/qt3/plugins

Added: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-ibase.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-ibase.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-ibase.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1 @@
+usr/lib/qt3/plugins/sqldrivers/libqsqlibase.so

Added: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-mysql.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-mysql.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-mysql.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1 @@
+usr/lib/qt3/plugins/sqldrivers/libqsqlmysql.so

Added: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-odbc.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-odbc.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-odbc.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1 @@
+usr/lib/qt3/plugins/sqldrivers/libqsqlodbc.so

Added: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-psql.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-psql.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-psql.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1 @@
+usr/lib/qt3/plugins/sqldrivers/libqsqlpsql.so

Added: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-sqlite.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-sqlite.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-sqlite.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1 @@
+usr/lib/qt3/plugins/sqldrivers/libqsqlite.so

Added: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,2 @@
+usr/lib/libqt-mt.so.*
+usr/lib/libqui.so.1.*

Added: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.links
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.links	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.links	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,5 @@
+/usr/lib/libqui.so.1.0.0 /usr/lib/libqui.so.1 
+/usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1
+/usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1.0
+/usr/lib/libqt-mt.so.3.3.4 /usr/share/qt3/lib/libqt-mt.so.3
+/usr/lib/libqt-mt.so.3.3.4 /usr/share/qt3/lib/libqt-mt.so.3.3

Added: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.postrm
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.postrm	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.postrm	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "purge" ]; then
+  if [ -d "/usr/share/doc/libqt3c102-mt/" ]; then
+    rm -rf /usr/share/doc/libqt3c102-mt/
+  fi
+fi
+
+#DEBHELPER#

Added: people/chrsmrtn/qt-x11-free/debian/maintain/assistant.desktop
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/assistant.desktop	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/assistant.desktop	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Exec=assistant
+Name=Qt Assistant
+Name[de]=Qt Assistent
+Comment=Qt Helpcenter
+Comment[de]= Qt Hilfezentrum
+MapNotify=true
+MimeType=application/x-assistant
+Icon=assistant
+Terminal=false
+Type=Application
+Categories=Qt;Core

Added: people/chrsmrtn/qt-x11-free/debian/maintain/build-examples.sh
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/build-examples.sh	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/build-examples.sh	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+BUILDDIR=$PWD
+export QTDIR=/usr/share/qt3
+
+# first copy over the libqt-mt.so build configuration of .qmake.cache
+cp /usr/share/qt3/.qmake.cache ./.qmake.cache
+
+# Now compile the examples. The themes example
+# won't work since qconfig.h is not really correct with the
+# ifdef's for the QT_NO_xyz_STYLE, so we use make -k to continue
+cd examples; qmake -o Makefile examples.pro; make -k
+
+# Now compile the tutorial.
+cd $BUILDDIR/tutorial; qmake -o Makefile tutorial.pro; make
+
+# Then the designer examples. 
+cd $BUILDDIR/tools/designer/examples
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+        cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# There is a bigger sql example in book/ with more subdirectories:
+cd book
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+        cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# Finally, build the linguist tutorials:
+cd $BUILDDIR/tools/linguist/tutorial
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do 
+	cd $a && qmake -o Makefile $a.pro; make; cd ..; 
+done
+
+# Return to the build directory
+cd $BUILDDIR 

Added: people/chrsmrtn/qt-x11-free/debian/maintain/designer-qt3.desktop
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/designer-qt3.desktop	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/designer-qt3.desktop	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,76 @@
+[Desktop Entry]
+Exec=designer-qt3
+Name=Qt Designer
+Name[bg]=Qt Дизайнер
+Name[br]=Ergrafer Qt
+Name[ca]=Dissenyador Qt
+Name[cs]=Qt designer
+Name[de]=Qt-Designer
+Name[eo]=Qt-Desegnilo
+Name[es]=Diseñador Qt
+Name[et]=Qt disainer
+Name[eu]=Qt Diseinatzailea
+Name[gl]=Deseñador de Qt
+Name[he]=Qt בצעמ
+Name[it]=Designer Qt
+Name[ja]=Qtデザイナー
+Name[ko]=Qt ë””ìžì´ë„ˆ
+Name[lv]=Qt Dizainers
+Name[mk]=Qt дизајнер
+Name[no]=Qt-designer
+Name[oc]=Dessinador Qt
+Name[pl]=Projektant Qt
+Name[sk]=Qt Dizajnér
+Name[sl]=Snovalnik Qt
+Name[ta]=Qt À¨¼ôÀ¡Ç÷
+Name[uk]=Дизайнер Qt
+Name[zh_CN.GB2312]=Qt 设计者
+Name[zh_TW.Big5]=Qt 設計器
+Comment=Qt interface designer
+Comment[az]=Qt axtar üz dizayn proqramı
+Comment[bg]=Qt interface дизайнер
+Comment[br]=Ergrafer etrefas Qt
+Comment[ca]=Dissenyador d'interfícies Qt
+Comment[cs]=Editor UI pro Qt
+Comment[da]=Qt grænseflade designer
+Comment[de]=Schnittstellen-Designer für Qt
+Comment[el]=Σχεδιασμός πεÏιβάλλοντων Qt
+Comment[eo]=Qt-Interfacdesegnilo
+Comment[es]=Diseñador de interfaces de Qt
+Comment[et]=Qt dialoogide redaktor
+Comment[eu]=Qt interfaze diseinatzailea
+Comment[fi]=Qt:n käyttöliittymäsuunnittelija
+Comment[fr]=Conception d'interfaces avec Qt
+Comment[gl]=Editor de interfaces de Qt
+Comment[he]=Qt-ל ×יקשממ בצעמ
+Comment[hu]=Qt felülettervező
+Comment[is]=Viðmótshönnunartól fyrir Qt
+Comment[it]=Editor per le interfaccie Qt
+Comment[ja]=Qtインターフェースデザイナー
+Comment[ko]=Qt ì¸í„°íŽ˜ì´ìŠ¤ ë””ìžì´ë„ˆ
+Comment[lt]=Qt sÄ…sajos redaktorius
+Comment[lv]=Qt starsejas dizainers
+Comment[mk]=Дизајнер на Qt дијалози
+Comment[nl]=Qt interface-ontwerper
+Comment[no]=Qt-grensesnittdesigner
+Comment[no_NY]=Redigering av Qt-miljø
+Comment[oc]=Dessinador d'interfacies Qt
+Comment[pl]=Projektant interfejsu Qt
+Comment[pt]=Editor de interfaces do Qt
+Comment[pt_BR]=Designer de interface Qt
+Comment[ro]=Dezvoltator de interfeţe Qt
+Comment[ru]=редактор интерфейÑов приложений Qt
+Comment[sk]=Qt dizajnér rozhrania
+Comment[sl]=Snovalnik vmesnikov za Qt
+Comment[sr]=Dizajner Qt interfejsa
+Comment[sv]=Editor för gränssnitt till Qt
+Comment[ta]=Qt À¨¼ôÀ¡Ç÷
+Comment[tr]=Qt arayüz tasarım programı
+Comment[uk]=Редактор інтерфейÑу Ð´Ð»Ñ Qt
+Comment[zh_CN.GB2312]=Qt ç•Œé¢è®¾è®¡ç¨‹åº
+Comment[zh_TW.Big5]=Qt 介é¢ç·¨è¼¯å™¨
+MapNotify=true
+MimeType=application/x-designer
+Icon=designer
+Terminal=false
+Type=Application

Added: people/chrsmrtn/qt-x11-free/debian/maintain/linguist.desktop
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/linguist.desktop	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/linguist.desktop	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,26 @@
+[Desktop Entry]
+Exec=linguist
+Name=Qt Linguist
+Name[de]=Qt-Linguist
+Name[eo]=Qt-Lingvisto
+Name[es]=Lingüista Qt
+Name[ko]=Qt 언어학ìž
+Name[lv]=Qt Lingvists
+Comment=Tool for translating message catalogues of Qt based programs
+Comment[da]=Redskab til at oversætte Qt baserede programmer
+Comment[de]=Dienstprogramm zur Ãœbersetzung von Programmen, die auf Qt basieren
+Comment[eo]=Ilo por tradukado de mesaÄaroj de Qt-bazitaj programoj
+Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en Qt
+Comment[he]=Qt תוססובמ תוינכות לש תועדוה יגולטק ×וגרתל ילכ
+Comment[hu]=Segédprogram a Qt-alapú programok üzenetfájljainak lefordításához
+Comment[ko]=Qt를 바탕으로 하는 프로그램ì—ì„œ 쓸 ë²ˆì—­ëœ ë©”ì„¸ì§€ 목ë¡ì„ 관리하는 ë„구
+Comment[lv]=RÄ«ks ziņojumu katalogu tulkoÅ¡anai uz Qt bÄzÄ“tÄs programmÄs
+Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt
+Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt
+Comment[sv]=Verktyg för att översätta meddelandekataloger från Qt-baserade program
+MapNotify=true
+MimeType=application/x-linguist
+Terminal=false
+Icon=linguist
+Type=Application
+Categories=Qt;Development

Added: people/chrsmrtn/qt-x11-free/debian/maintain/man/createcw.1
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/man/createcw.1	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/man/createcw.1	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,114 @@
+.TH "createcw" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+createcw \- custom widget description creater for Qt Designer
+.SH "SYNTAX"
+.LP 
+createcw <\fIfilename.cw\fP>
+.SH "DESCRIPTION"
+.LP 
+This small application makes it much easier to create
+custom widget descriptions for the Qt Designer. Using
+them you can use custom widgets in the Qt Designer
+including their signals, slots and properties.
+ 
+To do that normally you would have to enter all that
+information in the custom widget dialog in the Qt
+Designer for each widget. But this small tool can create
+for you these description files for your custom widgets
+which you then can simply import into the Qt Designer. So
+you can use your custom widgets without any additional
+work in your forms in the Qt Designer then.
+
+To do that you have to modify the sourcecode (main.cpp) a
+bit and recompile it afterwards. 
+
+STEP1: Include header files of the widgets for which a
+description should be created here. If you have a widget
+which is defined in the file mycustomwidget.h in
+/home/joedeveloper/src, write here 
+
+#include "/home/joedeveloper/src/mycustomwidget.h"
+
+STEP2: Instantiate all widgets for which a description
+should be created here and add them to the list wl. If
+your custom widget is e.g. called MyCustomWidget you
+would write here
+
+ Widget w;
+ w.w = new MyCustomWidget( 0, 0 );
+ w.include = "mycustomwidget.h";
+ w.location = "global";
+ wl.append( w );
+
+After that compile the program, link it with your custom
+widget (library or object file) and run it like this:
+
+ (unix): ./createcw mywidgets.cw
+ (win32): createcw mywidgets.cw
+
+After that you can import this description file into the
+Qt Designer using the Custom\-Widget Dialog (See
+Tools\->Custom\->Edit Custom Widgets... in the Qt Designer)
+and use these custom widget there in your forms.
+
+.SH "AUTHORS"
+.LP 
+Troll Tech <http://www.trolltech.com/>
+.TH "createcw" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+createcw \- custom widget description creater for Qt Designer
+.SH "SYNTAX"
+.LP 
+createcw <\fIfilename.cw\fP>
+.SH "DESCRIPTION"
+.LP 
+This small application makes it much easier to create
+custom widget descriptions for the Qt Designer. Using
+them you can use custom widgets in the Qt Designer
+including their signals, slots and properties.
+ 
+To do that normally you would have to enter all that
+information in the custom widget dialog in the Qt
+Designer for each widget. But this small tool can create
+for you these description files for your custom widgets
+which you then can simply import into the Qt Designer. So
+you can use your custom widgets without any additional
+work in your forms in the Qt Designer then.
+
+To do that you have to modify the sourcecode (main.cpp) a
+bit and recompile it afterwards. 
+
+STEP1: Include header files of the widgets for which a
+description should be created here. If you have a widget
+which is defined in the file mycustomwidget.h in
+/home/joedeveloper/src, write here 
+
+#include "/home/joedeveloper/src/mycustomwidget.h"
+
+STEP2: Instantiate all widgets for which a description
+should be created here and add them to the list wl. If
+your custom widget is e.g. called MyCustomWidget you
+would write here
+
+ Widget w;
+ w.w = new MyCustomWidget( 0, 0 );
+ w.include = "mycustomwidget.h";
+ w.location = "global";
+ wl.append( w );
+
+After that compile the program, link it with your custom
+widget (library or object file) and run it like this:
+
+ (unix): ./createcw mywidgets.cw
+ (win32): createcw mywidgets.cw
+
+After that you can import this description file into the
+Qt Designer using the Custom\-Widget Dialog (See
+Tools\->Custom\->Edit Custom Widgets... in the Qt Designer)
+and use these custom widget there in your forms.
+
+.SH "AUTHORS"
+.LP 
+Troll Tech <http://www.trolltech.com/>

Added: people/chrsmrtn/qt-x11-free/debian/maintain/man/designer.1
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/man/designer.1	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/man/designer.1	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,108 @@
+.TH "qt-designer" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qt\-designer \- Visual user interface designer for Qt.
+.SH "DESCRIPTION"
+.LP 
+Qt Designer simplifies the process of designing and
+creating graphical user interfaces (GUI) using the
+award\-winning Qt toolkit. Qt Designer is easy to learn.
+There are tutorials, walkthrough examples and the
+reference documentation accelerating you through the
+learning phase. After that, Qt Designer greatly reduces
+the time and effort needed to develop even the most
+complex dialogs with an easy\-to\-use GUI and an integrated
+help system.
+
+ Qt Designer provides a rich set of features aimed at
+making the creation of dialogs as easy and smooth as
+possible without reducing the power of Qt. It offers all
+the strength of the Qt layout system with a well\-designed
+user interface. This, combined with the Qt Designer's
+undo/redo system makes it simple to try different
+arrangements of the widgets until the result satisfies
+you.
+
+ Using Qt Designer's convenient property editor along
+with the dynamic Qt property system it is easy to set the
+initial state of your widgets. Special editors for some
+widgets (like listboxes, comboboxes, etc.) allow you to
+fill these widgets with content without writing any code.
+Using the object hierarchy view, the parent\-child
+relationship between the widgets of a dialog can be
+understood at a glance.
+
+ Integrating dialogs into a Qt project is straightforward
+thanks to the User Interface Compiler (UIC), which
+generates C++ code from the XML dialog description on the
+fly. The programmer can easily extend the functionality
+of the generated classes by subclassing without touching
+generated code at all or running the risk of loosing
+their changes.
+.SH "FILES"
+.LP 
+\fI/usr/share/qt/tools/designer/*\fP 
+.SH "ENVIRONMENT VARIABLES"
+.LP 
+.TP 
+\fBQTDIR\fP
+Specifies the Qt base directory.  On Debian systems this
+should be set to /usr/share/qt.  The /usr/bin/designer
+wrapper script takes care of this.
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
+.TH "qt-designer" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qt\-designer \- Visual user interface designer for Qt.
+.SH "DESCRIPTION"
+.LP 
+Qt Designer simplifies the process of designing and
+creating graphical user interfaces (GUI) using the
+award\-winning Qt toolkit. Qt Designer is easy to learn.
+There are tutorials, walkthrough examples and the
+reference documentation accelerating you through the
+learning phase. After that, Qt Designer greatly reduces
+the time and effort needed to develop even the most
+complex dialogs with an easy\-to\-use GUI and an integrated
+help system.
+
+ Qt Designer provides a rich set of features aimed at
+making the creation of dialogs as easy and smooth as
+possible without reducing the power of Qt. It offers all
+the strength of the Qt layout system with a well\-designed
+user interface. This, combined with the Qt Designer's
+undo/redo system makes it simple to try different
+arrangements of the widgets until the result satisfies
+you.
+
+ Using Qt Designer's convenient property editor along
+with the dynamic Qt property system it is easy to set the
+initial state of your widgets. Special editors for some
+widgets (like listboxes, comboboxes, etc.) allow you to
+fill these widgets with content without writing any code.
+Using the object hierarchy view, the parent\-child
+relationship between the widgets of a dialog can be
+understood at a glance.
+
+ Integrating dialogs into a Qt project is straightforward
+thanks to the User Interface Compiler (UIC), which
+generates C++ code from the XML dialog description on the
+fly. The programmer can easily extend the functionality
+of the generated classes by subclassing without touching
+generated code at all or running the risk of loosing
+their changes.
+.SH "FILES"
+.LP 
+\fI/usr/share/qt/tools/designer/*\fP 
+.SH "ENVIRONMENT VARIABLES"
+.LP 
+.TP 
+\fBQTDIR\fP
+Specifies the Qt base directory.  On Debian systems this
+should be set to /usr/share/qt.  The /usr/bin/designer
+wrapper script takes care of this.
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>

Added: people/chrsmrtn/qt-x11-free/debian/maintain/man/findtr.1
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/man/findtr.1	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/man/findtr.1	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,50 @@
+.TH "findtr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+findtr \- Extracts information about text to be translated
+.SH "SYNTAX"
+.LP 
+findtr *.cpp *.h >myapp.po
+.SH "DESCRIPTION"
+.LP 
+
+Extracts information about text to be translated. It
+recognizes the tr() constructs described above and
+produces a file in ".po" format, a simple text format
+that your translation team will copy and edit. For
+example, the base .po file might be myapp.po and
+translated versions of the file would then be
+myapp_de.po, myapp_fr.po, and myapp_ja.po for
+translations in German, French and Japanese respectively.
+
+  findtr *.cpp *.h >myapp.po
+  copy myapp.po myapp_de.po
+  edit myapp_de.po
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
+.TH "findtr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+findtr \- Extracts information about text to be translated
+.SH "SYNTAX"
+.LP 
+findtr *.cpp *.h >myapp.po
+.SH "DESCRIPTION"
+.LP 
+
+Extracts information about text to be translated. It
+recognizes the tr() constructs described above and
+produces a file in ".po" format, a simple text format
+that your translation team will copy and edit. For
+example, the base .po file might be myapp.po and
+translated versions of the file would then be
+myapp_de.po, myapp_fr.po, and myapp_ja.po for
+translations in German, French and Japanese respectively.
+
+  findtr *.cpp *.h >myapp.po
+  copy myapp.po myapp_de.po
+  edit myapp_de.po
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>

Added: people/chrsmrtn/qt-x11-free/debian/maintain/man/linguist.1
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/man/linguist.1	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/man/linguist.1	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,37 @@
+.TH LINGUIST 1 "28 August 2004"
+.SH "NAME"
+linguist \- Translation tool for Qt.
+
+.SH "SYNPOSIS"
+.B linguist
+[
+.I TRANSLATION
+]
+
+.SH "DESCRIPTION"
+.B Qt Linguist
+is a tool for adding translations to Qt applications. It
+introduces the concept of a translation "context" which
+means a group of phrases that appear together on the
+screen e.g. in the same menu or dialog.
+
+The only parameter accepted on the command line is 
+.I TRANSLATION
+wich is the name of the translation file you wish to open.
+
+.SH FILES
+.I ~/.qt/qt_designerrc
+.RS
+Per user configuration file.
+
+.SH SEE ALSO
+.B Qt Linguist
+is too complex to be described completely in the "man" page
+format. If your system is properly configured, you can access
+the full documentation within
+.B Qt Linguist
+under the Help menu.
+
+.SH AUTHOR
+This manual page was written by Jeremy Lainé <jeremy.laine@m4x.org>,
+for the Debian GNU/Linux system (but may be used by others).

Added: people/chrsmrtn/qt-x11-free/debian/maintain/man/makeqpf.1
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/man/makeqpf.1	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/man/makeqpf.1	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,52 @@
+.TH "makeqpf" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+makeqpf \- Create qpf files from TTF and BDF files.
+.SH "DESCRIPTION"
+.LP 
+Qt Prerendered Font (QPF) is a light\-weight non\-scalable
+font format specific to Qt/Embedded.  makeqpf is a tool
+that assists producing QPF files from TTF and BDF files.
+
+
+.SH "SYNTAX"
+qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]>
+.br 
+
+general\-files 
+  These files can be any type of file. 
+\-\-images image\-files 
+  These files must be in image formats supported by Qt. 
+
+.SH "FILES"
+.LP 
+\fI$(QTDIR)/etc/fonts/fontdir\fP 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
+.TH "makeqpf" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+makeqpf \- Create qpf files from TTF and BDF files.
+.SH "DESCRIPTION"
+.LP 
+Qt Prerendered Font (QPF) is a light\-weight non\-scalable
+font format specific to Qt/Embedded.  makeqpf is a tool
+that assists producing QPF files from TTF and BDF files.
+
+
+.SH "SYNTAX"
+qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]>
+.br 
+
+general\-files 
+  These files can be any type of file. 
+\-\-images image\-files 
+  These files must be in image formats supported by Qt. 
+
+.SH "FILES"
+.LP 
+\fI$(QTDIR)/etc/fonts/fontdir\fP 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>

Added: people/chrsmrtn/qt-x11-free/debian/maintain/man/mergetr.1
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/man/mergetr.1	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/man/mergetr.1	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,54 @@
+.TH "mergetr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+mergetr \- Merge changes in translations
+.SH "SYNTAX"
+.LP 
+mergetr myapp_de.po myapp.po
+
+.SH "DESCRIPTION"
+.LP 
+When the texts in your program change as it is developed,
+a the base .po file can be regenerated using findtr,
+then mergetr can be used to merge the changes into the
+other .po files: 
+
+                mergetr myapp_de.po myapp.po
+                mergetr myapp_fr.po myapp.po
+                mergetr myapp_ja.po myapp.po
+
+
+The translation team then edits the new .po files to
+translate the new or changed texts. When texts change,
+the old text is included in the .po file as a comment to
+guide the new translation (no "fuzzy" matching is done).
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
+.TH "mergetr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+mergetr \- Merge changes in translations
+.SH "SYNTAX"
+.LP 
+mergetr myapp_de.po myapp.po
+
+.SH "DESCRIPTION"
+.LP 
+When the texts in your program change as it is developed,
+a the base .po file can be regenerated using findtr,
+then mergetr can be used to merge the changes into the
+other .po files: 
+
+                mergetr myapp_de.po myapp.po
+                mergetr myapp_fr.po myapp.po
+                mergetr myapp_ja.po myapp.po
+
+
+The translation team then edits the new .po files to
+translate the new or changed texts. When texts change,
+the old text is included in the .po file as a comment to
+guide the new translation (no "fuzzy" matching is done).
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>

Added: people/chrsmrtn/qt-x11-free/debian/maintain/man/msg2qm.1
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/man/msg2qm.1	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/man/msg2qm.1	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,52 @@
+.TH "msg2qm" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+msg2qm \- Converts translated .po files to a Qt\-specific binary format.
+.SH "SYNTAX"
+.LP 
+msg2qm myapp_de.po myapp_de.qm
+.SH "DESCRIPTION"
+.LP 
+
+Converts translated .po files to a Qt\-specific binary
+format (".qm" Qt message files). The Qt message files
+are platform and locale independent, containing
+translations in Unicode and various hash tables to
+provide fast look\-up. 
+
+                msg2qm myapp_de.po myapp_de.qm
+                msg2qm myapp_fr.po myapp_fr.qm
+                msg2qm myapp_ja.po myapp_ja.qm
+
+
+In your application, use QTranslator::load() to load
+translation files appropriate for the user's language.
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
+.TH "msg2qm" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+msg2qm \- Converts translated .po files to a Qt\-specific binary format.
+.SH "SYNTAX"
+.LP 
+msg2qm myapp_de.po myapp_de.qm
+.SH "DESCRIPTION"
+.LP 
+
+Converts translated .po files to a Qt\-specific binary
+format (".qm" Qt message files). The Qt message files
+are platform and locale independent, containing
+translations in Unicode and various hash tables to
+provide fast look\-up. 
+
+                msg2qm myapp_de.po myapp_de.qm
+                msg2qm myapp_fr.po myapp_fr.qm
+                msg2qm myapp_ja.po myapp_ja.qm
+
+
+In your application, use QTranslator::load() to load
+translation files appropriate for the user's language.
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>

Added: people/chrsmrtn/qt-x11-free/debian/maintain/man/qembed.1
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/man/qembed.1	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/man/qembed.1	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,64 @@
+.TH "qembed" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qembed \- Converts arbitrary files into C++ code.
+.SH "DESCRIPTION"
+.LP 
+The QEmbed tool, found in qt/tools/qembed, converts
+arbitrary files into C++ code. This is useful for
+including image files and other resources directly into
+your application rather than loading the data from
+external files. 
+
+QEmbed can also generate uncompressed versions of images
+that can be included directly into your application,
+thus avoiding both the external file and the need to
+parse the image file format. This is useful for small
+images such as icons for which compression is not a
+great gain. 
+
+
+.SH "SYNTAX"
+qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]>
+.br 
+
+general\-files 
+  These files can be any type of file. 
+\-\-images image\-files 
+  These files must be in image formats supported by Qt. 
+
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
+.TH "qembed" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qembed \- Converts arbitrary files into C++ code.
+.SH "DESCRIPTION"
+.LP 
+The QEmbed tool, found in qt/tools/qembed, converts
+arbitrary files into C++ code. This is useful for
+including image files and other resources directly into
+your application rather than loading the data from
+external files. 
+
+QEmbed can also generate uncompressed versions of images
+that can be included directly into your application,
+thus avoiding both the external file and the need to
+parse the image file format. This is useful for small
+images such as icons for which compression is not a
+great gain. 
+
+
+.SH "SYNTAX"
+qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]>
+.br 
+
+general\-files 
+  These files can be any type of file. 
+\-\-images image\-files 
+  These files must be in image formats supported by Qt. 
+
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>

Added: people/chrsmrtn/qt-x11-free/debian/maintain/man/qt20fix.1
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/man/qt20fix.1	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/man/qt20fix.1	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,64 @@
+.TH "qt20fix" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qt20fix \- Helps clean namespace when porting an app from Qt1 to Qt2
+.SH "SYNTAX"
+.LP 
+qt20fix myapp.cpp
+
+.SH "DESCRIPTION"
+.LP 
+Qt 2.x is namespace\-clean, unlike 1.x. Qt now uses very
+few global identifiers. Identifiers like red, blue,
+LeftButton, AlignRight, Key_Up, Key_Down, NoBrush etc.
+are now part of a special class Qt (defined in
+qnamespace.h), which is inherited by most Qt classes.
+Member functions of classes that inherit from QWidget,
+etc. are totally unaffected, but code that is not in
+functions of classes inherited from Qt, you must qualify
+these identifiers like this: Qt::red, Qt::LeftButton,
+Qt::AlignRight, etc. 
+
+The qt/bin/qt20fix script helps to fix the code that
+needs adaption, though most code does not need changing.
+
+Compiling with \-DQT1COMPATIBILITY will help you get going
+with Qt 2.x \- it allows all the old "dirty namespace"
+identifiers from Qt 1.x to continue working. Without it,
+you'll get compile errors that can easily be fixed by
+searching this page for the clean identifiers. 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
+.TH "qt20fix" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qt20fix \- Helps clean namespace when porting an app from Qt1 to Qt2
+.SH "SYNTAX"
+.LP 
+qt20fix myapp.cpp
+
+.SH "DESCRIPTION"
+.LP 
+Qt 2.x is namespace\-clean, unlike 1.x. Qt now uses very
+few global identifiers. Identifiers like red, blue,
+LeftButton, AlignRight, Key_Up, Key_Down, NoBrush etc.
+are now part of a special class Qt (defined in
+qnamespace.h), which is inherited by most Qt classes.
+Member functions of classes that inherit from QWidget,
+etc. are totally unaffected, but code that is not in
+functions of classes inherited from Qt, you must qualify
+these identifiers like this: Qt::red, Qt::LeftButton,
+Qt::AlignRight, etc. 
+
+The qt/bin/qt20fix script helps to fix the code that
+needs adaption, though most code does not need changing.
+
+Compiling with \-DQT1COMPATIBILITY will help you get going
+with Qt 2.x \- it allows all the old "dirty namespace"
+identifiers from Qt 1.x to continue working. Without it,
+you'll get compile errors that can easily be fixed by
+searching this page for the clean identifiers. 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>

Added: people/chrsmrtn/qt-x11-free/debian/maintain/man/qtconfig.1
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/man/qtconfig.1	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/man/qtconfig.1	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,34 @@
+.TH "qtconfig" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qtconfig \- Configuration tool for Qt
+.SH "DESCRIPTION"
+.LP 
+QConfig allows for GUI based configuration of Qt and
+ other Qt based sources.
+
+.SH "ENVIRONMENT VARIABLES"
+.LP 
+.TP 
+\fBQTDIR\fP
+Specifies the base Qt dir
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
+.TH "qtconfig" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qtconfig \- Configuration tool for Qt
+.SH "DESCRIPTION"
+.LP 
+QConfig allows for GUI based configuration of Qt and
+ other Qt based sources.
+
+.SH "ENVIRONMENT VARIABLES"
+.LP 
+.TP 
+\fBQTDIR\fP
+Specifies the base Qt dir
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>

Added: people/chrsmrtn/qt-x11-free/debian/maintain/man/qvfb.1
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/man/qvfb.1	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/man/qvfb.1	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,70 @@
+.TH "qvfb" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qvfb \- Virtual framebuffer for Qt
+.SH "DESCRIPTION"
+.LP 
+The virtual framebuffer allows Qt/Embedded programs to be
+developed on your desktop machine, without switching
+between consoles and X11. 
+
+Start a Qt/Embedded master application (i.e., construct
+QApplication with QApplication::GuiServer flag or use the
+\-qws command line parameter). You will need to specify to
+the server that you wish to use the virtual framebuffer
+driver, e.g.: 
+
+    widgets \-qws \-display QVFb:0
+    
+You may prefer to set the QWS_DISPLAY environment
+variable to be QVFb:0. 
+
+qvfb supports the following command line options: 
+
+ \-width width: the width of the virtual framebuffer
+  (default: 240). 
+ \-height height: the height of the virtual framebuffer
+  (default: 320). 
+ \-depth depth: the depth of the virtual framebuffer (1, 8
+  or 32; default: 8). 
+ \-nocursor: do not display the X11 cursor in the
+  framebuffer window. 
+ \-qwsdisplay :id the Qt/Embedded display id to provide
+  (default: 0). 
+
+ Virtual Framebuffer Design 
+
+The virtual framebuffer emulates a framebuffer using a
+shared memory region (the virtual frame buffer) and a
+utility to display the framebuffer in a window (qvfb).
+The regions of the display that have changed are updated
+periodically, so you will see discrete snapshots of the
+framebuffer rather than each individual drawing
+operation. For this reason drawing problems such as
+flickering may not be apparent until the program is run
+using a real framebuffer. 
+
+The target refresh rate can be set via the "View|Refresh
+Rate" menu item. This will cause qvfb to check for
+updated regions more quickly. The rate is a target only.
+If little drawing is being done, the framebuffer will not
+show any updates between drawing events. If an
+application is displaying an animation the updates will
+be frequent, and the application and qvfb will compete
+for processor time. 
+
+Mouse and keyboard events are passed to the Qt/Embedded
+master process via named pipes. 
+
+The virtual framebuffer is a development tool only. No
+security issues have been considered in the virtual
+framebuffer design. It should be avoided in a production
+environment; QT_NO_QWS_VFB should always be defined in
+production libraries. 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
+.TH "qvfb" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qvfb \- Virtual framebuffer for Qt

Added: people/chrsmrtn/qt-x11-free/debian/maintain/mkpatch.sh
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/mkpatch.sh	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/mkpatch.sh	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+diff -Nru -x Makefile.cvs -x README.qt-copy -x upgrade_script.qt -x .cvsignore -x CVS -x include -x debian -x doc -x examples  -x 3rdparty -x images -x mkspecs -I '^\*\*\( $\| \$Id\)' -I '^\#\( $\| \$Id\)' qt-x11-free-3.1.1.old/ qt-x11-free-3.1.1/ > qtcopy.diff

Added: people/chrsmrtn/qt-x11-free/debian/maintain/qtconfig.desktop
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/maintain/qtconfig.desktop	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/maintain/qtconfig.desktop	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Exec=qtconfig
+Name=Qt Configuration 
+Name[de]=Qt Konfiguration
+Comment=A graphical configuration tool for programs using Qt 
+Comment[de]=Ein grafisches Konfigurationstool für Qt-Programme
+MapNotify=true
+MimeType=application/x-qtconfig
+Terminal=false
+Icon=qtconfig
+Type=Application
+Categories=Qt;Settings

Added: people/chrsmrtn/qt-x11-free/debian/patches/00list
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/00list	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/00list	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,20 @@
+02_various_fixes.dpatch
+03_qt_fontlist_fix.dpatch
+04_qsql_odbc.dpatch
+05_qvfb_cpp.dpatch
+06_disable_rpath.dpatch
+08_thread_default.dpatch
+09_amd64_lib64.dpatch
+14_fix_kmenu.dpatch
+15_unify_declarations_glibc.dpatch
+16_fix_opengl_check.dpatch
+18_fix_makeqpf_qembed.dpatch
+22_fix_ftbfs_amd64.dpatch
+23_qtc_qclipboard_hack.dpatch
+24_qtc_qscrollview.dpatch
+25_qtc_qpixmap_mitshm.dpatch
+26_qtc_qpixmap_constants.dpatch
+27_qtc_qscrollview-windowactivate-fix.dpatch
+28_qtc_png-gamma-fix.dpatch
+30_gcc4_build.dpatch
+31_gcc4_buildkey.dpatch

Added: people/chrsmrtn/qt-x11-free/debian/patches/00list.mips
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/00list.mips	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/00list.mips	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1 @@
+21_fix_mips_mipsel

Added: people/chrsmrtn/qt-x11-free/debian/patches/00list.mipsel
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/00list.mipsel	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/00list.mipsel	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1 @@
+21_fix_mips_mipsel

Added: people/chrsmrtn/qt-x11-free/debian/patches/02_various_fixes.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/02_various_fixes.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/02_various_fixes.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,120 @@
+#! /bin/sh -e
+## 02_various_fixes.dpatch by Martin Loschwitz <madkiss@madkiss.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes various smaller mistakes
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- qt-x11-free-3.2.3.old/tools/designer/integration/designer.el	2003-10-03 13:32:02.000000000 +0200
++++ qt-x11-free-3.2.3/tools/designer/integration/designer.el	2003-12-19 13:28:14.000000000 +0100
+@@ -1,9 +1,9 @@
+-(defvar designer-exec (concat (getenv "QTDIR") "/bin/designer"))
++(defvar designer-exec "/usr/bin/designer")
+ 
+ (defun designer-open-ui-file ()
+   (interactive)
+   (defvar procname "designer")
+-  (start-process procname nil designer-exec "-style" "windows" "-client" buffer-file-name)
++  (start-process procname nil designer-exec "-client" buffer-file-name)
+ )
+ 
+ (defun designer-create-ui-file (&optional arg)
+diff -ruN qt-x11-free-3.2.3.old/tools/tools.pro qt-x11-free-3.2.3/tools/tools.pro
+--- qt-x11-free-3.2.3.old/tools/tools.pro	2003-09-24 13:32:33.000000000 +0200
++++ qt-x11-free-3.2.3/tools/tools.pro	2003-12-19 13:26:58.000000000 +0100
+@@ -6,7 +6,12 @@
+ 		      designer \
+ 		      assistant \
+ 		      linguist
+-    unix:SUBDIRS	+= qtconfig
++    unix:SUBDIRS	+= qtconfig \
++    			mergetr \
++			qconfig \
++			makeqpf \
++			msg2qm \
++			qembed
+ }
+ 
+ CONFIG+=ordered
+diff -ruN qt-x11-free-3.3.2.old/tools/designer/designer.pro qt-x11-free-3.3.2/tools/designer/designer.pro
+--- qt-x11-free-3.3.2.old/tools/designer/designer.pro	2003-10-31 15:36:28.000000000 +0100
++++ qt-x11-free-3.3.2/tools/designer/designer.pro	2004-05-14 16:08:10.000000000 +0200
+@@ -5,7 +5,9 @@
+ SUBDIRS	=  uic \
+ 	   uilib \
+ 	   designer \
+-	   app
++	   app \
++	   tools/createcw \
++	   tools/conv2ui
+ 
+ dll:SUBDIRS *=  editor plugins
+ shared:SUBDIRS *=  editor plugins
+diff -ruN qt-x11-free-3.3.3.old/tools/designer/tools/createcw/createcw.pro qt-x11-free-3.3.3/tools/designer/tools/createcw/createcw.pro
+--- qt-x11-free-3.3.3.old/tools/designer/tools/createcw/createcw.pro	2003-10-31 14:36:28.000000000 +0000
++++ qt-x11-free-3.3.3/tools/designer/tools/createcw/createcw.pro	2004-08-13 23:19:54.000000000 +0000
+@@ -3,3 +3,6 @@
+ HEADERS		=
+ SOURCES		= main.cpp
+ TARGET		= createcw
++
++target.path = $$bins.path
++INSTALLS += target
+diff -ruN qt-x11-free-3.3.3.old/tools/makeqpf/makeqpf.pro qt-x11-free-3.3.3/tools/makeqpf/makeqpf.pro
+--- qt-x11-free-3.3.3.old/tools/makeqpf/makeqpf.pro	2004-06-08 08:07:19.000000000 +0000
++++ qt-x11-free-3.3.3/tools/makeqpf/makeqpf.pro	2004-08-13 23:20:33.000000000 +0000
+@@ -5,3 +5,6 @@
+ INTERFACES	=
+ TARGET		= makeqpf
+ REQUIRES=full-config nocrosscompiler
++
++target.path = $$bins.path
++INSTALLS += target
+diff -ruN qt-x11-free-3.3.3.old/tools/mergetr/mergetr.pro qt-x11-free-3.3.3/tools/mergetr/mergetr.pro
+--- qt-x11-free-3.3.3.old/tools/mergetr/mergetr.pro	2004-06-08 08:07:26.000000000 +0000
++++ qt-x11-free-3.3.3/tools/mergetr/mergetr.pro	2004-08-13 23:21:09.000000000 +0000
+@@ -4,3 +4,6 @@
+ SOURCES		= mergetr.cpp
+ TARGET		= mergetr
+ REQUIRES=full-config nocrosscompiler
++
++target.path = $$bins.path
++INSTALLS += target
+diff -ruN qt-x11-free-3.3.3.old/tools/msg2qm/msg2qm.pro qt-x11-free-3.3.3/tools/msg2qm/msg2qm.pro
+--- qt-x11-free-3.3.3.old/tools/msg2qm/msg2qm.pro	2004-06-08 08:08:25.000000000 +0000
++++ qt-x11-free-3.3.3/tools/msg2qm/msg2qm.pro	2004-08-13 23:22:13.000000000 +0000
+@@ -5,3 +5,6 @@
+ SOURCES		= msg2qm.cpp
+ TARGET		= msg2qm
+ REQUIRES=full-config nocrosscompiler
++
++target.path = $$bins.path
++INSTALLS += target
+diff -ruN qt-x11-free-3.3.3.old/tools/qembed/qembed.pro qt-x11-free-3.3.3/tools/qembed/qembed.pro
+--- qt-x11-free-3.3.3.old/tools/qembed/qembed.pro	2004-06-08 08:08:40.000000000 +0000
++++ qt-x11-free-3.3.3/tools/qembed/qembed.pro	2004-08-13 23:22:44.000000000 +0000
+@@ -2,3 +2,6 @@
+ SOURCES = qembed.cpp
+ TARGET  = qembed
+ REQUIRES=full-config nocrosscompiler
++
++target.path = $$bins.path
++INSTALLS += target


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/02_various_fixes.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/03_qt_fontlist_fix.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/03_qt_fontlist_fix.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/03_qt_fontlist_fix.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,51 @@
+#! /bin/sh -e
+## 03_qt_fontlist_fix.dpatch by Martin Loschwitz <madkiss@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix fonts list to show only the fonts we can use
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -ruN qt-x11-free-3.2.1.old/src/kernel/qfontdatabase_x11.cpp qt-x11-free-3.2.1/src/kernel/qfontdatabase_x11.cpp
+--- qt-x11-free-3.2.1.old/src/kernel/qfontdatabase_x11.cpp	2003-08-20 15:07:34.000000000 +0200
++++ qt-x11-free-3.2.1/src/kernel/qfontdatabase_x11.cpp	2003-09-03 11:08:05.000000000 +0200
+@@ -673,6 +673,9 @@
+     if ( fontFamily && fontFamily->xlfdLoaded )
+ 	return;
+ 
++#ifdef QT_XFT2
++    if ( !qt_has_xft ) {
++#endif // QT_XFT2
+     int fontCount;
+     // force the X server to give us XLFDs
+     QCString xlfd_pattern = "-*-";
+@@ -764,8 +767,11 @@
+     }
+ 
+     XFreeFontNames( fontList );
+-}
+ 
++#ifdef QT_XFT2
++    }
++#endif // QT_XFT2
++}
+ 
+ #ifndef QT_NO_XFTFREETYPE
+ static int getXftWeight(int xftweight)


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/03_qt_fontlist_fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/04_qsql_odbc.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/04_qsql_odbc.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/04_qsql_odbc.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,91 @@
+#! /bin/sh -e
+## 04_qsql_odbc.dpatch by Martin Loschwitz <madkiss@madkiss.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make the package build with libiodbc2-dev instead of unixodbc-dev
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -ruN qt-x11-free-3.2.1.old/plugins/src/sqldrivers/odbc/odbc.pro qt-x11-free-3.2.1/plugins/src/sqldrivers/odbc/odbc.pro
+--- qt-x11-free-3.2.1.old/plugins/src/sqldrivers/odbc/odbc.pro	2003-06-19 22:07:43.000000000 +0200
++++ qt-x11-free-3.2.1/plugins/src/sqldrivers/odbc/odbc.pro	2003-08-29 16:15:21.000000000 +0200
+@@ -15,7 +15,7 @@
+ unix {
+ 	OBJECTS_DIR	= .obj
+ 	!contains( LIBS, .*odbc.* ) {
+-	    LIBS 	*= -lodbc
++	    LIBS 	*= -liodbc
+ 	}
+ }
+ 
+diff -ruN qt-x11-free-3.2.1.old/src/sql/drivers/odbc/debian_qsql_odbc.h qt-x11-free-3.2.1/src/sql/drivers/odbc/debian_qsql_odbc.h
+--- qt-x11-free-3.2.1.old/src/sql/drivers/odbc/debian_qsql_odbc.h	1970-01-01 01:00:00.000000000 +0100
++++ qt-x11-free-3.2.1/src/sql/drivers/odbc/debian_qsql_odbc.h	2003-08-29 16:15:21.000000000 +0200
+@@ -0,0 +1,10 @@
++#ifdef UNICODE
++typedef SQLWCHAR        SQLTCHAR;
++#else
++typedef SQLCHAR         SQLTCHAR;
++#endif
++
++#define SQL_WCHAR              (-8)
++#define SQL_WVARCHAR           (-9)
++#define SQL_WLONGVARCHAR       (-10)
++#define SQL_C_WCHAR            SQL_WCHAR
+diff -ruN qt-x11-free-3.2.1.old/src/sql/drivers/odbc/qsql_odbc.h qt-x11-free-3.2.1/src/sql/drivers/odbc/qsql_odbc.h
+--- qt-x11-free-3.2.1.old/src/sql/drivers/odbc/qsql_odbc.h	2003-06-19 22:00:21.000000000 +0200
++++ qt-x11-free-3.2.1/src/sql/drivers/odbc/qsql_odbc.h	2003-08-29 16:16:42.000000000 +0200
+@@ -74,11 +74,8 @@
+ #  undef _MSC_VER
+ #endif
+ 
+-#ifndef Q_ODBC_VERSION_2
+-#include <sqlucode.h>
+-#endif
+-
+ #include <sqlext.h>
++#include "debian_qsql_odbc.h"
+ 
+ class QODBCPrivate;
+ class QODBCDriver;
+diff -ruN qt-x11-free-3.2.1.old/src/sql/qt_sql.pri qt-x11-free-3.2.1/src/sql/qt_sql.pri
+--- qt-x11-free-3.2.1.old/src/sql/qt_sql.pri	2003-07-08 11:33:23.000000000 +0200
++++ qt-x11-free-3.2.1/src/sql/qt_sql.pri	2003-08-29 16:15:21.000000000 +0200
+@@ -115,7 +115,7 @@
+ 
+ 		unix {
+ 			!contains( LIBS, .*odbc.* ) {
+-				LIBS        *= -lodbc
++				LIBS        *= -liodbc
+ 			}
+ 		}
+ 
+diff -ruN qt-x11-free-3.3.3.old/src/sql/drivers/odbc/qsql_odbc.cpp qt-x11-free-3.3.3/src/sql/drivers/odbc/qsql_odbc.cpp
+--- qt-x11-free-3.3.3.old/src/sql/drivers/odbc/qsql_odbc.cpp	2004-05-27 15:43:13.000000000 +0000
++++ qt-x11-free-3.3.3/src/sql/drivers/odbc/qsql_odbc.cpp	2004-10-31 09:35:06.000000000 +0000
+@@ -57,7 +57,7 @@
+ # define QSQLLEN SQLINTEGER
+ # define QSQLULEN SQLUINTEGER
+ #else
+-# ifndef Q_OS_WIN64
++# if 0
+ #  define SQLLEN SQLINTEGER
+ #  define SQLULEN SQLUINTEGER
+ # endif


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/04_qsql_odbc.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,46 @@
+#! /bin/sh -e
+## 05_qvfb_cpp.dpatch by Simon Hausmann <simon@kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix qvfb to obey our standards
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -ruN qt-x11-free-3.1.1+cvs.20030123-old/tools/qvfb/pda.skin qt-x11-free-3.1.1+cvs.20030123/tools/qvfb/pda.skin
+--- qt-x11-free-3.1.1+cvs.20030123-old/tools/qvfb/pda.skin	2002-09-06 14:32:46.000000000 +0200
++++ qt-x11-free-3.1.1+cvs.20030123/tools/qvfb/pda.skin	2003-01-26 20:46:30.000000000 +0100
+@@ -1,4 +1,4 @@
+-pda_up.png pda_down.png
++/usr/share/qvfb/pda_up.png /usr/share/qvfb/pda_down.png
+ 57 81
+ 240 320
+ 0.5
+diff -ruN qt-x11-free-3.1.1+cvs.20030123-old/tools/qvfb/qvfb.cpp qt-x11-free-3.1.1+cvs.20030123/tools/qvfb/qvfb.cpp
+--- qt-x11-free-3.1.1+cvs.20030123-old/tools/qvfb/qvfb.cpp	2002-10-04 17:27:31.000000000 +0200
++++ qt-x11-free-3.1.1+cvs.20030123/tools/qvfb/qvfb.cpp	2003-01-26 20:47:19.000000000 +0100
+@@ -80,7 +80,7 @@
+ 	bool vis = isVisible();
+ 	if ( vis ) hide();
+ 	menuBar()->hide();
+-	Skin *skin = new Skin( this, skin_name, w, h );
++	Skin *skin = new Skin( this, QString::fromLatin1( "/etc/qt3/qvfb/" ) + skin_name, w, h );
+ 	view = new QVFbView( display_id, w, h, d, skin );
+ 	skin->setView( view );
+ 	view->setMargin( 0 );


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/06_disable_rpath.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/06_disable_rpath.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/06_disable_rpath.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+## 06_disable_rpath.dpatch by Martin Loschwitz <madkiss@madkiss.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disables the rpath settings in qmake.conf
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -ruN qt-x11-free-3.1.1.old/mkspecs/linux-g++/qmake.conf qt-x11-free-3.1.1/mkspecs/linux-g++/qmake.conf
+--- qt-x11-free-3.1.1.old/mkspecs/linux-g++/qmake.conf	2002-12-09 10:41:32.000000000 +0100
++++ qt-x11-free-3.1.1/mkspecs/linux-g++/qmake.conf	2003-02-18 19:07:18.000000000 +0100
+@@ -53,7 +53,7 @@
+ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	=
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH		=
+ 
+ QMAKE_LIBS		=
+ QMAKE_LIBS_DYNLOAD	= -ldl


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/06_disable_rpath.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/07_use_libtool.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/07_use_libtool.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/07_use_libtool.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+## 07_use_libtool.dpatch by Martin Loschwitz <madkiss@madkiss.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable optimization for all arches
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -ruN qt-x11-free-3.3.2.old/src/qt.pro qt-x11-free-3.3.2/src/qt.pro
+--- qt-x11-free-3.3.2.old/src/qt.pro	2004-03-01 11:20:58.000000000 +0100
++++ qt-x11-free-3.3.2/src/qt.pro	2004-05-14 16:22:26.000000000 +0200
+@@ -169,7 +169,7 @@
+ !staticlib:PRL_EXPORT_DEFINES += QT_SHARED
+ 
+ unix {
+-   CONFIG     += create_libtool create_pc
++   CONFIG     += create_libtool
+    QMAKE_PKGCONFIG_LIBDIR = $$target.path
+    QMAKE_PKGCONFIG_INCDIR = $$headers.path
+ }

Added: people/chrsmrtn/qt-x11-free/debian/patches/08_thread_default.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/08_thread_default.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/08_thread_default.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,32 @@
+#! /bin/sh -e
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- qt.orig/mkspecs/linux-g++/qmake.conf
++++ qt.patched/mkspecs/linux-g++/qmake.conf
+@@ -6,7 +6,7 @@
+ 
+ MAKEFILE_GENERATOR	= UNIX
+ TEMPLATE		= app
+-CONFIG			+= qt warn_on release incremental link_prl
++CONFIG			+= qt warn_on release incremental link_prl thread
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
+ QMAKE_CC		= gcc


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/08_thread_default.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/09_amd64_lib64.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/09_amd64_lib64.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/09_amd64_lib64.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- qt.orig/mkspecs/linux-g++-64/qmake.conf
++++ qt.patched/mkspecs/linux-g++-64/qmake.conf
+@@ -41,11 +41,11 @@
+ QMAKE_INCDIR		=
+ QMAKE_LIBDIR		=
+ QMAKE_INCDIR_X11	= /usr/X11R6/include
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib64
++QMAKE_LIBDIR_X11	= /usr/X11R6/lib
+ QMAKE_INCDIR_QT		= $(QTDIR)/include
+ QMAKE_LIBDIR_QT		= $(QTDIR)/lib
+ QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib64
++QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+ 
+ QMAKE_LINK		= g++
+ QMAKE_LINK_SHLIB	= g++


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/09_amd64_lib64.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/14_fix_kmenu.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/14_fix_kmenu.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/14_fix_kmenu.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,34 @@
+#! /bin/sh -e
+## 14_fix_kmenu.dpatch by Martin Loschwitz <madkiss@madkiss.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix kmenu displaying
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- a/src/widgets/qpopupmenu.cpp	29 Apr 2004 22:31:28 -0000	1.60
++++ a/src/widgets/qpopupmenu.cpp	30 Apr 2004 01:11:59 -0000
+@@ -2531,7 +2531,7 @@ QSize QPopupMenu::sizeHint() const
+ 
+     QPopupMenu* that = (QPopupMenu*) this;
+     //We do not need a resize here, just the sizeHint..
+-    return that->updateSize(FALSE, FALSE).expandedTo( QApplication::globalStrut() );
++    return that->updateSize(FALSE).expandedTo( QApplication::globalStrut() );
+ }


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/14_fix_kmenu.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,118 @@
+#! /bin/sh -e
+## 15_unify_declarations_glibc.dpatch by Robert Millan <rmh@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: unify declarations for Glibc-based systems in upstream files
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- qt-x11-free-3.2.3.old/configure	2003-10-21 12:04:20.000000000 +0200
++++ qt-x11-free-3.2.3/configure	2004-08-05 00:33:56.000000000 +0200
+@@ -1248,7 +1248,7 @@
+ 	    XPLATFORM="qws/solaris-$CFG_EMBEDDED-g++"
+ 	fi
+ 	;;
+-    Linux:*)
++    Linux:*|GNU:*|GNU/*:*)
+ 	if [ -z "$PLATFORM" ]; then
+ 	    case "$UNAME_MACHINE" in
+ 	    *86)
+@@ -1303,9 +1303,6 @@
+      QNX:*)
+ 	PLATFORM=qnx-g++
+ 	;;
+-     GNU:*)
+-	PLATFORM=hurd-g++
+-	;;
+      dgux:*)
+ 	PLATFORM=dgux-g++
+ 	;;
+@@ -1353,7 +1350,7 @@
+ 	    - Also available for Tru64: tru64-g++
+ 	"
+ 	;;
+-     Linux:*)
++     Linux:*|GNU:*|GNU/*:*)
+ 	PLATFORM=linux-g++
+ 	PLATFORM_NOTES="
+ 	    - Also available for Linux: linux-kcc linux-icc linux-cxx
+diff -ur qt-x11-free-3.2.3.old/doc/html/qglobal-h.html qt-x11-free-3.2.3/doc/html/qglobal-h.html
+--- qt-x11-free-3.2.3.old/doc/html/qglobal-h.html	2003-11-10 13:06:43.000000000 +0100
++++ qt-x11-free-3.2.3/doc/html/qglobal-h.html	2004-08-05 00:39:47.000000000 +0200
+@@ -148,7 +148,7 @@
+ #  define Q_OS_ULTRIX
+ #elif defined(sinix)
+ #  define Q_OS_RELIANT
+-#elif defined(__linux__) || defined(__linux)
++#elif defined(__linux__) || defined(__linux) || defined(__GNU__) || defined(__GLIBC__)
+ #  define Q_OS_LINUX
+ #elif defined(__FreeBSD__)
+ #  define Q_OS_FREEBSD
+@@ -170,8 +170,6 @@
+ #  define Q_OS_AIX
+ #elif defined(__Lynx__)
+ #  define Q_OS_LYNX
+-#elif defined(__GNU_HURD__)
+-#  define Q_OS_HURD
+ #elif defined(__DGUX__)
+ #  define Q_OS_DGUX
+ #elif defined(__QNXNTO__)
+diff -ur qt-x11-free-3.2.3.old/include/qglobal.h qt-x11-free-3.2.3/include/qglobal.h
+--- qt-x11-free-3.2.3.old/include/qglobal.h	2003-11-10 11:21:38.000000000 +0100
++++ qt-x11-free-3.2.3/include/qglobal.h	2004-08-05 00:40:23.000000000 +0200
+@@ -112,7 +112,7 @@
+ #  define Q_OS_ULTRIX
+ #elif defined(sinix)
+ #  define Q_OS_RELIANT
+-#elif defined(__linux__) || defined(__linux)
++#elif defined(__linux__) || defined(__linux) || defined(__GNU__) || defined(__GLIBC__)
+ #  define Q_OS_LINUX
+ #elif defined(__FreeBSD__)
+ #  define Q_OS_FREEBSD
+@@ -134,8 +134,6 @@
+ #  define Q_OS_AIX
+ #elif defined(__Lynx__)
+ #  define Q_OS_LYNX
+-#elif defined(__GNU_HURD__)
+-#  define Q_OS_HURD
+ #elif defined(__DGUX__)
+ #  define Q_OS_DGUX
+ #elif defined(__QNXNTO__)
+diff -ur qt-x11-free-3.2.3.old/src/tools/qglobal.h qt-x11-free-3.2.3/src/tools/qglobal.h
+--- qt-x11-free-3.2.3.old/src/tools/qglobal.h	2003-11-10 11:21:38.000000000 +0100
++++ qt-x11-free-3.2.3/src/tools/qglobal.h	2004-08-05 00:40:23.000000000 +0200
+@@ -112,7 +112,7 @@
+ #  define Q_OS_ULTRIX
+ #elif defined(sinix)
+ #  define Q_OS_RELIANT
+-#elif defined(__linux__) || defined(__linux)
++#elif defined(__linux__) || defined(__linux) || defined(__GNU__) || defined(__GLIBC__)
+ #  define Q_OS_LINUX
+ #elif defined(__FreeBSD__)
+ #  define Q_OS_FREEBSD
+@@ -134,8 +134,6 @@
+ #  define Q_OS_AIX
+ #elif defined(__Lynx__)
+ #  define Q_OS_LYNX
+-#elif defined(__GNU_HURD__)
+-#  define Q_OS_HURD
+ #elif defined(__DGUX__)
+ #  define Q_OS_DGUX
+ #elif defined(__QNXNTO__)


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,52 @@
+#! /bin/sh -e
+## DP: Fix handling of libGL.so.1 to not require the -dev packages
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- qt-x11-free-3.3.3/src/opengl/qgl_x11.cpp.orig	2004-08-18 14:55:20.629068213 +0200
++++ qt-x11-free-3.3.3/src/opengl/qgl_x11.cpp	2004-08-18 15:00:43.090260739 +0200
+@@ -125,7 +125,7 @@
+     if (gl_syms_resolved)
+ 	return TRUE;
+ 
+-    QLibrary gl("GL");
++    QLibrary gl("GL.so.1");
+     gl.setAutoUnload(FALSE);
+ 
+     qt_glCallLists = (_glCallLists) gl.resolve("glCallLists");
+@@ -283,7 +283,7 @@
+ 	typedef Status (*_XmuLookupStandardColormap)( Display *dpy, int screen, VisualID visualid, unsigned int depth,
+ 						      Atom property, Bool replace, Bool retain );
+ 	_XmuLookupStandardColormap qt_XmuLookupStandardColormap;
+-	qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) QLibrary::resolve("Xmu", "XmuLookupStandardColormap");
++	qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) QLibrary::resolve("Xmu.so.6", "XmuLookupStandardColormap");
+ 	if (!qt_XmuLookupStandardColormap)
+ 	    qFatal("Unable to resolve Xmu symbols - please check your Xmu library installation.");
+ #define XmuLookupStandardColormap qt_XmuLookupStandardColormap
+--- qt-x11-free-3.3.3/src/tools/qlibrary.cpp.orig	2004-08-18 14:56:00.322185890 +0200
++++ qt-x11-free-3.3.3/src/tools/qlibrary.cpp	2004-08-18 14:57:51.939637946 +0200
+@@ -425,6 +425,7 @@
+ 	    } else {
+ 		tmpfilename = QString( "lib%1" ).arg( filename );
+ 	    }
++	    if ( !filename.contains(".so") )
+ 	    tmpfilename += filter;
+ 	    if(QFile::exists(tmpfilename) || it == filters.end()) {
+ 		filename = tmpfilename;


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/17_fix_qfontdatabase_cpp.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/17_fix_qfontdatabase_cpp.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/17_fix_qfontdatabase_cpp.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,38 @@
+#! /bin/sh -e
+## 17_fix_qfontdatabase_cpp.dpatch by Lars Knoll <lars@trolltech.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix some stuff with regards to font handling
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -ruN qt-x11-free-3.3.4.old/src/kernel/qfontdatabase_x11.cpp qt-x11-free-3.3.4/src/kernel/qfontdatabase_x11.cpp
+--- qt-x11-free-3.3.4.old/src/kernel/qfontdatabase_x11.cpp	2005-01-21 17:16:11.000000000 +0000
++++ qt-x11-free-3.3.4/src/kernel/qfontdatabase_x11.cpp	2005-03-18 15:16:58.544321304 +0000
+@@ -961,8 +961,7 @@
+         }
+ #endif
+ 	QtFontEncoding *enc = size->encodingID( -1, 0, 0, 0, 0, TRUE );
+-	enc->pitch = ( spacing_value >= XFT_CHARCELL ? 'c' :
+-		       ( spacing_value >= XFT_MONO ? 'm' : 'p' ) );
++	enc->pitch = (f->fixed ? 'm' : 'p');
+     }
+ 
+     XftFontSetDestroy (fonts);

Added: people/chrsmrtn/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,46 @@
+#! /bin/sh -e
+## 18_fix_makeqpf_qembed.dpatch by Martin Loschwitz <madkiss@madkiss.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix makeqpf by make it not use stuff defined in Qt embedded
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -ruN qt-x11-free-3.3.3.old/tools/makeqpf/main.cpp qt-x11-free-3.3.3/tools/makeqpf/main.cpp
+--- qt-x11-free-3.3.3.old/tools/makeqpf/main.cpp	2004-06-23 14:13:52.000000000 +0000
++++ qt-x11-free-3.3.3/tools/makeqpf/main.cpp	2004-08-14 08:53:01.000000000 +0000
+@@ -124,8 +124,6 @@
+     }
+ };
+ 
+-extern QString qws_topdir();
+-
+ class MakeQPF : public QMainWindow
+ {
+     Q_OBJECT
+@@ -139,7 +137,7 @@
+ 	view->addColumn("Weight");
+ 	view->addColumn("Style");
+ 	setCentralWidget(view);
+-	QString fontdir = qws_topdir() + "/lib/fonts";
++	QString fontdir = QString(getenv("QTDIR")) + "/lib/fonts";
+ 	readFontDir(fontdir);
+ 
+ 	connect(view,SIGNAL(selectionChanged(QListViewItem*)),


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/21_fix_mips_mipsel.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/21_fix_mips_mipsel.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/21_fix_mips_mipsel.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,50 @@
+#! /bin/sh -e
+## 21_fix_mips_mipsel.dpatch by Martin Loschwitz <madkiss@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make it compile on mips / mipsel
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -ruN qt-x11-free-3.3.3.old/src/qt.pro qt-x11-free-3.3.3/src/qt.pro
+--- qt-x11-free-3.3.3.old/src/qt.pro	2004-05-14 13:55:30.000000000 +0000
++++ qt-x11-free-3.3.3/src/qt.pro	2004-11-14 17:34:27.000000000 +0000
+@@ -9,6 +9,8 @@
+ CONFIG		+= qt warn_on depend_includepath
+ CONFIG          += qmake_cache
+ 
++QMAKE_CXXFLAGS += "-Wa,-xgot"
++
+ win32:!shared:CONFIG += staticlib
+ 
+ win32-borland {
+diff -ruN qt-x11-free-3.3.3.old/src/qt.pro qt-x11-free-3.3.3/src/qt.pro
+--- qt-x11-free-3.3.3.old/src/qt.pro	2004-05-14 13:55:30.000000000 +0000
++++ qt-x11-free-3.3.3/src/qt.pro	2004-11-16 18:35:19.000000000 +0000
+@@ -9,6 +9,9 @@
+ CONFIG		+= qt warn_on depend_includepath
+ CONFIG          += qmake_cache
+ 
++QMAKE_CXXFLAGS += -Wa,-xgot
++QMAKE_CFLAGS += -Wa,-xgot
++
+ win32:!shared:CONFIG += staticlib
+ 
+ win32-borland {


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/21_fix_mips_mipsel.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,60 @@
+#! /bin/sh -e
+## 22_fix_ftbfs_amd64.dpatch by Andreas Jochens
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS on amd64
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urN qt-x11-free-3.3.3/tools/qvfb/qvfbview.cpp ./tools/qvfb/qvfbview.cpp
+--- qt-x11-free-3.3.3/tools/qvfb/qvfbview.cpp	2004-04-15 14:53:25.000000000 +0200
++++ ./tools/qvfb/qvfbview.cpp	2005-01-03 11:32:45.000000000 +0100
+@@ -115,7 +115,7 @@
+ 	data = (unsigned char *)shmat( shmId, 0, 0 );
+     }
+ 
+-    if ( (int)data == -1 )
++    if ( (long)data == -1 )
+ 	qFatal( "Cannot attach to shared memory" );
+ 
+     hdr = (QVFbHeader *)data;
+diff -urN qt-x11-free-3.3.3/examples/demo/opengl/fbm.c ./examples/demo/opengl/fbm.c
+--- qt-x11-free-3.3.3/examples/demo/opengl/fbm.c	2003-05-27 17:19:17.000000000 +0200
++++ ./examples/demo/opengl/fbm.c	2005-01-03 12:10:25.000000000 +0100
+@@ -50,6 +50,8 @@
+ 	r1 = r0 - 1.;
+ #define at3(rx,ry,rz) ( rx * q[0] + ry * q[1] + rz * q[2] )
+ 
++static float noise3(float vec[3]);
++
+ /* Fractional Brownian Motion function */
+ 
+ double fBm( Vector point, double H, double lacunarity, double octaves,
+diff -urN qt-x11-free-3.3.3/examples/demo/opengl/fbm.h ./examples/demo/opengl/fbm.h
+--- qt-x11-free-3.3.3/examples/demo/opengl/fbm.h	2003-05-27 17:19:17.000000000 +0200
++++ ./examples/demo/opengl/fbm.h	2005-01-03 12:10:05.000000000 +0100
+@@ -26,7 +26,6 @@
+     double z;
+ } Vector;
+     
+-float noise3(float vec[]);
+ double fBm( Vector point, double H, double lacunarity, double octaves, 
+ 	    int init );
+ #endif


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,66 @@
+#! /bin/sh -e
+## 23_qtc_qclipboard_hack.dpatch by Lubos Lunak
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix qclipboard
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- bla/src/kernel/qclipboard_x11.cpp.sav	2004-04-30 12:00:06.000000000 +0200
++++ bla/src/kernel/qclipboard_x11.cpp	2004-05-09 21:18:10.269264304 +0200
+@@ -109,6 +109,7 @@ static int pending_timer_id = 0;
+ static bool pending_clipboard_changed = FALSE;
+ static bool pending_selection_changed = FALSE;
+ 
++Q_EXPORT bool qt_qclipboard_bailout_hack = false;
+ 
+ // event capture mechanism for qt_xclb_wait_for_event
+ static bool waiting_for_data = FALSE;
+@@ -453,6 +454,15 @@ static int qt_xclb_event_filter(XEvent *
+     return 0;
+ }
+ 
++static bool selection_request_pending = false;
++
++static Bool check_selection_request_pending( Display*, XEvent* e, XPointer )
++    {
++    if( e->type == SelectionRequest && e->xselectionrequest.owner == owner->winId())
++        selection_request_pending = true;
++    return False;
++    }
++
+ bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event,
+ 			     int timeout )
+ {
+@@ -504,6 +514,14 @@ bool qt_xclb_wait_for_event( Display *dp
+     do {
+         if ( XCheckTypedWindowEvent(dpy,win,type,event) )
+ 	    return TRUE;
++        if( qt_qclipboard_bailout_hack ) {
++            XEvent dummy;
++            selection_request_pending = false;
++            if ( owner != NULL )
++                XCheckIfEvent(dpy,&dummy,check_selection_request_pending,NULL);
++            if( selection_request_pending )
++	        return TRUE;
++        }
+ 
+ 	now = QTime::currentTime();
+ 	if ( started > now )			// crossed midnight


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,46 @@
+#! /bin/sh -e
+## 24_qtc_qscrollview.dpatch by Germain Garand <germain@ebooksfrance.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix the qscrollview stuff
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -u -3 -p -r1.65 qscrollview.cpp
+--- bla/src/widgets/qscrollview.cpp	29 Apr 2004 22:31:28 -0000	1.65
++++ bla/src/widgets/qscrollview.cpp	25 Jan 2005 12:07:04 -0000
+@@ -1180,7 +1180,7 @@ void  QScrollView::mouseMoveEvent( QMous
+ void QScrollView::wheelEvent( QWheelEvent *e )
+ {
+     QWheelEvent ce( viewport()->mapFromGlobal( e->globalPos() ),
+-                    e->globalPos(), e->delta(), e->state());
++                    e->globalPos(), e->delta(), e->state(), e->orientation() );
+     viewportWheelEvent(&ce);
+     if ( !ce.isAccepted() ) {
+ 	if ( e->orientation() == Horizontal && horizontalScrollBar() )
+@@ -1863,7 +1863,7 @@ void QScrollView::viewportWheelEvent( QW
+        the event itself.
+     */
+     QWheelEvent ce( viewportToContents(e->pos()),
+-        e->globalPos(), e->delta(), e->state());
++        e->globalPos(), e->delta(), e->state(), e->orientation());
+     contentsWheelEvent(&ce);
+     if ( ce.isAccepted() )
+         e->accept();


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,548 @@
+#! /bin/sh -e
+## 24_qtc_qscrollview.dpatch by Germain Garand <germain@ebooksfrance.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix the qscrollview stuff
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- qt.orig/src/kernel/qpixmap_x11.cpp
++++ qt.patched/src/kernel/qpixmap_x11.cpp
+@@ -37,7 +37,19 @@
+ 
+ // NOT REVISED
+ 
++#include "qplatformdefs.h"
++
++#if defined(Q_OS_WIN32) && defined(QT_MITSHM)
++#undef QT_MITSHM
++#endif
++
++#ifdef QT_MITSHM
++
++// Use the MIT Shared Memory extension for pixmap<->image conversions
++#define QT_MITSHM_CONVERSIONS
++
+ // Uncomment the next line to enable the MIT Shared Memory extension
++// for QPixmap::xForm()
+ //
+ // WARNING:  This has some problems:
+ //
+@@ -45,14 +57,13 @@
+ //    2. Qt does not handle the ShmCompletion message, so you will
+ //        get strange effects if you xForm() repeatedly.
+ //
+-// #define QT_MITSHM
++// #define QT_MITSHM_XFORM
+ 
+-#if defined(Q_OS_WIN32) && defined(QT_MITSHM)
+-#undef QT_MITSHM
++#else
++#undef QT_MITSHM_CONVERSIONS
++#undef QT_MITSHM_XFORM
+ #endif
+ 
+-#include "qplatformdefs.h"
+-
+ #include "qbitmap.h"
+ #include "qpaintdevicemetrics.h"
+ #include "qimage.h"
+@@ -91,7 +102,7 @@ inline static void qSafeXDestroyImage( X
+   MIT Shared Memory Extension support: makes xForm noticeably (~20%) faster.
+  *****************************************************************************/
+ 
+-#if defined(QT_MITSHM)
++#if defined(QT_MITSHM_XFORM)
+ 
+ static bool	       xshminit = FALSE;
+ static XShmSegmentInfo xshminfo;
+@@ -173,8 +184,100 @@ static bool qt_create_mitshm_buffer( con
+ //     return FALSE;
+ // }
+ 
+-#endif // QT_MITSHM
++#endif // QT_MITSHM_XFORM
+ 
++#ifdef QT_MITSHM_CONVERSIONS
++
++static bool qt_mitshm_error = false;
++static int qt_mitshm_errorhandler( Display*, XErrorEvent* )
++{
++    qt_mitshm_error = true;
++    return 0;
++}
++
++static XImage* qt_XShmCreateImage( Display* dpy, Visual* visual, unsigned int depth,
++    int format, int /*offset*/, char* /*data*/, unsigned int width, unsigned int height,
++    int /*bitmap_pad*/, int /*bytes_per_line*/, XShmSegmentInfo* shminfo )
++{
++    if( width * height * depth < 100*100*32 )
++        return NULL;
++    static int shm_inited = -1;
++    if( shm_inited == -1 ) {
++        if( XShmQueryExtension( dpy ))
++            shm_inited = 1;
++        else
++            shm_inited = 0;
++    }
++    if( shm_inited == 0 )
++        return NULL;
++    XImage* xi = XShmCreateImage( dpy, visual, depth, format, NULL, shminfo, width,
++        height );
++    if( xi == NULL )
++        return NULL;
++    shminfo->shmid = shmget( IPC_PRIVATE, xi->bytes_per_line * xi->height,
++        IPC_CREAT|0600);
++    if( shminfo->shmid < 0 ) {
++        XDestroyImage( xi );
++        return NULL;
++    }
++    shminfo->readOnly = False;
++    shminfo->shmaddr = (char*)shmat( shminfo->shmid, 0, 0 );
++    if( shminfo->shmaddr == (char*)-1 ) {
++        XDestroyImage( xi );
++        shmctl( shminfo->shmid, IPC_RMID, 0 );
++        return NULL;
++    }
++    xi->data = shminfo->shmaddr;
++#ifndef QT_MITSHM_RMID_IGNORES_REFCOUNT
++    // mark as deleted to automatically free the memory in case
++    // of a crash (but this doesn't work e.g. on Solaris)
++    shmctl( shminfo->shmid, IPC_RMID, 0 );
++#endif
++    if( shm_inited == 1 ) { // first time
++        XErrorHandler old_h = XSetErrorHandler( qt_mitshm_errorhandler );
++        XShmAttach( dpy, shminfo );
++        shm_inited = 2;
++        XSync( dpy, False );
++        XSetErrorHandler( old_h );
++        if( qt_mitshm_error ) { // oops ... perhaps we are remote?
++            shm_inited = 0;
++            XDestroyImage( xi );
++            shmdt( shminfo->shmaddr );
++#ifdef QT_MITSHM_RMID_IGNORES_REFCOUNT
++            shmctl( shminfo->shmid, IPC_RMID, 0 );
++#endif    
++            return NULL;
++        }
++    } else
++        XShmAttach( dpy, shminfo );
++    return xi;
++}
++
++static void qt_XShmDestroyImage( XImage* xi, XShmSegmentInfo* shminfo )
++{
++    XShmDetach( QPaintDevice::x11AppDisplay(), shminfo );
++    XDestroyImage( xi );
++    shmdt( shminfo->shmaddr );
++#ifdef QT_MITSHM_RMID_IGNORES_REFCOUNT
++    shmctl( shminfo->shmid, IPC_RMID, 0 );
++#endif    
++}
++
++static XImage* qt_XShmGetImage( const QPixmap* pix, int format,
++    XShmSegmentInfo* shminfo )
++{
++    XImage* xi = qt_XShmCreateImage( pix->x11Display(), (Visual*)pix->x11Visual(),
++        pix->depth(), format, 0, 0, pix->width(), pix->height(), 32, 0, shminfo );
++    if( xi == NULL )
++        return NULL;
++    if( XShmGetImage( pix->x11Display(), pix->handle(), xi, 0, 0, AllPlanes ) == False ) {
++        qt_XShmDestroyImage( xi, shminfo );
++        return NULL;
++    }
++    return xi;
++}
++
++#endif // QT_MITSHM_CONVERSIONS
+ 
+ /*****************************************************************************
+   Internal functions
+@@ -625,9 +728,20 @@ QImage QPixmap::convertToImage() const
+ 	d = 32;					//   > 8  ==> 32
+ 
+     XImage *xi = (XImage *)data->ximage;	// any cached ximage?
+-    if ( !xi )					// fetch data from X server
+-	xi = XGetImage( x11Display(), hd, 0, 0, w, h, AllPlanes,
++#ifdef QT_MITSHM_CONVERSIONS
++    bool mitshm_ximage = false;
++    XShmSegmentInfo shminfo;
++#endif
++    if ( !xi ) {				// fetch data from X server
++#ifdef QT_MITSHM_CONVERSIONS
++        xi = qt_XShmGetImage( this, mono ? XYPixmap : ZPixmap, &shminfo );
++        if( xi ) {
++            mitshm_ximage = true;
++        } else
++#endif
++	    xi = XGetImage( x11Display(), hd, 0, 0, w, h, AllPlanes,
+ 			mono ? XYPixmap : ZPixmap );
++    }
+     Q_CHECK_PTR( xi );
+ 
+     QImage::Endian bitOrder = QImage::IgnoreEndian;
+@@ -636,15 +750,31 @@ QImage QPixmap::convertToImage() const
+ 		   QImage::LittleEndian : QImage::BigEndian;
+     }
+     image.create( w, h, d, 0, bitOrder );
+-    if ( image.isNull() )			// could not create image
++    if ( image.isNull() ) {			// could not create image
++#ifdef QT_MITSHM_CONVERSIONS
++        if( mitshm_ximage )
++            qt_XShmDestroyImage( xi, &shminfo );
++        else
++#endif
++        qSafeXDestroyImage( xi );
+ 	return image;
++    }
+ 
+     const QPixmap* msk = mask();
+     const QPixmap *alf = data->alphapm;
+ 
+     QImage alpha;
+     if (alf) {
+-	XImage *axi = XGetImage(x11Display(), alf->hd, 0, 0, w, h, AllPlanes, ZPixmap);
++        XImage* axi;
++#ifdef QT_MITSHM_CONVERSIONS
++        bool mitshm_aximage = false;
++        XShmSegmentInfo ashminfo;
++        axi = qt_XShmGetImage( alf, ZPixmap, &ashminfo );
++        if( axi ) {
++            mitshm_aximage = true;
++        } else
++#endif
++            axi = XGetImage(x11Display(), alf->hd, 0, 0, w, h, AllPlanes, ZPixmap);
+ 
+ 	if (axi) {
+ 	    image.setAlphaBuffer( TRUE );
+@@ -658,7 +788,12 @@ QImage QPixmap::convertToImage() const
+ 		src += axi->bytes_per_line;
+ 	    }
+ 
+-	    qSafeXDestroyImage( axi );
++#ifdef QT_MITSHM_CONVERSIONS
++            if( mitshm_aximage )
++                qt_XShmDestroyImage( axi, &ashminfo );
++            else
++#endif
++    	        qSafeXDestroyImage( axi );
+ 	}
+     } else if (msk) {
+ 	image.setAlphaBuffer( TRUE );
+@@ -800,6 +935,12 @@ QImage QPixmap::convertToImage() const
+ 		  xi->bits_per_pixel );
+ #endif
+ 	image.reset();
++#ifdef QT_MITSHM_CONVERSIONS
++        if( mitshm_ximage )
++            qt_XShmDestroyImage( xi, &shminfo );
++        else
++#endif
++            qSafeXDestroyImage( xi );
+ 	return image;
+     }
+ 
+@@ -905,10 +1046,22 @@ QImage QPixmap::convertToImage() const
+ 	delete [] carr;
+     }
+     if ( data->optim != BestOptim ) {		// throw away image data
+-	qSafeXDestroyImage( xi );
++#ifdef QT_MITSHM_CONVERSIONS
++        if( mitshm_ximage )
++            qt_XShmDestroyImage( xi, &shminfo );
++        else
++#endif
++            qSafeXDestroyImage( xi );
+ 	((QPixmap*)this)->data->ximage = 0;
+-    } else					// keep ximage data
++    } else {					// keep ximage data
++#ifdef QT_MITSHM_CONVERSIONS
++        if( mitshm_ximage ) { // copy the XImage?
++            qt_XShmDestroyImage( xi, &shminfo );
++            xi = 0;
++        }
++#endif
+ 	((QPixmap*)this)->data->ximage = xi;
++    }
+ 
+     return image;
+ }
+@@ -1078,6 +1231,11 @@ bool QPixmap::convertFromImage( const QI
+     bool    trucol = (visual->c_class == TrueColor);
+     int	    nbytes = image.numBytes();
+     uchar  *newbits= 0;
++    int newbits_size = 0;
++#ifdef QT_MITSHM_CONVERSIONS
++    bool mitshm_ximage = false;
++    XShmSegmentInfo shminfo;
++#endif
+ 
+     if ( trucol ) {				// truecolor display
+ 	QRgb  pix[256];				// pixel translation table
+@@ -1106,9 +1264,18 @@ bool QPixmap::convertFromImage( const QI
+ 	    }
+ 	}
+ 
+-	xi = XCreateImage( dpy, visual, dd, ZPixmap, 0, 0, w, h, 32, 0 );
++#ifdef QT_MITSHM_CONVERSIONS
++        xi = qt_XShmCreateImage( dpy, visual, dd, ZPixmap, 0, 0, w, h, 32, 0, &shminfo );
++        if( xi != NULL ) {
++            mitshm_ximage = true;
++            newbits = (uchar*)xi->data;
++        }
++        else
++#endif
++	    xi = XCreateImage( dpy, visual, dd, ZPixmap, 0, 0, w, h, 32, 0 );
+ 	Q_CHECK_PTR( xi );
+-	newbits = (uchar *)malloc( xi->bytes_per_line*h );
++        if( newbits == NULL )
++    	    newbits = (uchar *)malloc( xi->bytes_per_line*h );
+ 	Q_CHECK_PTR( newbits );
+ 	if ( !newbits )				// no memory
+ 	    return FALSE;
+@@ -1314,6 +1481,7 @@ bool QPixmap::convertFromImage( const QI
+ 	}
+ 
+ 	newbits = (uchar *)malloc( nbytes );	// copy image into newbits
++        newbits_size = nbytes;
+ 	Q_CHECK_PTR( newbits );
+ 	if ( !newbits )				// no memory
+ 	    return FALSE;
+@@ -1431,11 +1599,18 @@ bool QPixmap::convertFromImage( const QI
+     }
+ 
+     if ( !xi ) {				// X image not created
+-	xi = XCreateImage( dpy, visual, dd, ZPixmap, 0, 0, w, h, 32, 0 );
++#ifdef QT_MITSHM_CONVERSIONS
++        xi = qt_XShmCreateImage( dpy, visual, dd, ZPixmap, 0, 0, w, h, 32, 0, &shminfo );
++        if( xi != NULL )
++            mitshm_ximage = true;
++        else
++#endif
++	    xi = XCreateImage( dpy, visual, dd, ZPixmap, 0, 0, w, h, 32, 0 );
+ 	if ( xi->bits_per_pixel == 16 ) {	// convert 8 bpp ==> 16 bpp
+ 	    ushort *p2;
+ 	    int	    p2inc = xi->bytes_per_line/sizeof(ushort);
+ 	    ushort *newerbits = (ushort *)malloc( xi->bytes_per_line * h );
++            newbits_size = xi->bytes_per_line * h;
+ 	    Q_CHECK_PTR( newerbits );
+ 	    if ( !newerbits )				// no memory
+ 		return FALSE;
+@@ -1453,7 +1628,15 @@ bool QPixmap::convertFromImage( const QI
+ 		      "(bpp=%d)", xi->bits_per_pixel );
+ #endif
+ 	}
+-	xi->data = (char *)newbits;
++#ifdef QT_MITSHM_CONVERSIONS
++        if( newbits_size > 0 && mitshm_ximage ) { // need to copy to shared memory
++            memcpy( xi->data, newbits, newbits_size );
++            free( newbits );
++            newbits = (uchar*)xi->data;
++        }
++        else
++#endif
++            xi->data = (char *)newbits;
+     }
+ 
+     if ( hd && (width() != (int)w || height() != (int)h || this->depth() != dd) ) {
+@@ -1486,19 +1669,24 @@ bool QPixmap::convertFromImage( const QI
+ 
+     }
+ 
+-    XPutImage( dpy, hd, qt_xget_readonly_gc( x11Screen(), FALSE  ),
+-	       xi, 0, 0, 0, 0, w, h );
++#ifdef QT_MITSHM_CONVERSIONS
++    if( mitshm_ximage )
++        XShmPutImage( dpy, hd, qt_xget_readonly_gc( x11Screen(), FALSE ),
++                      xi, 0, 0, 0, 0, w, h, False );
++    else
++#endif
++        XPutImage( dpy, hd, qt_xget_readonly_gc( x11Screen(), FALSE  ),
++                   xi, 0, 0, 0, 0, w, h );
+ 
+-    if ( data->optim != BestOptim ) {		// throw away image
+-	qSafeXDestroyImage( xi );
+-	data->ximage = 0;
+-    } else {					// keep ximage that we created
+-	data->ximage = xi;
+-    }
+     data->w = w;
+     data->h = h;
+     data->d = dd;
+ 
++    XImage* axi = NULL;
++#ifdef QT_MITSHM_CONVERSIONS
++    bool mitshm_aximage = false;
++    XShmSegmentInfo ashminfo;
++#endif
+     if ( image.hasAlphaBuffer() ) {
+ 	QBitmap m;
+ 	m = image.createAlphaMask( conversion_flags );
+@@ -1534,13 +1722,22 @@ bool QPixmap::convertFromImage( const QI
+ 	    data->alphapm->rendhd =
+ 		(HANDLE) XftDrawCreateAlpha( x11Display(), data->alphapm->hd, 8 );
+ 
+-	    XImage *axi = XCreateImage(x11Display(), (Visual *) x11Visual(),
+-				       8, ZPixmap, 0, 0, w, h, 8, 0);
++#ifdef QT_MITSHM_CONVERSIONS
++            axi = qt_XShmCreateImage( x11Display(), (Visual*)x11Visual(),
++                                      8, ZPixmap, 0, 0, w, h, 8, 0, &ashminfo );
++            if( axi != NULL )
++                mitshm_aximage = true;
++            else
++#endif
++	        axi = XCreateImage(x11Display(), (Visual *) x11Visual(),
++				   8, ZPixmap, 0, 0, w, h, 8, 0);
+ 
+ 	    if (axi) {
+-		// the data is deleted by qSafeXDestroyImage
+-		axi->data = (char *) malloc(h * axi->bytes_per_line);
+-		Q_CHECK_PTR( axi->data );
++                if( axi->data==NULL ) {
++		    // the data is deleted by qSafeXDestroyImage
++		    axi->data = (char *) malloc(h * axi->bytes_per_line);
++		    Q_CHECK_PTR( axi->data );
++                }
+ 		char *aptr = axi->data;
+ 
+ 		if (image.depth() == 32) {
+@@ -1558,14 +1755,48 @@ bool QPixmap::convertFromImage( const QI
+ 		}
+ 
+ 		GC gc = XCreateGC(x11Display(), data->alphapm->hd, 0, 0);
+-		XPutImage(dpy, data->alphapm->hd, gc, axi, 0, 0, 0, 0, w, h);
++#ifdef QT_MITSHM_CONVERSIONS
++                if( mitshm_aximage )
++                    XShmPutImage( dpy, data->alphapm->hd, gc, axi, 0, 0, 0, 0, w, h, False );
++                else
++#endif
++		    XPutImage(dpy, data->alphapm->hd, gc, axi, 0, 0, 0, 0, w, h);
+ 		XFreeGC(x11Display(), gc);
+-		qSafeXDestroyImage(axi);
+ 	    }
+ 	}
+ #endif // QT_NO_XFTFREETYPE
+     }
+ 
++#ifdef QT_MITSHM_CONVERSIONS
++    if( mitshm_ximage || mitshm_aximage )
++        XSync( x11Display(), False ); // wait until processed
++#endif
++
++    if ( data->optim != BestOptim ) {		// throw away image
++#ifdef QT_MITSHM_CONVERSIONS
++        if( mitshm_ximage )
++            qt_XShmDestroyImage( xi, &shminfo );
++        else
++#endif
++	qSafeXDestroyImage( xi );
++	data->ximage = 0;
++    } else {					// keep ximage that we created
++#ifdef QT_MITSHM_CONVERSIONS
++        if( mitshm_ximage ) { // copy the XImage?
++            qt_XShmDestroyImage( xi, &shminfo );
++            xi = 0;
++        }
++#endif
++	data->ximage = xi;
++    }
++    if( axi ) {
++#ifdef QT_MITSHM_CONVERSIONS
++        if( mitshm_aximage )
++            qt_XShmDestroyImage( axi, &ashminfo );
++        else
++#endif
++        qSafeXDestroyImage(axi);
++    }
+     return TRUE;
+ }
+ 
+@@ -1722,7 +1953,7 @@ QPixmap QPixmap::xForm( const QWMatrix &
+ 	return pm;
+     }
+ 
+-#if defined(QT_MITSHM)
++#if defined(QT_MITSHM_XFORM)
+     static bool try_once = TRUE;
+     if (try_once) {
+ 	try_once = FALSE;
+@@ -1755,7 +1986,7 @@ QPixmap QPixmap::xForm( const QWMatrix &
+ 	dbpl = ((w*bpp+31)/32)*4;
+     dbytes = dbpl*h;
+ 
+-#if defined(QT_MITSHM)
++#if defined(QT_MITSHM_XFORM)
+     if ( use_mitshm ) {
+ 	dptr = (uchar *)xshmimg->data;
+ 	uchar fillbyte = bpp == 8 ? white.pixel() : 0xff;
+@@ -1771,7 +2002,7 @@ QPixmap QPixmap::xForm( const QWMatrix &
+ 	    memset( dptr, Qt::white.pixel( x11Screen() ), dbytes );
+ 	else
+ 	    memset( dptr, 0xff, dbytes );
+-#if defined(QT_MITSHM)
++#if defined(QT_MITSHM_XFORM)
+     }
+ #endif
+ 
+@@ -1802,7 +2033,7 @@ QPixmap QPixmap::xForm( const QWMatrix &
+     } else {
+ 	xbpl  = (w*bpp)/8;
+ 	p_inc = dbpl - xbpl;
+-#if defined(QT_MITSHM)
++#if defined(QT_MITSHM_XFORM)
+ 	if ( use_mitshm )
+ 	    p_inc = xshmimg->bytes_per_line - xbpl;
+ #endif
+@@ -1839,7 +2070,7 @@ QPixmap QPixmap::xForm( const QWMatrix &
+ 	QPixmap pm( w, h );
+ 	pm.data->uninit = FALSE;
+ 	pm.x11SetScreen( x11Screen() );
+-#if defined(QT_MITSHM)
++#if defined(QT_MITSHM_XFORM)
+ 	if ( use_mitshm ) {
+ 	    XCopyArea( dpy, xshmpm, pm.handle(), gc, 0, 0, w, h, 0, 0 );
+ 	} else {
+@@ -1848,7 +2079,7 @@ QPixmap QPixmap::xForm( const QWMatrix &
+ 			       ZPixmap, 0, (char *)dptr, w, h, 32, 0 );
+ 	    XPutImage( dpy, pm.handle(), gc, xi, 0, 0, 0, 0, w, h);
+ 	    qSafeXDestroyImage( xi );
+-#if defined(QT_MITSHM)
++#if defined(QT_MITSHM_XFORM)
+ 	}
+ #endif
+ 
+--- qt.orig/mkspecs/linux-g++/qplatformdefs.h
++++ qt.patched/mkspecs/linux-g++/qplatformdefs.h
+@@ -102,5 +102,6 @@
+ #define QT_VSNPRINTF		::vsnprintf
+ #endif
+ 
++#define QT_MITSHM
+ 
+ #endif // QPLATFORMDEFS_H
+--- qt.orig/mkspecs/linux-g++/qplatformdefs.h
++++ qt.patched/mkspecs/linux-g++/qplatformdefs.h
+@@ -102,5 +102,6 @@
+ #define QT_VSNPRINTF		::vsnprintf
+ #endif
+ 
++#define QT_MITSHM
+ 
+ #endif // QPLATFORMDEFS_H


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,402 @@
+#! /bin/sh -e
+## 24_qtc_qscrollview.dpatch by Germain Garand <germain@ebooksfrance.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix the qscrollview stuff
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- qt.orig/src/kernel/qpixmap_x11.cpp
++++ qt.patch/src/kernel/qpixmap_x11.cpp
+@@ -1278,9 +1278,6 @@ bool QPixmap::convertFromImage( const QI
+ 	    return FALSE;
+ 	int    bppc = xi->bits_per_pixel;
+ 
+-	if ( bppc > 8 && xi->byte_order == LSBFirst )
+-	    bppc++;
+-
+ 	bool contig_bits = n_bits(red_mask) == rbits &&
+                            n_bits(green_mask) == gbits &&
+                            n_bits(blue_mask) == bbits;
+@@ -1329,32 +1326,70 @@ bool QPixmap::convertFromImage( const QI
+ 	    }
+ 	    init=TRUE;
+ 	}
++        
++        enum { BPP8, 
++               BPP16_8_3_M3, BPP16_7_2_M3, BPP16_MSB, BPP16_LSB,
++               BPP24_MSB, BPP24_LSB,
++               BPP32_16_8_0, BPP32_MSB, BPP32_LSB
++        } mode = BPP8;
+ 
+-	for ( uint y=0; y<h; y++ ) {
+-	    uchar* src = image.scanLine( y );
+-	    uchar* dst = newbits + xi->bytes_per_line*y;
+-	    QRgb* p = (QRgb *)src;
++	if ( bppc > 8 && xi->byte_order == LSBFirst )
++	    bppc++;
+ 
+-#define GET_RGB \
+-		int r = qRed  ( *p ); \
+-		int g = qGreen( *p ); \
+-		int b = qBlue ( *p++ ); \
+-		r = red_shift   > 0 \
+-		    ? r << red_shift   : r >> -red_shift; \
+-		g = green_shift > 0 \
+-		    ? g << green_shift : g >> -green_shift; \
+-		b = blue_shift  > 0 \
+-		    ? b << blue_shift  : b >> -blue_shift;
++        int wordsize;
++        bool bigendian;
++        qSysInfo( &wordsize, &bigendian );
++        bool same_msb_lsb = ( xi->byte_order == MSBFirst ) == ( bigendian );
++        
++        if( bppc == 8 ) // 8 bit
++            mode = BPP8;
++        else if( bppc == 16 || bppc == 17 ) { // 16 bit MSB/LSB
++            if( red_shift == 8 && green_shift == 3 && blue_shift == -3
++                && !d8 && same_msb_lsb )
++                mode = BPP16_8_3_M3;
++            else if( red_shift == 7 && green_shift == 2 && blue_shift == -3
++                && !d8 && same_msb_lsb )
++                mode = BPP16_7_2_M3;
++            else
++                mode = bppc == 17 ? BPP16_LSB : BPP16_MSB;
++        } else if( bppc == 24 || bppc == 25 ) { // 24 bit MSB/LSB
++            mode = bppc == 25 ? BPP24_LSB : BPP24_MSB;
++        } else if( bppc == 32 || bppc == 33 ) { // 32 bit MSB/LSB
++            if( red_shift == 16 && green_shift == 8 && blue_shift == 0
++                && !d8 && same_msb_lsb )
++                mode = BPP32_16_8_0;
++            else
++                mode = bppc == 33 ? BPP32_LSB : BPP32_MSB;
++        } else
++	    qFatal("Logic error 3");
+ 
+ #define GET_PIXEL \
+                 int pixel; \
+ 		if ( d8 ) pixel = pix[*src++]; \
+ 		else { \
+-		    GET_RGB \
+-		    pixel = (b & blue_mask)|(g & green_mask) | (r & red_mask) \
++		    int r = qRed  ( *p ); \
++		    int g = qGreen( *p ); \
++		    int b = qBlue ( *p++ ); \
++		    r = red_shift   > 0 \
++		        ? r << red_shift   : r >> -red_shift; \
++		    g = green_shift > 0 \
++		        ? g << green_shift : g >> -green_shift; \
++		    b = blue_shift  > 0 \
++		        ? b << blue_shift  : b >> -blue_shift; \
++		    pixel = (r & red_mask)|(g & green_mask) | (b & blue_mask) \
+ 			    | ~(blue_mask | green_mask | red_mask); \
+ 		}
+ 
++// optimized case - no d8 case, shift only once instead of twice, mask only once instead of twice,
++// use direct values instead of variables, and use only one statement
++// (*p >> 16), (*p >> 8 ) and (*p) are qRed(),qGreen() and qBlue() without masking
++// shifts have to be passed including the shift operator (e.g. '>>3'), because of the direction
++#define GET_PIXEL_OPT(red_shift,green_shift,blue_shift,red_mask,green_mask,blue_mask) \
++                int pixel = ((( *p >> 16 ) red_shift ) & red_mask ) \
++                    | ((( *p >> 8 ) green_shift ) & green_mask ) \
++                    | ((( *p ) blue_shift ) & blue_mask ); \
++                ++p;
++
+ #define GET_PIXEL_DITHER_TC \
+ 		int r = qRed  ( *p ); \
+ 		int g = qGreen( *p ); \
+@@ -1374,91 +1409,177 @@ bool QPixmap::convertFromImage( const QI
+ 		    ? g << green_shift : g >> -green_shift; \
+ 		b = blue_shift  > 0 \
+ 		    ? b << blue_shift  : b >> -blue_shift; \
+-		int pixel = (b & blue_mask)|(g & green_mask) | (r & red_mask);
++		int pixel = (r & red_mask)|(g & green_mask) | (b & blue_mask);
+ 
+-	    if ( dither_tc ) {
+-		uint x;
+-		switch ( bppc ) {
+-		case 16:			// 16 bit MSB
+-		    for ( x=0; x<w; x++ ) {
+-			GET_PIXEL_DITHER_TC
+-			*dst++ = (pixel >> 8);
+-			*dst++ = pixel;
+-		    }
++// again, optimized case
++// can't be optimized that much :(
++#define GET_PIXEL_DITHER_TC_OPT(red_shift,green_shift,blue_shift,red_mask,green_mask,blue_mask, \
++                                rbits,gbits,bbits) \
++		const int thres = D[x%16][y%16]; \
++		int r = qRed  ( *p ); \
++		if ( r <= (255-(1<<(8-rbits))) && ((r<<rbits) & 255) \
++			> thres) \
++		    r += (1<<(8-rbits)); \
++		int g = qGreen( *p ); \
++		if ( g <= (255-(1<<(8-gbits))) && ((g<<gbits) & 255) \
++			> thres) \
++		    g += (1<<(8-gbits)); \
++		int b = qBlue ( *p++ ); \
++		if ( b <= (255-(1<<(8-bbits))) && ((b<<bbits) & 255) \
++			> thres) \
++		    b += (1<<(8-bbits)); \
++                int pixel = (( r red_shift ) & red_mask ) \
++                    | (( g green_shift ) & green_mask ) \
++                    | (( b blue_shift ) & blue_mask );
++
++#define CYCLE(body) \
++	for ( uint y=0; y<h; y++ ) { \
++	    uchar* src = image.scanLine( y ); \
++	    uchar* dst = newbits + xi->bytes_per_line*y; \
++	    QRgb* p = (QRgb *)src; \
++            body \
++        }
++
++        if ( dither_tc ) {
++	    switch ( mode ) {
++                case BPP16_8_3_M3:
++                    CYCLE(
++                        Q_INT16* dst16 = (Q_INT16*)dst;
++		        for ( uint x=0; x<w; x++ ) {
++			    GET_PIXEL_DITHER_TC_OPT(<<8,<<3,>>3,0xf800,0x7e0,0x1f,5,6,5)
++                            *dst16++ = pixel;
++		        }
++                    )
+ 		    break;
+-		case 17:			// 16 bit LSB
+-		    for ( x=0; x<w; x++ ) {
+-			GET_PIXEL_DITHER_TC
+-			*dst++ = pixel;
+-			*dst++ = pixel >> 8;
+-		    }
++                case BPP16_7_2_M3:
++                    CYCLE(
++                        Q_INT16* dst16 = (Q_INT16*)dst;
++		        for ( uint x=0; x<w; x++ ) {
++			    GET_PIXEL_DITHER_TC_OPT(<<7,<<2,>>3,0x7c00,0x3e0,0x1f,5,5,5)
++                            *dst16++ = pixel;
++		        }
++                    )
++		    break;
++		case BPP16_MSB:			// 16 bit MSB
++                    CYCLE(
++		        for ( uint x=0; x<w; x++ ) {
++			    GET_PIXEL_DITHER_TC
++			    *dst++ = (pixel >> 8);
++			    *dst++ = pixel;
++		        }
++                    )
++		    break;
++		case BPP16_LSB:			// 16 bit LSB
++                    CYCLE(
++    		        for ( uint x=0; x<w; x++ ) {
++			    GET_PIXEL_DITHER_TC
++			    *dst++ = pixel;
++			    *dst++ = pixel >> 8;
++		        }
++                    )
+ 		    break;
+ 		default:
+ 		    qFatal("Logic error");
+ 		}
+-	    } else {
+-		uint x;
+-		switch ( bppc ) {
+-		case 8:			// 8 bit
+-		    for ( x=0; x<w; x++ ) {
+-			int pixel = pix[*src++];
+-			*dst++ = pixel;
+-		    }
++	} else {
++	    switch ( mode ) {
++		case BPP8:			// 8 bit
++                    CYCLE(
++                    Q_UNUSED(p);
++		        for ( uint x=0; x<w; x++ ) {
++			    int pixel = pix[*src++];
++			    *dst++ = pixel;
++		        }
++                    )
+ 		    break;
+-		case 16:			// 16 bit MSB
+-		    for ( x=0; x<w; x++ ) {
+-			GET_PIXEL
+-			*dst++ = (pixel >> 8);
+-			*dst++ = pixel;
+-		    }
++                case BPP16_8_3_M3:
++                    CYCLE(
++                        Q_INT16* dst16 = (Q_INT16*)dst;
++		        for ( uint x=0; x<w; x++ ) {
++			    GET_PIXEL_OPT(<<8,<<3,>>3,0xf800,0x7e0,0x1f)
++                            *dst16++ = pixel;
++		        }
++                    )
+ 		    break;
+-		case 17:			// 16 bit LSB
+-		    for ( x=0; x<w; x++ ) {
+-			GET_PIXEL
+-			*dst++ = pixel;
+-			*dst++ = pixel >> 8;
+-		    }
++                case BPP16_7_2_M3:
++                    CYCLE(
++                        Q_INT16* dst16 = (Q_INT16*)dst;
++		        for ( uint x=0; x<w; x++ ) {
++			    GET_PIXEL_OPT(<<7,<<2,>>3,0x7c00,0x3e0,0x1f)
++                            *dst16++ = pixel;
++		        }
++                    )
+ 		    break;
+-		case 24:			// 24 bit MSB
+-		    for ( x=0; x<w; x++ ) {
+-			GET_PIXEL
+-			*dst++ = pixel >> 16;
+-			*dst++ = pixel >> 8;
+-			*dst++ = pixel;
+-		    }
++		case BPP16_MSB:			// 16 bit MSB
++                    CYCLE(
++		        for ( uint x=0; x<w; x++ ) {
++			    GET_PIXEL
++			    *dst++ = (pixel >> 8);
++			    *dst++ = pixel;
++		        }
++                    )
+ 		    break;
+-		case 25:			// 24 bit LSB
+-		    for ( x=0; x<w; x++ ) {
+-			GET_PIXEL
+-			*dst++ = pixel;
+-			*dst++ = pixel >> 8;
+-			*dst++ = pixel >> 16;
+-		    }
++		case BPP16_LSB:			// 16 bit LSB
++                    CYCLE(
++		        for ( uint x=0; x<w; x++ ) {
++			    GET_PIXEL
++			    *dst++ = pixel;
++			    *dst++ = pixel >> 8;
++		        }
++                    )
+ 		    break;
+-		case 32:			// 32 bit MSB
+-		    for ( x=0; x<w; x++ ) {
+-			GET_PIXEL
+-			*dst++ = pixel >> 24;
+-			*dst++ = pixel >> 16;
+-			*dst++ = pixel >> 8;
+-			*dst++ = pixel;
+-		    }
++		case BPP24_MSB:			// 24 bit MSB
++                    CYCLE(
++		        for ( uint x=0; x<w; x++ ) {
++			    GET_PIXEL
++			    *dst++ = pixel >> 16;
++			    *dst++ = pixel >> 8;
++			    *dst++ = pixel;
++		        }
++                    )
+ 		    break;
+-		case 33:			// 32 bit LSB
+-		    for ( x=0; x<w; x++ ) {
+-			GET_PIXEL
+-			*dst++ = pixel;
+-			*dst++ = pixel >> 8;
+-			*dst++ = pixel >> 16;
+-			*dst++ = pixel >> 24;
+-		    }
++		case BPP24_LSB:			// 24 bit LSB
++                    CYCLE(
++		        for ( uint x=0; x<w; x++ ) {
++			    GET_PIXEL
++			    *dst++ = pixel;
++			    *dst++ = pixel >> 8;
++			    *dst++ = pixel >> 16;
++		        }
++                    )
+ 		    break;
+-		default:
+-		    qFatal("Logic error 2");
+-		}
+-	    }
+-	}
+-	xi->data = (char *)newbits;
++                case BPP32_16_8_0:
++                    CYCLE(
++                        memcpy( dst, p, w * 4 );
++                    )
++                    break;
++		case BPP32_MSB:			// 32 bit MSB
++                    CYCLE(
++		        for ( uint x=0; x<w; x++ ) {
++			    GET_PIXEL
++			    *dst++ = pixel >> 24;
++			    *dst++ = pixel >> 16;
++			    *dst++ = pixel >> 8;
++			    *dst++ = pixel;
++		        }
++                    )
++		    break;
++		case BPP32_LSB:			// 32 bit LSB
++                    CYCLE(
++		        for ( uint x=0; x<w; x++ ) {
++			    GET_PIXEL
++			    *dst++ = pixel;
++			    *dst++ = pixel >> 8;
++			    *dst++ = pixel >> 16;
++			    *dst++ = pixel >> 24;
++		        }
++                    )
++  		    break;
++  		default:
++  		    qFatal("Logic error 2");
++  	    }
++  	}
++  	xi->data = (char *)newbits;
+     }
+ 
+     if ( d == 8 && !trucol ) {			// 8 bit pixmap
+@@ -1738,15 +1859,24 @@ bool QPixmap::convertFromImage( const QI
+ 
+ 		if (image.depth() == 32) {
+ 		    const int *iptr = (const int *) image.bits();
+-		    int max = w * h;
+-		    while (max--)
+-			*aptr++ = *iptr++ >> 24; // squirt
++                    if( axi->bytes_per_line == (int)w ) {
++		        int max = w * h;
++		        while (max--)
++			    *aptr++ = *iptr++ >> 24; // squirt
++                    } else {
++                        for (uint i = 0; i < h; ++i ) {
++                            for (uint j = 0; j < w; ++j )
++                                *aptr++ = *iptr++ >> 24; // squirt
++                            aptr += ( axi->bytes_per_line - w );
++                        }
++                    }
+ 		} else if (image.depth() == 8) {
+ 		    const QRgb * const rgb = image.colorTable();
+ 		    for (uint y = 0; y < h; ++y) {
+ 			const uchar *iptr = image.scanLine(y);
+ 			for (uint x = 0; x < w; ++x)
+ 			    *aptr++ = qAlpha(rgb[*iptr++]);
++                        aptr += ( axi->bytes_per_line - w );
+ 		    }
+ 		}
+ 


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+## 24_qtc_qscrollview.dpatch by Germain Garand <germain@ebooksfrance.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix the qscrollview stuff
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- qt.orig/src/widgets/qscrollview.cpp
++++ qt.patch/src/widgets/qscrollview.cpp
+@@ -1551,6 +1551,9 @@
+         case QEvent::LayoutHint:
+             d->autoResizeHint(this);
+             break;
++        case QEvent::WindowActivate:
++        case QEvent::WindowDeactivate:
++            return TRUE;
+         default:
+             break;
+         }


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,51 @@
+#! /bin/sh -e
+## 24_qtc_qscrollview.dpatch by Germain Garand <germain@ebooksfrance.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix the qscrollview stuff
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- qt.orig/src/kernel/qpngio.cpp
++++ qt.patch/src/kernel/qpngio.cpp
+@@ -109,12 +109,20 @@ void CALLBACK_CALL_TYPE qpiw_flush_fn( p
+ 
+ static
+ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float screen_gamma=0.0 )
+ {
+-    if ( screen_gamma != 0.0 && png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA) ) {
++    if ( 0.0 == screen_gamma )
++	// PNG docs say this is a good guess for a PC monitor
++        // in a dark room
++	screen_gamma = 2.2;
++    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA) ) {
++	// the file has a gAMA attribute
+ 	double file_gamma;
+-	png_get_gAMA(png_ptr, info_ptr, &file_gamma);
+-	png_set_gamma( png_ptr, screen_gamma, file_gamma );
++	if ( png_get_gAMA(png_ptr, info_ptr, &file_gamma))
++	    png_set_gamma( png_ptr, screen_gamma, file_gamma );
++    } else {
++	// no file gamma, use a reasonable default
++	png_set_gamma( png_ptr, screen_gamma, 0.45455 ); 
+     }
+ 
+     png_uint_32 width;
+     png_uint_32 height;


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/30_gcc4_build.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/30_gcc4_build.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/30_gcc4_build.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,32 @@
+#! /bin/sh -e
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- qt.orig/src/kernel/qsizepolicy.h
++++ qt.patched/src/kernel/qsizepolicy.h
+@@ -88,7 +88,7 @@
+     }
+ 
+     void setHorData( SizeType d ) { data = (Q_UINT32)(data & ~HMask) | d; }
+-    void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~(HMask << HSize)) |
++    void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~VMask) |
+ 					   (d << HSize); }
+ 		
+     void setHeightForWidth( bool b ) { data = b ? (Q_UINT32)( data | ( 1 << 2*HSize ) )


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/30_gcc4_build.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,33 @@
+#! /bin/sh -e
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- qt.orig/configure
++++ qt.patched/configure
+@@ -3092,6 +3092,9 @@
+     *3.*)
+ 	COMPILER_VERSION="3.*"
+ 	;;
++    *4.*)
++        COMPILER_VERSION="4.*"
++        ;;
+     *)
+ 	;;
+     esac


Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: people/chrsmrtn/qt-x11-free/debian/qt3-apps-dev.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-apps-dev.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-apps-dev.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,7 @@
+usr/lib/libeditor.prl
+usr/lib/libeditor.a
+usr/lib/libdesignercore.prl
+usr/lib/libdesignercore.a
+usr/lib/libqassistantclient.prl
+usr/lib/libqassistantclient.a
+usr/include/qt3/qassistantclient.h

Added: people/chrsmrtn/qt-x11-free/debian/qt3-apps-dev.links
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-apps-dev.links	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-apps-dev.links	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,8 @@
+/usr/lib/libeditor.prl /usr/share/qt3/lib/libeditor.prl
+/usr/lib/libeditor.a /usr/share/qt3/lib/libeditor.a
+/usr/lib/libdesignercore.prl /usr/share/qt3/lib/libdesignercore.prl
+/usr/lib/libdesignercore.a /usr/share/qt3/lib/libdesignercore.a
+/usr/lib/libqassistantclient.prl /usr/share/qt3/lib/libqassistantclient.prl
+/usr/lib/libqassistantclient.a /usr/share/qt3/lib/libqassistantclient.a
+/usr/include/qt3 /usr/share/qt3/tools/designer/editor
+/usr/include/qt3 /usr/share/qt3/tools/designer/interfaces

Added: people/chrsmrtn/qt-x11-free/debian/qt3-assistant.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-assistant.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-assistant.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,3 @@
+usr/bin/assistant
+usr/share/qt3/doc/html/assistant*html
+usr/share/qt3/doc/html/assistant*dcf

Added: people/chrsmrtn/qt-x11-free/debian/qt3-assistant.menu
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-assistant.menu	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-assistant.menu	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,6 @@
+?package(qt3-assistant):\
+        needs="X11"\
+        section="Apps/System"\
+        hints="KDE"\
+        title="Qt Assistant"\
+        command="/usr/bin/assistant"

Added: people/chrsmrtn/qt-x11-free/debian/qt3-designer.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-designer.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-designer.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,8 @@
+usr/bin/designer
+usr/bin/createcw
+usr/bin/conv2ui
+usr/share/qt3/templates/*
+usr/share/qt3/doc/html/designer*html
+usr/share/qt3/doc/html/designer*dcf
+usr/share/qt3/doc/html/designer*jpg
+usr/lib/qt3/plugins/designer/*

Added: people/chrsmrtn/qt-x11-free/debian/qt3-designer.menu
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-designer.menu	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-designer.menu	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,6 @@
+?package(qt3-designer):\
+        needs="X11"\
+        section="Apps/Programming"\
+        hints="KDE"\
+        title="Qt Designer"\
+        command="/usr/bin/designer-qt3"

Added: people/chrsmrtn/qt-x11-free/debian/qt3-designer.postinst
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-designer.postinst	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-designer.postinst	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/designer designer "/usr/bin/designer-qt3" "35" \
+	--slave /usr/share/man/man1/designer.1.gz designer.1.gz \
+	"/usr/share/man/man1/designer-qt3.1.gz"
+
+#DEBHELPER#

Added: people/chrsmrtn/qt-x11-free/debian/qt3-designer.prerm
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-designer.prerm	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-designer.prerm	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove designer "/usr/bin/designer-qt3"
+    ;;
+esac
+
+#DEBHELPER#

Added: people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools-compat.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools-compat.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools-compat.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,6 @@
+usr/bin/qt20fix
+usr/bin/qtrename140
+usr/bin/qm2ts
+usr/bin/mergetr
+usr/bin/findtr
+usr/bin/msg2qm

Added: people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools-embedded.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools-embedded.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools-embedded.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,2 @@
+usr/bin/makeqpf
+usr/bin/qvfb

Added: people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools-embedded.links
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools-embedded.links	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools-embedded.links	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,2 @@
+/usr/bin/makeqpf /usr/share/qt3/bin/makeqpf
+/usr/bin/qvfb /usr/share/qt3/bin/qvfb

Added: people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,9 @@
+usr/share/qt3/mkspecs/*
+usr/share/qt3/doc/html/qmake*html
+usr/share/qt3/doc/html/qmake*dcf
+usr/bin/qmake
+usr/bin/lupdate
+usr/bin/lrelease
+usr/bin/uic
+usr/bin/moc
+usr/bin/qembed

Added: people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.links
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.links	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.links	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,7 @@
+/usr/share/qt3/mkspecs/linux-g++ /usr/share/qt3/mkspecs/default
+/usr/bin/qmake /usr/share/qt3/bin/qmake
+/usr/bin/lupdate /usr/share/qt3/bin/lupdate
+/usr/bin/lrelease /usr/share/qt3/bin/lrelease
+/usr/bin/uic-qt3 /usr/share/qt3/bin/uic
+/usr/bin/moc-qt3 /usr/share/qt3/bin/moc
+/usr/bin/qembed /usr/share/qt3/bin/qembed

Added: people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.postinst
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.postinst	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.postinst	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,15 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/moc moc "/usr/bin/moc-qt3" "35" \
+	--slave /usr/share/man/man1/moc.1.gz moc.1.gz \
+	"/usr/share/man/man1/moc-qt3.1.gz"
+
+update-alternatives --install \
+        /usr/bin/uic uic "/usr/bin/uic-qt3" "35" \
+	--slave /usr/share/man/man1/uic.1.gz uic.1.gz \
+	"/usr/share/man/man1/uic-qt3.1.gz"
+			
+#DEBHELPER#

Added: people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.prerm
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.prerm	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.prerm	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove moc "/usr/bin/moc-qt3"
+    update-alternatives --remove uic "/usr/bin/uic-qt3"
+    ;;
+esac
+
+#DEBHELPER#

Added: people/chrsmrtn/qt-x11-free/debian/qt3-doc.doc-base
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-doc.doc-base	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-doc.doc-base	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,11 @@
+Document: qt3-doc
+Title: Qt Reference Documentation
+Author: Troll Tech
+Abstract: Qt (TM) is a multi-platform C++ GUI toolkit. It is a product of
+ Troll Tech. It is supported on all major variants of Microsoft Windows and
+ Unix/X Windows. 
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/qt3-doc/html/index.html
+Files: /usr/share/doc/qt3-doc/html/*.html

Added: people/chrsmrtn/qt-x11-free/debian/qt3-doc.docs
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-doc.docs	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-doc.docs	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,2 @@
+FAQ
+README-QT.TXT

Added: people/chrsmrtn/qt-x11-free/debian/qt3-doc.links
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-doc.links	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-doc.links	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1 @@
+/usr/share/man/man3 /usr/share/qt3/doc/man/man3

Added: people/chrsmrtn/qt-x11-free/debian/qt3-linguist.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-linguist.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-linguist.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,4 @@
+usr/bin/linguist
+usr/share/qt3/phrasebooks/*
+usr/share/qt3/doc/html/linguist*html
+usr/share/qt3/doc/html/linguist*dcf

Added: people/chrsmrtn/qt-x11-free/debian/qt3-linguist.menu
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-linguist.menu	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-linguist.menu	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,6 @@
+?package(qt3-linguist):\
+        needs="X11"\
+        section="Apps/Programming"\
+        hints="KDE"\
+        title="Qt Linguist"\
+        command="/usr/bin/linguist"

Added: people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.install	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.install	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1 @@
+usr/bin/qtconfig

Added: people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.menu
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.menu	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.menu	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,5 @@
+?package(qt3-qtconfig):\
+        needs="X11"\
+        section="Apps/System"\
+        title="QtConfig"\
+        command="/usr/bin/qtconfig"

Added: people/chrsmrtn/qt-x11-free/debian/rules
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/rules	2005-07-06 06:58:25 UTC (rev 1254)
+++ people/chrsmrtn/qt-x11-free/debian/rules	2005-07-07 04:47:25 UTC (rev 1255)
@@ -0,0 +1,393 @@
+#!/usr/bin/make -f
+
+# build variables
+export QTDIR=$(shell pwd)
+
+# re-set $(LD_LIBRARY_PATH)
+OLD_LD_LIBRARY_PATH := $(LD_LIBRARY_PATH)
+export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH)
+
+# fix path
+OLD_PATH := $(PATH)
+export PATH=$(QTDIR)/bin:$(OLD_PATH)
+
+DEB_BUILD_GNU_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_GNU_CPU   ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+# dpatch stuff
+include /usr/share/dpatch/dpatch.make
+
+# build variables (directorys)
+DEBIAN = $(shell pwd)/debian
+P_LIBS = $(DEBIAN)/libqt3c102-mt
+P_DOC = $(DEBIAN)/qt3-doc
+P_APPSDEV = $(DEBIAN)/qt3-apps-dev
+P_HEADERS = $(DEBIAN)/libqt3-headers
+P_QTMTDEV = $(DEBIAN)/libqt3-mt-dev
+
+TMP_INSTALL = $(DEBIAN)/tmp-install
+
+CONFIGURE_OPTS = -prefix "/usr" -docdir "/usr/share/qt3/doc" -headerdir "/usr/include/qt3" \
+		-datadir "/usr/share/qt3" -plugindir "/usr/lib/qt3/plugins" \
+		-translationdir "/usr/share/qt3/translations" -sysconfdir "/etc/qt3" \
+		-system-zlib -system-libpng -system-libjpeg -system-libmng -qt-gif \
+		-qt-imgfmt-jpeg -qt-imgfmt-png -qt-imgfmt-mng \
+		-plugin-sql-odbc -plugin-sql-psql -plugin-sql-mysql -plugin-sql-ibase \
+		-plugin-sql-sqlite -I/usr/include/mysql -I/usr/include/freetype2 \
+		-I/usr/include/postgresql -I/usr/include/postgresql/server -lfontconfig \
+		-stl -xinerama -xrandr -system-nas-sound -cups -thread -xft -xcursor -sm \
+		-no-exceptions -platform linux-g++ -fast -enable-opengl -dlopen-opengl \
+		-xkb -tablet -xrender -xshape -nis -debug
+
+ifeq ($(DEB_BUILD_GNU_ARCH),i386)
+	IBASE =
+else
+	IBASE = -Nlibqt3c102-mt-ibase
+	CONFIGURE_OPTS += -no-sql-ibase
+endif
+
+ifeq ($(DEB_BUILD_GNU_ARCH),arm)
+	CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
+endif
+
+build: patch libqt-thread-stamp
+
+	touch build-stamp
+
+libqt-thread-stamp:
+
+	@echo "QTDIR is ${QTDIR}"
+
+	dh_testdir
+
+	echo yes | ./configure $(CONFIGURE_OPTS)
+
+	# proceed
+	make sub-src sub-plugins sub-tools
+	make -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
+	make INSTALL_ROOT=$(TMP_INSTALL) install
+	make INSTALL_ROOT=$(TMP_INSTALL) plugins-install
+
+	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
+	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+
+	cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/
+	cp bin/qt20fix $(TMP_INSTALL)/usr/bin/
+	cp bin/findtr $(TMP_INSTALL)/usr/bin/
+	# build conv2ui
+	cd tools/designer/tools/conv2ui && make
+	cp bin/conv2ui $(TMP_INSTALL)/usr/bin/conv2ui
+
+	# build qvfb
+	cd tools/qvfb/ && make
+	cp tools/qvfb/qvfb $(TMP_INSTALL)/usr/bin/qvfb
+
+	# install qmake.cache file
+	install -d $(P_QTMTDEV)/usr/share/qt3/
+	cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/qt3#g" > $(P_QTMTDEV)/usr/share/qt3/.qmake.cache
+
+	# install qconfig.h for the mt
+	install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/qt3/qconfig.h
+	install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/qt3/qmodules.h
+
+	touch libqt-thread-stamp
+
+clean: unpatch
+
+	dh_testdir
+
+	-rm -rf debian/patched
+	-rm -rf build-stamp libqt-thread-stamp
+
+	-chmod -R u+w *
+	-chmod a-x doc/html/layout?.png
+
+	if [ -f "src/Makefile" ]; then \
+		make -C src clean; make -C plugins/src distclean; make -C tools distclean; \
+		make -C tools/makeqpf distclean; make -C tools/qconfig distclean; make -C tools/qvfb distclean; \
+		make -C tools/msg2qm distclean; make -C tools/mergetr distclean; make -C tools/qembed distclean; \
+		make -C tools/designer/tools/conv2ui distclean; make -C tools/designer/tools/createcw distclean; \
+		make -C tools/designer/plugins/glade distclean; make -C tools/designer/plugins/qglwidget distclean; \
+		make -C config.tests/unix/largefile distclean; make -C qmake distclean; \
+	fi
+
+	-rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \
+		config.status bin/moc bin/qmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \
+		src/tools/qconfig.cpp include/qconfig.h include/qmodules.h plugins/accessibleqtwidgets.prl \
+		config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \
+		config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \
+		config.tests/unix/endian/endiantest lib/qt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \
+		extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
+
+	# delete generated Makefiles but save the toplevel Makefile
+	-mv Makefile Makefile.save
+	for a in `find . -name 'Makefile'`; do rm -f "$$a"; done
+	-mv Makefile.save Makefile
+
+	cd examples/ && find . -name '.obj' | xargs rm -rf
+
+	-rm -f include/qglobal.h
+	ln -s ../src/tools/qglobal.h include/qglobal.h
+
+	perl -pi -e 's{$(QTDIR)}{\$$\$$QT_SOURCE_TREE}' src/qt_professional.pri
+
+	dh_clean
+
+install: build
+
+	dh_testdir
+	dh_testroot
+	
+	dh_clean -i
+	dh_installdirs
+
+	# fix .prl files
+	for a in $(TMP_INSTALL)/usr/lib/*prl; do cat "$$a" | sed \
+	"s#$(QTDIR)#/usr/share/qt3#g" > "$$a".new && mv "$$a".new "$$a"; done
+
+	dh_install $(IBASE) --sourcedir=$(TMP_INSTALL)
+
+	## build qt3-doc package
+	# copy all docs there first
+	install -d $(P_DOC)/usr/share/qt3/doc/html/
+	for a in `cd $(TMP_INSTALL)/usr/share/qt3/doc/html/ && find`; do cp $(TMP_INSTALL)/usr/share/qt3/doc/html/"$$a" $(P_DOC)/usr/share/qt3/doc/html/; done
+
+	## build designer package documentation
+	# qt3-designer
+	install -d `pwd`/debian/qt3-designer/usr/share/qt3/doc/html/
+	for a in `cat doc/html/designer*.{html,dcf} | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
+	perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \
+	sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/qt3-designer/usr/share/qt3/doc/html/ && \
+	rm -rf $(P_DOC)/usr/share/qt3/doc/html/"$$a" || true; done
+	rm -rf outputfile `pwd`/debian/qt3-designer/usr/share/qt3/doc/html/logo32.png
+	rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/designer*
+
+	## build linguist package documentation
+	# qt3-linguist
+	install -d `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html/
+	for a in `cat doc/html/linguist*.{html,dcf} | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
+	perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \
+	sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html/ && \
+	rm -rf $(P_DOC)/usr/share/qt3/doc/html/"$$a" || true; done
+	rm -rf outputfile `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html/logo32.png
+	rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/linguist*
+	
+	## qt3-assistant
+	# remove docs from qt3-doc for qt-assistant
+	rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/assistant*
+
+	chmod 644 debian/qt3-dev-tools/usr/share/qt3/mkspecs/aix-g++-64/qplatformdefs.h
+	chmod 644 debian/qt3-dev-tools/usr/share/qt3/mkspecs/macx-pbuilder/Info.plist.app
+
+binary-indep: build install
+
+	# Build architecture-independent files here.
+	dh_testdir
+	dh_testroot
+	
+	dh_installdocs -i -XREADME.Debian
+	dh_installchangelogs -i changes-3.3.4
+								
+	find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/qt3/doc/
+			
+	-rm -f `find $(P_DOC)/usr/share/qt3/doc/ -name "*.o"`
+	find $(P_DOC) -type f -perm +0100 | xargs --no-run-if-empty rm -f
+
+	install -d $(P_DOC)/usr/share/man/man3/
+
+	for i in $(P_DOC)/usr/share/qt3/doc/doc/man/man3/* ; do mv $$i $(P_DOC)/usr/share/man/man3/ ; done
+	
+	-rm -rf $(P_DOC)/usr/share/qt3/doc/doc
+
+	# other i18n files
+	for a in `cd translations/ && find . -name 'qt_*.qm' | sed 's/qt_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -D `pwd`/translations/qt_"$$a".qm `pwd`/debian/libqt3-i18n/usr/share/qt3/translations/qt_"$$a".qm; done
+
+	# logo32.png
+	cp `pwd`/doc/html/logo32.png `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/
+
+	# remove qmake html docu from qt3-doc
+	rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/qmake*
+
+	# create examples package
+	install -d `pwd`/debian/doc/qt3-examples/tools/{designer,linguist}
+	cp -ax examples `pwd`/debian/doc/qt3-examples
+	cp -ax tutorial `pwd`/debian/doc/qt3-examples
+	cp -ax tools/designer/examples `pwd`/debian/doc/qt3-examples/tools/designer/
+	cp -ax tools/linguist/tutorial `pwd`/debian/doc/qt3-examples/tools/linguist/
+	for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'tt1'`; do rm -f "$$a"; done
+	for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'tt2'`; do rm -f "$$a"; done
+	for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'tt3'`; do rm -f "$$a"; done
+	for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name '.moc'`; do rm -rf "$$a"; done
+	for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name '.obj'`; do rm -rf "$$a"; done
+	for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'Makefile'`; do rm -f "$$a"; done
+	install -D `pwd`/debian/maintain/build-examples.sh `pwd`/debian/doc/qt3-examples/build-examples
+	chmod 755 `pwd`/debian/doc/qt3-examples/build-examples
+	cd `pwd`/debian/doc/ && tar cvvfz qt3-examples.tar.gz qt3-examples/
+	install -D `pwd`/debian/doc/qt3-examples.tar.gz `pwd`/debian/qt3-examples/usr/share/doc/qt3-examples/qt3-examples.tar.gz
+	
+	dh_link -pqt3-doc usr/share/qt3/doc/html usr/share/doc/qt3-doc/html
+
+	# proceed
+	dh_compress -i -Xhtml/
+	dh_link -i
+	
+	dh_fixperms -i
+	dh_installdeb -i
+	
+	dh_perl -i
+	dh_shlibdeps -i
+	
+	# 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
+
+	dh_gencontrol -i
+	dh_md5sums -i
+	
+	dh_builddeb -i
+	
+binary-arch: build install
+
+	dh_testdir
+	dh_testroot
+	dh_installdirs -a
+
+	## create qt3-apps-dev-package
+	install -d $(P_APPSDEV)/usr/include/qt3/
+	cp `pwd`/tools/designer/interfaces/*.h $(P_APPSDEV)/usr/include/qt3/
+	cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/qt3/
+	rm -rf `pwd`/debian/qt3-apps-dev/usr/include/qt3/preferences.ui.h
+	
+	## qvfb package
+	install -m644 -D `pwd`/tools/qvfb/pda.skin `pwd`/debian/qt3-dev-tools-embedded/etc/qt3/qvfb/pda.skin
+	install -m644 -D `pwd`/tools/qvfb/pda_down.png `pwd`/debian/qt3-dev-tools-embedded/usr/share/qvfb/pda_down.png
+	install -m644 -D `pwd`/tools/qvfb/pda_up.png `pwd`/debian/qt3-dev-tools-embedded/usr/share/qvfb/pda_up.png
+	
+	# remove utterly ugle symlink
+	rm -rf `pwd`/debian/qt3-dev-tools//usr/share/qt3/mkspecs/linux-g++/linux-g++
+	
+	# language file for linguist
+	install -d `pwd`/debian/qt3-linguist/usr/share/doc/qt3-linguist/
+	cp translations/qt_untranslated.ts `pwd`/debian/qt3-linguist/usr/share/doc/qt3-linguist/
+	
+	# fix that stupid friggin professional file
+	perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri
+	
+	## i18n files for designer, linguist and assistant
+	(cd `pwd`/tools/designer/designer/ && lrelease designer.pro)
+	for a in `cd tools/designer/designer/ && find . -name 'designer_*.qm' | sed 's/designer_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -D tools/designer/designer/designer_"$$a".qm `pwd`/debian/qt3-designer/usr/share/qt3/translations/designer_"$$a".qm; done
+	rm -rf `pwd`/tools/designer/designer/*.qm
+		
+	(cd `pwd`/tools/assistant/ && lrelease assistant.pro)
+	for a in `cd tools/assistant/ && find . -name 'assistant_*.qm' | sed 's/assistant_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -D tools/assistant/assistant_"$$a".qm `pwd`/debian/qt3-assistant/usr/share/qt3/translations/assistant_"$$a".qm; done
+	rm -rf `pwd`/tools/assistant/*.qm `pwd`/debian/libqt3-i18n/usr/share/qt3/translations/assistant_de.qm
+
+	(cd `pwd`/tools/linguist/linguist/ && lrelease linguist.pro)
+	for a in `cd tools/linguist/linguist/ && find . -name 'linguist_*.qm' | sed 's/linguist_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -D tools/linguist/linguist/linguist_"$$a".qm `pwd`/debian/qt3-linguist/usr/share/qt3/translations/linguist_"$$a".qm; done
+	rm -rf `pwd`/tools/linguist/linguist/*.qm
+
+	# desktop lnk files
+	install -m644 -D debian/maintain/designer-qt3.desktop `pwd`/debian/qt3-designer/usr/share/applnk/Development/designer-qt3.desktop
+	install -m644 -D debian/maintain/linguist.desktop `pwd`/debian/qt3-linguist/usr/share/applnk/Development/linguist.desktop
+	
+	install -m644 -D debian/maintain/assistant.desktop `pwd`/debian/qt3-assistant/usr/share/applnk/System/assistant.desktop
+	install -m644 -D debian/maintain/qtconfig.desktop `pwd`/debian/qt3-qtconfig/usr/share/applnk/Settingsmenu/qtconfig.desktop
+	
+	# include logo32 for every program
+	cd `pwd`/debian/qt3-designer/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-designer/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	cd `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-linguist/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	cd `pwd`/debian/qt3-assistant/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-assistant/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	cd `pwd`/debian/qt3-dev-tools/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-qmake/g' > "$$a".new && mv "$$a".new "$$a"; done
+	
+	for a in designer linguist assistant; do install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/qt3-"$$a"/usr/share/qt3/doc/html/logo32-"$$a".png; done
+	install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/qt3-dev-tools/usr/share/qt3/doc/html/logo32-qmake.png
+	
+	# fix qmake.conf files
+	cd `pwd`/debian/qt3-dev-tools/usr/share/qt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/qt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/qt3/g' | \
+	sed 's/\-I\/usr\/include/&\/qt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done
+
+	# build attic package and copy it to libqt3-ompat-headers
+	cd `pwd`/src/ && tar cvvfz attic.tar.gz attic/
+	install -D `pwd`/src/attic.tar.gz `pwd`/debian/libqt3-compat-headers/usr/share/doc/libqt3-compat-headers/attic.tar.gz
+	rm -rf `pwd`/src/attic.tar.gz
+
+	# rename some binaries to make qt2/3 installations possible
+	mv `pwd`/debian/qt3-designer/usr/bin/designer `pwd`/debian/qt3-designer/usr/bin/designer-qt3
+	mv `pwd`/debian/qt3-dev-tools/usr/bin/uic `pwd`/debian/qt3-dev-tools/usr/bin/uic-qt3
+	mv `pwd`/debian/qt3-dev-tools/usr/bin/moc `pwd`/debian/qt3-dev-tools/usr/bin/moc-qt3
+	install -D debian/maintain/man/designer.1 `pwd`/debian/qt3-designer/usr/share/man/man1/designer-qt3.1
+	install -D doc/man/man1/moc.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/moc-qt3.1
+	install -D doc/man/man1/uic.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/uic-qt3.1
+
+	dh_link -pqt3-designer usr/share/qt3/doc/html usr/share/doc/qt3-designer/html
+	dh_link -pqt3-assistant usr/share/qt3/doc/html usr/share/doc/qt3-assistant/html
+	dh_link -pqt3-linguist usr/share/qt3/doc/html usr/share/doc/qt3-linguist/html
+	dh_link -pqt3-dev-tools usr/share/qt3/doc/html usr/share/doc/qt3-dev-tools/html
+
+	# install the manpages we have
+	dh_installman -pqt3-designer debian/maintain/man/createcw.1
+	dh_installman -pqt3-dev-tools-compat debian/maintain/man/qt20fix.1 debian/maintain/man/mergetr.1 debian/maintain/man/findtr.1 debian/maintain/man/msg2qm.1
+	dh_installman -pqt3-dev-tools-embedded debian/maintain/man/makeqpf.1 debian/maintain/man/qvfb.1
+	dh_installman -pqt3-dev-tools doc/man/man1/lupdate.1 doc/man/man1/lrelease.1 debian/maintain/man/qembed.1
+	dh_installman -pqt3-qtconfig debian/maintain/man/qtconfig.1
+	dh_installman -pqt3-linguist debian/maintain/man/linguist.1
+
+	# copy README.Debian
+	for a in libqt3-mt-dev qt3-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/qt3-dev-tools/usr/bin/qmake
+	install -D `pwd`/qmake/qmake `pwd`/debian/qt3-dev-tools/usr/bin/qmake
+
+	# Install source for the designer tools, such as createcw.
+	cp -ra tools/designer/tools debian/qt3-designer/usr/share/qt3/tools
+	rm -f debian/qt3-designer/usr/share/qt3/tools/createcw/createcw
+	rm -rf debian/qt3-designer/usr/share/qt3/tools/createcw/.moc
+	rm -rf debian/qt3-designer/usr/share/qt3/tools/createcw/.obj
+	rm -f debian/qt3-designer/usr/share/qt3/tools/createcw/Makefile
+	rm -f debian/qt3-designer/usr/share/qt3/tools/conv2ui/conv2ui
+	rm -rf debian/qt3-designer/usr/share/qt3/tools/conv2ui/.moc
+	rm -rf debian/qt3-designer/usr/share/qt3/tools/conv2ui/.obj
+	rm -f debian/qt3-designer/usr/share/qt3/tools/conv2ui/Makefile
+
+	# run remaining debhelper scripts
+	dh_installdocs -a $(IBASE) -XREADME.Debian
+	dh_installmenu -a $(IBASE)
+	
+	dh_installchangelogs -a $(IBASE) changes-3.3.4
+
+	dh_link -a $(IBASE)
+	dh_strip -a $(IBASE) --dbg-package=libqt3c102-mt
+	dh_compress -a $(IBASE)
+	dh_fixperms -a $(IBASE)
+	
+	# run remaining debhelper scripts
+	dh_makeshlibs -a $(IBASE) -V
+	dh_installdeb -a $(IBASE)
+	dh_perl -a $(IBASE)
+	dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libqt3c102-mt/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 qt3-dev-tools-embedded
+	echo "/etc/qt3/qvfb/pda.skin" > `pwd`/debian/qt3-dev-tools-embedded/DEBIAN/conffiles
+	
+	dh_gencontrol -a $(IBASE)
+	dh_md5sums -a $(IBASE)
+	dh_builddeb -a $(IBASE)
+
+binary: binary-indep binary-arch
+.PHONY: build binary-indep binary-arch binary install clean patch unpatch


Property changes on: people/chrsmrtn/qt-x11-free/debian/rules
___________________________________________________________________
Name: svn:executable
   + *