rev 4110 - in people/jriddell/qt/debian: . maintain maintain/man patches

Jonathan Riddell jriddell-guest at costa.debian.org
Thu Jul 13 08:50:45 UTC 2006


Author: jriddell-guest
Date: 2006-07-13 08:50:43 +0000 (Thu, 13 Jul 2006)
New Revision: 4110

Modified:
   people/jriddell/qt/debian/KUBUNTU-DEBIAN-CHANGES
   people/jriddell/qt/debian/changelog
   people/jriddell/qt/debian/compat
   people/jriddell/qt/debian/control
   people/jriddell/qt/debian/libqt3-mt-dev.links
   people/jriddell/qt/debian/libqt3-mt.install
   people/jriddell/qt/debian/libqt3-mt.links
   people/jriddell/qt/debian/maintain/assistant-qt3.desktop
   people/jriddell/qt/debian/maintain/designer-qt3.desktop
   people/jriddell/qt/debian/maintain/man/linguist.1
   people/jriddell/qt/debian/patches/00list
   people/jriddell/qt/debian/patches/25_qtc_qpixmap_mitshm.dpatch
   people/jriddell/qt/debian/rules
Log:
qt synced back to debian too


Modified: people/jriddell/qt/debian/KUBUNTU-DEBIAN-CHANGES
===================================================================
--- people/jriddell/qt/debian/KUBUNTU-DEBIAN-CHANGES	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/KUBUNTU-DEBIAN-CHANGES	2006-07-13 08:50:43 UTC (rev 4110)
@@ -1,3 +1,4 @@
-No firebird/ibase build (remove build-dep, control entry, ./configure option), firebird is not in Ubuntu main
-kubuntu_01_visibility.dpatch for gcc 4 visibility
+No firebird/ibase build (remove build-dep, control entry, ibase ./configure option), firebird is not in Ubuntu main
 gl build-deps different
+install qtrc (change rules, qtrc file)
+compile with -inputmethod-ext

