* Bump Standards-Version to 3.7.3.

  * Merge Kubuntu load ssl patch. Thanks to Jonathan Riddell.
  * Add CDDL exception to debian/copyright.
  * Add 21_mis-assumes_non-irix_mips_systems_have_no_fpu patch.
    Thanks to Thiemo Seufer.

5 files changed, 38 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 3047047..e9a2ebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-qt4-x11 (4.3.2-2) unstable; urgency=low
+qt4-x11 (4.3.3-1) unstable; urgency=low
+
+  * New upstream release.
 
   [Adeodato Simó]
 
@@ -7,16 +9,25 @@ qt4-x11 (4.3.2-2) unstable; urgency=low
 
   [Fathi Boudra]
 
+  * Bump Standards-Version to 3.7.3.
   * Merge Kubuntu load ssl patch. Thanks to Jonathan Riddell.
-  * Add qt-copy patch:
-    * 0196-q3toolbar-clean-rebuild.
-      It fixes crash when we clear q3toolbar and rebuild it.
-    * 0197-qstylesheetstyle.
-      it fixes stylesheet style: e.g. klineedits looking wrong under oxygen.
-    * 0198-qstylesheetstyle2.
-      it fixes stylesheet style: e.g. kcombobox with a clean button.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 06 Nov 2007 09:20:21 +0100
+  * Add CDDL exception to debian/copyright.
+  * Add 21_mis-assumes_non-irix_mips_systems_have_no_fpu patch.
+    Thanks to Thiemo Seufer.
+  * Remove qt-copy patches:
+    * 0163-fix-gcc43-support.
+    * 0185-fix-format-strings.
+    * 0188-fix-moc-parser-same-name-header.
+    * 0189-fix-q3toolbar-qcombobox-signal-slot.
+    * 0193-qtreeview-division-by-zero.diff.
+  * Add qt-copy patches:
+    * 0200-fix-qsslsocket-waitfor.
+      Fixes some QSslSocket::waitFor$X methods.
+    * 0203-qtexthtmlparser-link-color.
+      Links are assigned a foreground color according to the system current
+      color scheme.
+
+ -- Fathi Boudra <fabo@debian.org>  Thu, 06 Dec 2007 22:06:46 +0100
 
 qt4-x11 (4.3.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9a3901a..81a4611 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Brian Nelson <pyro@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Ana Beatriz Guerrero Lopez <ana@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, sharutils, libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x11proto-core-dev, 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, libfreetype6-dev, libmysqlclient15-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, libxinerama-dev, libsqlite0-dev, libsqlite3-dev, libdbus-1-dev, libglib2.0-dev, libxi-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: libqt4-dev
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 6a36942..bba8fd2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -64,12 +64,14 @@ Apache License                          2.0
 Apple Public Source License             2.0
 Artistic license                        From Perl 5.8.0
 BSD license                             "July 22 1999"
+Common Development and
+  Distribution License (CDDL)		1.0
 Common Public License                   1.0
 Eclipse Public License                  1.0
 GNU Library or "Lesser"
-General Public License (LGPL)           2.0 or 2.1 
+General Public License (LGPL)           2.0 or 2.1
 Jabber Open Source License              1.0
-MIT License                             (as set forth in the addendum file)       
+MIT License                             (as set forth in the addendum file)
 Mozilla Public License (MPL)            1.0 or 1.1
 Open Software License                   2.0, 3.0
 OpenSSL license (with original
diff --git a/debian/patches/21_mis-assumes_non-irix_mips_systems_have_no_fpu.diff b/debian/patches/21_mis-assumes_non-irix_mips_systems_have_no_fpu.diff
new file mode 100644
index 0000000..83614d6
--- /dev/null
+++ b/debian/patches/21_mis-assumes_non-irix_mips_systems_have_no_fpu.diff
@@ -0,0 +1,11 @@
+--- a/src/corelib/global/qglobal.h
++++ b/src/corelib/global/qglobal.h
+@@ -834,7 +834,7 @@
+ 
+ typedef int QNoImplicitBoolCast;
+ 
+-#if defined(QT_ARCH_ARM) || (defined(QT_ARCH_MIPS) && !defined(Q_OS_IRIX))
++#if defined(QT_ARCH_ARM)
+ #define QT_NO_FPU
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ada56ba..a8b540a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,6 +24,7 @@
 07_trust_dpkg-arch_over_uname-m.diff
 08_load_ssl.diff
 20_mips_atomic_ops.diff
+21_mis-assumes_non-irix_mips_systems_have_no_fpu.diff
 30_arm_ftbfs_fixes.diff
 31_arm_eabi_fix.diff
 40_alpha_ice.diff