Modified: people/jriddell/qt/debian/changelog
===================================================================
--- people/jriddell/qt/debian/changelog	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/changelog	2006-07-13 08:50:43 UTC (rev 4110)
@@ -1,3 +1,260 @@
+qt-x11-free (3:3.3.6-2ubuntu1) edgy; urgency=low
+
+  * Synchronise with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 26 Jun 2006 09:51:03 +0000
+
+qt-x11-free (3:3.3.6-2) unstable; urgency=low
+
+  +++ Changes by Pierre Habouzit:
+
+  * Update debian/control for new kfreebsd-amd64 port. (Closes: #361494)
+
+  +++ Changes by Christopher Martin:
+
+  * Remove obsolete xlibs-static-dev and x-dev build-depends. Also update the
+    Mesa build-depends for the new X.Org 7. (Closes: #363432)
+
+  * Make libqt3-mt recommend OpenGL and related libraries, since they are
+    dlopened if available.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 23 Apr 2006 14:18:11 -0400
+
+qt-x11-free (3:3.3.6-1ubuntu6) dapper-updates; urgency=low
+
+  * Leave out (-1ubuntu5), rejected upload.
+  * Use ~/.qt-32 as user config directory, when running the i386
+    binaries on amd64, adds kubuntu_03_qt_private_confdir_ia32.dpatch.
+  * Check for lib32 paths, when running the i386 binaries on x86_64 or ia64,
+    adds kubuntu_02_qt_modules_ia32.dpatch
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 12 Jun 2006 17:24:02 +0200
+
+qt-x11-free (3:3.3.6-1ubuntu4) dapper-updates; urgency=low
+
+  * Add kubuntu_01_arabic_fonts.dpatch, closes Malone #11753
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon,  5 Jun 2006 13:36:53 +0000
+
+qt-x11-free (3:3.3.6-1ubuntu3) dapper; urgency=low
+
+  * Rebuild against the new libmysqlclient15off with correct symbols.
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Thu,  6 Apr 2006 12:50:10 +1000
+
+qt-x11-free (3:3.3.6-1ubuntu2) dapper; urgency=low
+
+  [ Jonathan Riddell ]
+  * Install etc/qt3/qtrc in libqt3-mt.install
+
+  [ Anthony Mercatante ]
+  * Updated qtrc to fit to the default kubuntu look
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon,  3 Apr 2006 00:01:38 +0100
+
+qt-x11-free (3:3.3.6-1ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 25 Mar 2006 18:26:18 +0000
+
+qt-x11-free (3:3.3.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * New release obsoletes patch #30, #33. Adapted the immodule patches to the
+    new release; please report regressions.
+
+  * Add another small patch for immodule from Dirk Mueller, fixing an
+    inputcontext crash.
+
+  * Build against libsqlite3-dev instead of libsqlite0-dev.
+
+  * Temporarily version our build-depend on libxft-dev, to (>= 2.1.8.2-5.1),
+    ensuring that we build against a package with headers where we need them.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 23 Mar 2006 18:47:53 -0500
+
+qt-x11-free (3:3.3.5-4) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Change build-depends from libmysqlclient12-dev to libmysqlclient15-dev.
+    (Closes: #350725)
+
+  * Add a patch from Maksim Orlovich (provided by Bart Coppens), that should
+    resolve a crash in KMail when viewing exceedingly large mailboxes.
+    (Closes: #347392)
+
+  * Incorporate the immodule patch (and sundry fixes for that patch). Some of
+    the packaging is borrowed from Ubuntu.
+    (Closes: #347377)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 23 Feb 2006 18:15:14 -0500
+
+qt-x11-free (3:3.3.5-3) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Really add InterBase support to amd64. (Closes: #341614)
+
+  * Add a patch for plugin loading when mixing-and-matching apps from
+    different Qt/KDE versions.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  1 Dec 2005 14:45:43 -0500
+
+qt-x11-free (3:3.3.5-2) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Drop qt-copy's gamma patch, now that kdelibs has incorporated a
+    cleaner fix. (Closes: #333542)
+
+  * Fix a new-for-3.3.5 QListView problem that was causing myriad random
+    crashes in KDE apps. (Closes: #338002)
+
+  * Build the InterBase plugin on amd64, now that firebird2 works there.
+
+  * Move all .desktop files from /usr/share/applnk to /usr/share/applications,
+    and ensure that they have Categories set. This cleanup also fixes the Qt3
+    Assistant menu entry, which should now appear next to other Qt3 tools in
+    the menu. (Closes: #335465)
+
+  * Bump DH_COMPAT to 5. No changes required, except that the debugging
+    package is renamed from libqt3-mt-dbg to qt-x11-free-dbg, and contains
+    debugging symbols for all binaries in all qt-x11-free packages.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 29 Nov 2005 08:17:59 -0500
+
+qt-x11-free (3:3.3.5-1ubuntu18) dapper; urgency=low
+
+  * Build against libsqlite3; the vast majority of packages uses 3, and we
+    want to get rid of 0.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Wed,  8 Mar 2006 14:34:25 +0000
+
+qt-x11-free (3:3.3.5-1ubuntu17) dapper; urgency=low
+
+  * Add patch kubuntu_05_fix_immodule_and_xim.dpatch which include some patches 
+    from http://ktown.kde.org/~dirk/im/ . Fixes various problems such as log 
+    out crash because of im-module.
+  * Patch by Hou ZhengPeng <zhengpeng.hou at gmail.com> 
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 19 Feb 2006 18:48:01 +0800
+
+qt-x11-free (3:3.3.5-1ubuntu16) dapper; urgency=low
+
+  * Build against libmysqlclient15.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Thu,  2 Feb 2006 17:14:46 +0000
+
+qt-x11-free (3:3.3.5-1ubuntu15) dapper; urgency=low
+
+  * Remove build-dep and dependency on xlibs-static-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 20 Jan 2006 10:31:02 +0000
+
+qt-x11-free (3:3.3.5-1ubuntu14) dapper; urgency=low
+
+  * Added usr/lib/qt3/plugins/inputmethods/*.so to libqt3-mt.install to
+    install necessary inputmethods files. Without them, inputmethods are not
+    working at all
+
+ -- Stephan Hermann <sh at sourcecode.de>  Sat, 14 Jan 2006 10:14:59 +0100
+
+qt-x11-free (3:3.3.5-1ubuntu13) dapper; urgency=low
+
+  * Cleaned up the .moc mess in diff.gz
+
+ -- Stephan Hermann <sh at sourcecode.de>  Wed, 11 Jan 2006 05:05:10 +0100
+
+qt-x11-free (3:3.3.5-1ubuntu12) dapper; urgency=low
+
+  * Cleaning up debian/patches dir, removing a non working dpatch file, which
+    I sadly forgot to remove before.
+  * Added kubuntu_04_immodule_quietxi.,dpatch, but not applied yet. Will be
+    enabled just before release, to make the immodule added patches a bit more
+    silent.
+
+ -- Stephan Hermann <sh at sourcecode.de>  Wed, 11 Jan 2006 02:00:00 +0100
+
+qt-x11-free (3:3.3.5-1ubuntu11) dapper; urgency=low
+
+  * Applied patch for the immodule which has problems with KeyRelease events
+    and preventing some applications from working properly (e.g. Katapult,
+    Opera). Patch was provided by Lubos Lunak, you can find the patch here:
+    http://lists.freedesktop.org/archives/immodule-qt/2005-June/000732.html
+
+ -- Stephan Hermann <sh at sourcecode.de>  Tue, 10 Jan 2006 12:30:52 +0100
+
+qt-x11-free (3:3.3.5-1ubuntu10) dapper; urgency=low
+
+  * Add missing patches to 00list, really.
+  * Install immodule headers
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun,  8 Jan 2006 04:49:15 +0000
+
+qt-x11-free (3:3.3.5-1ubuntu9) dapper; urgency=low
+
+  * Add missing patches to 00list
+  * Alter debian/rules to add symlinks to qtimmodule headers in includes/
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  6 Jan 2006 15:59:45 +0000
+
+qt-x11-free (3:3.3.5-1ubuntu8) dapper; urgency=low
+
+  * Fix install and clean rule for qtrc
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu,  5 Jan 2006 23:57:32 +0000
+
+qt-x11-free (3:3.3.5-1ubuntu7) dapper; urgency=low
+
+  * Add debian/qtrc to install to etc/qt3/qtrc which includes path for
+    KDE widget style plugins, default to plastik and include sensible colours
+    http://bugzilla.ubuntu.com/2724
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed,  4 Jan 2006 01:04:56 +0000
+
+qt-x11-free (3:3.3.5-1ubuntu6) dapper; urgency=low
+
+  * Add Categories to .desktop files in debian/maintain
+    https://launchpad.net/distros/ubuntu/+source/qt-x11-free/+bug/5817
+    (somehow got lost in last upload)
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun,  1 Jan 2006 23:30:33 +0000
+
+qt-x11-free (3:3.3.5-1ubuntu5) dapper; urgency=low
+
+  * Add Categories to .desktop files in debian/maintain
+    https://launchpad.net/distros/ubuntu/+source/qt-x11-free/+bug/5817
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 21 Dec 2005 17:45:40 +0000
+
+qt-x11-free (3:3.3.5-1ubuntu4) dapper; urgency=low
+
+  * Add kubuntu_0067_nofclist.dpatch and
+    kubuntu_0066_fcsort2fcmatch.dpatch from KDE's qt-copy
+  * Build-dep on libmysqlclient14-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 15 Dec 2005 23:33:41 +0000
+
+qt-x11-free (3:3.3.5-1ubuntu3) dapper; urgency=low
+
+  * Resurrect debian/libqt3-mt-dev.links from the 3.3.4 packages, and
+    adjust to make sense in the 3.3.5 packaging, fixing FTBFS problems for
+    packages that expect to find includes and .so files in /usr/share/qt3
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Wed, 30 Nov 2005 16:28:03 +1100
+
+qt-x11-free (3:3.3.5-1ubuntu2) dapper; urgency=low
+
+  * Remove kubuntu_01_visibility.dpatch after discussion with upstream
+  * Add kubuntu_01_immodule_unified.dpatch for im-module support
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 21 Nov 2005 12:28:07 +0000
+
 qt-x11-free (3:3.3.5-1ubuntu1) dapper; urgency=low
 
   * Sync with Debian
@@ -4,7 +261,7 @@
   * Add kubuntu_01_visibility.dpatch from http://bugs.kde.org/show_bug.cgi?id=109386
     for GCC 4 visiblity=hidden support in KDE
 
- -- Jonathan Riddell <debian-qt-kde at lists.debian.org>  Thu, 10 Nov 2005 14:34:40 +0000
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 10 Nov 2005 14:34:40 +0000
 
 qt-x11-free (3:3.3.5-1) unstable; urgency=low
 
@@ -871,7 +1128,7 @@
   * debian/*: Various other little fixes and cleanups
   * debian/rules: Moved /usr/share/qt to be /usr/share/qt3
 
- -- Martin Loschwitz <madkiss at madkiss.org>  Wed, 29 Jan 2003 26:58:00 +0100
+ -- Martin Loschwitz <madkiss at madkiss.org>  Wed, 29 Jan 2003 16:58:00 +0100
 
 qt-x11-free (2:3.1.1+cvs.20021220-1) unstable; urgency=low
 

Modified: people/jriddell/qt/debian/compat
===================================================================
--- people/jriddell/qt/debian/compat	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/compat	2006-07-13 08:50:43 UTC (rev 4110)
@@ -1 +1 @@
-4
+5

Modified: people/jriddell/qt/debian/control
===================================================================
--- people/jriddell/qt/debian/control	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/control	2006-07-13 08:50:43 UTC (rev 4110)
@@ -1,7 +1,7 @@
 Source: qt-x11-free
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Martin Loschwitz <madkiss at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at alu.ua.es>
-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), libxrender-dev, libxcursor-dev, libxinerama-dev, libxkbfile-dev, libxi-dev, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfreetype6-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient12-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libxft-dev, dpatch (>= 1.13), libsqlite0-dev
+Uploaders: Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>
+Build-Depends: debhelper (>= 5.0), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, dpatch (>= 1.13), libsqlite3-dev
 Section: libs
 Priority: optional
 Standards-Version: 3.6.2
@@ -11,6 +11,7 @@
 Section: libs
 Replaces: qt3-tools (<< 2:3.0.2-20020306-1), libqt3-helper, libqt3, libqt3c102-mt
 Depends: ${shlibs:Depends}, fontconfig
+Recommends: libgl1-mesa | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
 Conflicts: libqt3c102-mt, libqui1-emb, libqt3c-mt
 Suggests: libqt3-mt-psql, libqt3-mt-mysql, libqt3-mt-odbc
 Description: Qt GUI Library (Threaded runtime version), Version 3
@@ -18,16 +19,6 @@
  applications that link against the libqt-mt.so.3, e.g. all KDE3
  applications.
 
-Package: libqt3-mt-dbg
-Section: libdevel
-Architecture: any
-Priority: extra
-Depends: libqt3-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: libqt3-mt-mysql
 Architecture: any
 Section: libs
@@ -59,6 +50,17 @@
  Install it if you intend to use or write Qt programs that are
  to access a PostgreSQL DB.
 
+Package: libqt3-mt-ibase
+Architecture: i386 hurd-i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libqt3c102-mt-ibase
+Replaces: libqt3c102-mt-ibase
+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: libqt3-mt-sqlite
 Architecture: any
 Section: libs
@@ -74,7 +76,7 @@
 Architecture: any
 Section: libdevel
 Replaces: libqt-mt-dev, libqt3-dev, 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), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, libc6-dev, libqt3-mt (= ${Source-Version}), libqt3-headers (= ${Source-Version}), qt3-dev-tools (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev
+Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libc6-dev, libqt3-mt (= ${Source-Version}), libqt3-headers (= ${Source-Version}), qt3-dev-tools (= ${Source-Version})
 Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1), libqt3-dev
 Recommends: libqt3-compat-headers
 Suggests: libqt3-i18n, qt3-doc
@@ -257,8 +259,20 @@
 Architecture: all
 Section: doc
 Priority: extra
-Depends: libqt3-mt-dev (= ${Source-Version})
+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.
+
+Package: qt-x11-free-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: libqt3-mt (= ${Source-Version})
+Conflicts: libqt3-mt-dbg
+Replaces: libqt3-mt-dbg
+Description: debugging symbols for qt-x11-free binaries
+ This package contains the debugging symbols associated with qt-x11-free.
+ They will automatically be used by gdb for debugging Qt-related
+ issues.

Modified: people/jriddell/qt/debian/libqt3-mt-dev.links
===================================================================
--- people/jriddell/qt/debian/libqt3-mt-dev.links	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/libqt3-mt-dev.links	2006-07-13 08:50:43 UTC (rev 4110)
@@ -1,6 +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.5 /usr/share/qt3/lib/libqt-mt.so
+/usr/lib/libqt-mt.so.3.3.6 /usr/share/qt3/lib/libqt-mt.so
 /usr/include/qt3 /usr/share/qt3/include
 /usr/lib/qt3/plugins /usr/share/qt3/plugins

Modified: people/jriddell/qt/debian/libqt3-mt.install
===================================================================
--- people/jriddell/qt/debian/libqt3-mt.install	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/libqt3-mt.install	2006-07-13 08:50:43 UTC (rev 4110)
@@ -1,3 +1,4 @@
 usr/lib/libqt-mt.so.*
 usr/lib/libqui.so.1.*
 usr/lib/qt3/plugins/imageformats/libqmng.so
+usr/lib/qt3/plugins/inputmethods/*.so

Modified: people/jriddell/qt/debian/libqt3-mt.links
===================================================================
--- people/jriddell/qt/debian/libqt3-mt.links	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/libqt3-mt.links	2006-07-13 08:50:43 UTC (rev 4110)
@@ -1,5 +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.5 /usr/share/qt3/lib/libqt-mt.so.3
-/usr/lib/libqt-mt.so.3.3.5 /usr/share/qt3/lib/libqt-mt.so.3.3
+/usr/lib/libqt-mt.so.3.3.6 /usr/share/qt3/lib/libqt-mt.so.3
+/usr/lib/libqt-mt.so.3.3.6 /usr/share/qt3/lib/libqt-mt.so.3.3

Modified: people/jriddell/qt/debian/maintain/assistant-qt3.desktop
===================================================================
--- people/jriddell/qt/debian/maintain/assistant-qt3.desktop	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/maintain/assistant-qt3.desktop	2006-07-13 08:50:43 UTC (rev 4110)
@@ -9,4 +9,4 @@
 Icon=assistant
 Terminal=false
 Type=Application
-Categories=Qt;Core
+Categories=Qt;Development

Modified: people/jriddell/qt/debian/maintain/designer-qt3.desktop
===================================================================
--- people/jriddell/qt/debian/maintain/designer-qt3.desktop	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/maintain/designer-qt3.desktop	2006-07-13 08:50:43 UTC (rev 4110)
@@ -74,3 +74,4 @@
 Icon=designer
 Terminal=false
 Type=Application
+Categories=Qt;Development

Modified: people/jriddell/qt/debian/maintain/man/linguist.1
===================================================================
--- people/jriddell/qt/debian/maintain/man/linguist.1	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/maintain/man/linguist.1	2006-07-13 08:50:43 UTC (rev 4110)
@@ -33,5 +33,5 @@
 under the Help menu.
 
 .SH AUTHOR
-This manual page was written by Jeremy Lainé <jeremy.laine at m4x.org>,
+This manual page was written by Jeremy Laine <jeremy.laine at m4x.org>,
 for the Debian GNU/Linux system (but may be used by others).

Modified: people/jriddell/qt/debian/patches/00list
===================================================================
--- people/jriddell/qt/debian/patches/00list	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/patches/00list	2006-07-13 08:50:43 UTC (rev 4110)
@@ -8,9 +8,11 @@
 10_arm_gcc4
 11_qt_rubberband
 12_disable_includehints
+13_qt335_qlistview_crash_fix
 14_fix_kmenu
 15_unify_declarations_glibc
 16_fix_opengl_check
+17_qlistview_crash_iterator
 18_fix_makeqpf_qembed
 22_fix_ftbfs_amd64
 23_qtc_qclipboard_hack
@@ -18,9 +20,7 @@
 25_qtc_qpixmap_mitshm
 26_qtc_qpixmap_constants
 27_qtc_qscrollview-windowactivate-fix
-28_qtc_png-gamma-fix
 29_qtc_fix_rotated_randr
-30_qtc_qtoolbar_77047
 31_gcc4_buildkey
 32_gtkstyle
 34_qtc_dnd_optimization
@@ -29,4 +29,12 @@
 38_qtc_khotkeys_input_84434
 39_qtc_qpopup_has_mouse
 40_qtc_qpopup_ignore_mousepos
-kubuntu_01_visibility
+45_immodule_unified
+46_immodule_keyrelease_fix
+47_immodule_nodebug_fix
+48_immodule_xim_fix
+49_immodule_inputcontext_fix
+kubuntu_01_arabic_fonts.dpatch
+kubuntu_02_qt_modules_ia32.dpatch
+kubuntu_03_qt_private_confdir_ia32.dpatch
+

Modified: people/jriddell/qt/debian/patches/25_qtc_qpixmap_mitshm.dpatch
===================================================================
--- people/jriddell/qt/debian/patches/25_qtc_qpixmap_mitshm.dpatch	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/patches/25_qtc_qpixmap_mitshm.dpatch	2006-07-13 08:50:43 UTC (rev 4110)
@@ -534,12 +534,3 @@
 +#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

Modified: people/jriddell/qt/debian/rules
===================================================================
--- people/jriddell/qt/debian/rules	2006-07-13 08:44:45 UTC (rev 4109)
+++ people/jriddell/qt/debian/rules	2006-07-13 08:50:43 UTC (rev 4110)
@@ -83,9 +83,12 @@
 		-I`pg_config --includedir`	\
 						\
 		-lfontconfig			\
+		-inputmethod			\
+		-inputmethod-ext		\
 		# End of CONFIGURE_OPTS
 
-ifneq ($(DEB_HOST_ARCH_CPU),i386)
+interbase_archs := none
+ifneq ($(DEB_HOST_ARCH_CPU),$(findstring $(DEB_HOST_ARCH_CPU),$(interbase_archs)))
 	CONFIGURE_OPTS += -no-sql-ibase
 	IBASE = -Nlibqt3-mt-ibase
 else
@@ -108,6 +111,11 @@
 
 	echo yes | ./configure $(CONFIGURE_OPTS)
 
+	rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
+	ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h
+	ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h
+	ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h
+
 	# proceed
 	make sub-src sub-plugins sub-tools
 	make -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
@@ -137,6 +145,10 @@
 	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
 
+	install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/qt3/qinputcontext.h
+	install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/qt3/qinputcontextfactory.h
+	install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/qt3/qinputcontextplugin.h
+
 	touch libqt-thread-stamp
 
 clean: unpatch
@@ -167,6 +179,9 @@
 		extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
 
 	rm -f qmake/*o
+	rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
+	rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so
+	rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o
 
 	# delete generated Makefiles but save the toplevel Makefile
 	-mv Makefile Makefile.save
@@ -175,6 +190,9 @@
 
 	cd examples/ && find . -name '.obj' | xargs rm -rf
 
+	find . -name .moc | xargs rm -rf
+	rm -fr debian/tmp-install/etc/
+
 	dh_clean
 
 install: build
@@ -185,6 +203,9 @@
 	dh_clean -i
 	dh_installdirs
 
+	mkdir -p debian/tmp-install/etc/qt3
+	cp debian/qtrc debian/tmp-install/etc/qt3/
+
 	# 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
@@ -235,7 +256,7 @@
 	dh_testroot
 	
 	dh_installdocs -i -XREADME.Debian
-	dh_installchangelogs -i changes-3.3.5
+	dh_installchangelogs -i changes-3.3.6
 								
 	find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/qt3/doc/
 			
@@ -338,11 +359,11 @@
 	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-qt3.desktop `pwd`/debian/qt3-linguist/usr/share/applnk/Development/linguist-qt3.desktop
+	install -m644 -D debian/maintain/designer-qt3.desktop `pwd`/debian/qt3-designer/usr/share/applications/designer-qt3.desktop
+	install -m644 -D debian/maintain/linguist-qt3.desktop `pwd`/debian/qt3-linguist/usr/share/applications/linguist-qt3.desktop
 	
-	install -m644 -D debian/maintain/assistant-qt3.desktop `pwd`/debian/qt3-assistant/usr/share/applnk/System/assistant-qt3.desktop
-	install -m644 -D debian/maintain/qt3config.desktop `pwd`/debian/qt3-qtconfig/usr/share/applnk/Settingsmenu/qt3config.desktop
+	install -m644 -D debian/maintain/assistant-qt3.desktop `pwd`/debian/qt3-assistant/usr/share/applications/assistant-qt3.desktop
+	install -m644 -D debian/maintain/qt3config.desktop `pwd`/debian/qt3-qtconfig/usr/share/applications/qt3config.desktop
 	
 	# include logo32 for every program
 	cd `pwd`/debian/qt3-designer/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
@@ -421,10 +442,10 @@
 	dh_installdocs -a $(IBASE) -XREADME.Debian
 	dh_installmenu -a $(IBASE)
 	
-	dh_installchangelogs -a $(IBASE) changes-3.3.5
+	dh_installchangelogs -a $(IBASE) changes-3.3.6
 
 	dh_link -a $(IBASE)
-	dh_strip -a $(IBASE) --dbg-package=libqt3-mt
+	dh_strip -a $(IBASE) --dbg-package=qt-x11-free-dbg
 	dh_compress -a $(IBASE)
 	dh_fixperms -a $(IBASE)
 	




More information about the pkg-kde-commits mailing list