4.3.0 merged in

22 files changed, 731 insertions, 231 deletions

diff --git a/debian/changelog b/debian/changelog
index 34e40fb..1842bf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,53 @@
+qt4-x11 (4.3.0-1) experimental; urgency=low
+
+  * New upstream release.
+    * Fixes a QListView issue. (Closes: 419654)
+
+  [Sune Vuorela]
+  * Remove 04_utf8_bug_fix: Merged upstream.
+  * Update libqt4-dev.install. Upstream installs pkgconfig files the right place.
+  * Update libqt4-core.install. Add libQtScript.
+  * Update rules:
+    * Add utils.mk to use list-missing.
+    * Cleaning seems to fail a bit. Trying to hack around that in clean::
+      target.
+
+  [Fathi Boudra]
+  * Redo 30_arm_ftbfs_fixes to fix another FTBFS. Add arm target to configure
+    script. Thanks to Sune Vuorela and Aurelien Jarno. (Closes: #426129)
+  * Remove 71_hppa_inotify_fix: Merged upstream.
+  * Update patches:
+    * 02_launch_assistant-qt4
+    * 03_launch_moc-qt4
+    * 50_kfreebsd_build_fix
+    * 80_hurd_max_path
+  * Apply qt-copy patches:
+    * 00_0163-fix-gcc43-support: Various fixes to get Qt 4.3 without hundreds
+      of warnings compiling.
+    * 00_0167-fix-group-reading: In big user environments, getgrgid_r() needs
+      more memory than sysconf() returns.
+    * 00_0175-fix-s390-qatomic: Fix s390(x) build.
+    * 00_0176-coverity-fixes: Fix various obvious memory leaks.
+  * Rename disable opengl visibility patch. It is not alpha architecture only.
+  * Add desktop files to support Desktop Environments. (Closes: #378915)
+  * Update qt4-dev-tools.install. Add qdbusviewer and pixeltool.
+    Thanks to Benjamin Meyer for the reminder.
+  * Update libqt4-dev.install. Remove qtdemo binary as we provide a tarball of the
+    demos directory. qtdemo is useless, it can't launch anything without demos
+    builded. It can only show screenshots and short description of demos,
+    users have it in Qt assistant.
+  * Update rules:
+    * Remove -debug-and-release option. Deprecated.
+    * Add configure options:
+      * -no-exceptions
+      * -debug
+      * -qdbus
+      * -pch
+      * -nomake examples
+      * -nomake demos
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 17 May 2007 18:28:57 +0200
+
 qt4-x11 (4.2.3-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/desktop/assistant-qt4.desktop b/debian/desktop/assistant-qt4.desktop
new file mode 100644
index 0000000..9ffa697
--- /dev/null
+++ b/debian/desktop/assistant-qt4.desktop
@@ -0,0 +1,90 @@
+[Desktop Entry]
+Categories=Qt;Development;Documentation;Qt;
+Encoding=UTF-8
+Exec=/usr/bin/assistant-qt4
+Name=Qt 4 Assistant
+GenericName=Document Browser
+GenericName[af]=Dokument Blaaier
+GenericName[az]=Sənəd Səyyahı
+GenericName[bg]=Преглед на документи
+GenericName[bn]=নথী ব্রাউজার
+GenericName[br]=Furcher Teulioù
+GenericName[bs]=Preglednik QT dokumenata
+GenericName[ca]=Navegador de documents
+GenericName[cs]=Prohlížeč dokumentace
+GenericName[cy]=Porydd Dogfen
+GenericName[da]=Dokumentfremviser
+GenericName[de]=Dokumentbrowser
+GenericName[el]=Προβολέας εγγράφων
+GenericName[eo]=Dokumentorigardilo
+GenericName[es]=Navegador de documentos
+GenericName[et]=Dokumentatsiooni brauser
+GenericName[eu]=Dokumentu Ikustailua
+GenericName[fa]=مرورگر سند
+GenericName[fi]=Asiakirjaselain
+GenericName[fo]=Skjalakagari
+GenericName[fr]=Explorateur de documentation Qt
+GenericName[gl]=Explorador de Documentos
+GenericName[he]=דפדפן מסמכים
+GenericName[hi]=दस्तावेज़़ ब्राउज़र
+GenericName[hr]=Preglednik dokumenata
+GenericName[hu]=Dokumentumböngésző
+GenericName[is]=Skjalavafri
+GenericName[it]=Visualizzatore di documenti
+GenericName[ja]=ドキュメントブラウザ
+GenericName[ko]=문서 탐색기
+GenericName[lo]=ເຄື່ອງມືເລືອກເບິ່ງແຟ້ມເອກະສານ
+GenericName[lt]=Dokumentų žiūriklis
+GenericName[lv]=Dokumentu Pārlūks
+GenericName[mn]=Баримтын хөтөч
+GenericName[ms]=Pelungsur Dokumen
+GenericName[mt]=Browser ta' Dokumenti
+GenericName[nb]=Dokumentleser
+GenericName[nds]=Dokmentkieker
+GenericName[nl]=Documentbrowser
+GenericName[nn]=Dokumentlesar
+GenericName[nso]=Seinyakisi sa Tokomane
+GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਝਲਕਾਰਾ
+GenericName[pl]=Przeglądarka dokumentów
+GenericName[pt]=Navegador de Documentos
+GenericName[pt_BR]=Navegador de Documentos
+GenericName[ro]=Navigator de documente
+GenericName[ru]=Программа просмотра документов
+GenericName[se]=Dokumeantalogan
+GenericName[sk]=Prehliadač dokumentácie
+GenericName[sl]=Pregledovalnik dokumentov
+GenericName[sr]=Претраживач докумената
+GenericName[sr@Latn]=Pretraživač dokumenata
+GenericName[ss]=Ibrawuza yelidokhumente
+GenericName[sv]=Dokumentbläddrare
+GenericName[ta]=ஆவண உலாவி
+GenericName[tg]=Тафсири ҳуҷҷат
+GenericName[th]=เครื่องมือเลือกดูแฟ้มเอกสาร
+GenericName[tr]=Belge Tarayıcısı
+GenericName[uk]=Навігатор документів
+GenericName[uz]=Ҳужжат браузери
+GenericName[ven]=Buronza ya manwalwa
+GenericName[vi]=Trình duyệt tài liệu
+GenericName[wa]=Foyteu di documints
+GenericName[xh]=Umkhangeli Wencwadi Zoxwebhu
+GenericName[xx]=xxDocument Browserxx
+GenericName[zh_CN]=文档浏览器
+GenericName[zh_TW]=文件閱讀器
+GenericName[zu]=Umcingi Woshicilelo
+X-KDE-StartupNotify=true
+Icon=assistant
+Terminal=false
+Type=Application
+
+
+Name[bg]=Qt 4 асистент
+Name[cs]=Qt4 asistent
+Name[hu]=Qt 4 Asszisztens
+Name[ja]=Qt 4アシスタント
+Name[km]=អ្នក​ជំនួយការ Qt 4
+GenericName[km]=កម្មវិធី​រុករក​ឯកសារ
+Name[nb]=Qt 4-assistent
+Name[pa]=Qt 4 ਸਹਾਇਕ
+Name[sv]=Qt 4-assistent
+Name[zh_CN]=Qt 4 助手
+Name[zh_TW]=Qt 4 助理
diff --git a/debian/desktop/designer-qt4.desktop b/debian/desktop/designer-qt4.desktop
new file mode 100644
index 0000000..d33c44e
--- /dev/null
+++ b/debian/desktop/designer-qt4.desktop
@@ -0,0 +1,93 @@
+[Desktop Entry]
+Categories=Qt;Development;GUIDesigner;Qt;
+Encoding=UTF-8
+Exec=/usr/bin/designer-qt4
+Name=Qt 4 Designer
+GenericName=Interface Designer
+GenericName[af]=Koppelvlak Ontwerper
+GenericName[ar]=أداة لتصميم واجهة البرامج
+GenericName[az]=Ara Üz Tərtibçisi
+GenericName[bn]=ইন্টারফেস পরিকল্পনা
+GenericName[bs]=Qt alat za dizajniranje interfejsa
+GenericName[ca]=Dissenyador d'interfícies
+GenericName[cs]=Návrhář rozhraní
+GenericName[cy]=Dylunydd Rhyngwyneb
+GenericName[da]=Grænsefladedesigner
+GenericName[de]=Schnittstellen-Designer
+GenericName[el]=Σχεδιαστής διασυνδέσεων
+GenericName[eo]=Interfacdesegnilo
+GenericName[es]=Diseñador de interfaces
+GenericName[et]=Kasutajaliidese disainer
+GenericName[eu]=Interfaze Diseinatzailea
+GenericName[fa]=طراح رابط
+GenericName[fi]=Käyttöliittymäsuunnittelija
+GenericName[fo]=Nýtaramótssniðari
+GenericName[fr]=Concepteur d'interface
+GenericName[gl]=Deseñador de Interfaces
+GenericName[he]=מעצב ממשקים
+GenericName[hi]=इंटरफेस डिज़ाइनर
+GenericName[hr]=Dizajner sučelja
+GenericName[hu]=Felülettervező
+GenericName[is]=Viðmótshönnun
+GenericName[it]=Disegnatore di interfacce
+GenericName[ja]=インターフェースデザイナー
+GenericName[ko]=인터페이스 디자이너
+GenericName[lo]=ເຄື່ອງມືອອກແບບສ່ວນຕິດຕໍ່ຜູ້ໃຊ້
+GenericName[lt]=Sąsajos redaktorius
+GenericName[lv]=Starsejas Dizainers
+GenericName[mn]=Гадаргуун дизайнер
+GenericName[ms]=Pereka Antaramuka
+GenericName[mt]=Diżinjatur tal-interfaċċji
+GenericName[nb]=Utforming av grensesnitt
+GenericName[nl]=Interface-ontwerper
+GenericName[nn]=Utforming av grensesnitt
+GenericName[nso]=Mohlami wa Interface
+GenericName[pa]=ਇੰਟਰਫੇਸ ਡਿਜਾਇਨਰ
+GenericName[pl]=Projektowanie interfejsów
+GenericName[pt]=Editor de Interfaces
+GenericName[pt_BR]=Interface do Designer
+GenericName[ro]=Dezvoltator de interfeţe
+GenericName[ru]=Редактор интерфейса приложений Qt
+GenericName[se]=Laktahábmejeaddji
+GenericName[sk]=Návrh rozhrania
+GenericName[sl]=Snovalnik vmesnikov
+GenericName[sr]=Дизајнер интерфејса
+GenericName[sr@Latn]=Dizajner interfejsa
+GenericName[ss]=Umhleli wesichumanisi
+GenericName[sv]=Gränssnittseditor
+GenericName[ta]=முகப்புப் வடிவமைப்பாளர்
+GenericName[tg]=Тароҳи робита
+GenericName[th]=เครื่องมือออกแบบส่วนติดต่อผู้ใช้
+GenericName[tr]=Arayüz tasarım programı
+GenericName[uk]=Дизайн інтерфейсу
+GenericName[uz]=Интерфейс дизайнери
+GenericName[ven]=Muvhati wa nga Phanda
+GenericName[vi]=Trình thiết kế giao diện
+GenericName[wa]=Dessineu d' eterfaces
+GenericName[xh]=Umyili Wezojongongano
+GenericName[xx]=xxInterface Designerxx
+GenericName[zh_CN]=界面设计器
+GenericName[zh_TW]=界面設計師
+GenericName[zu]=Umakhi Womxhumanisi
+X-KDE-StartupNotify=true
+MimeType=application/x-designer
+Icon=designer
+Terminal=false
+Type=Application
+
+
+
+GenericName[bg]=Дизайнер на интерфейси
+Name[el]=Σχεδιαστής Qt 4
+Name[hu]=Qt 4 Tervező
+Name[it]=Progettazione Qt 4
+Name[ja]=Qt 4デザイナ
+Name[km]=កម្មវិធី​រចនា Qt 4
+GenericName[km]=កម្មវិធី​រចនា​ចំណុច​ប្រទាក់
+Name[nl]=Qt 4 ontwerper
+Name[pa]=Qt 4 ਡਿਜ਼ਾਇਨਰ
+Name[pl]=Projektowanie interfejsów w Qt 4
+Name[ru]=Qt 4 дизайнер
+Name[uk]=Дизайнер Qt 4
+Name[zh_CN]=Qt 4 设计器
+Name[zh_TW]=Qt 4 設計師
diff --git a/debian/desktop/linguist-qt4.desktop b/debian/desktop/linguist-qt4.desktop
new file mode 100644
index 0000000..6f025d3
--- /dev/null
+++ b/debian/desktop/linguist-qt4.desktop
@@ -0,0 +1,86 @@
+[Desktop Entry]
+Categories=Qt;Development;Translation;Qt;
+Encoding=UTF-8
+Exec=/usr/bin/linguist-qt4
+Name=Qt 4 Linguist
+GenericName=Translation Tool
+GenericName[af]=Vertaling Program
+GenericName[ar]=أداة للترجمة
+GenericName[az]=Tərcümə Vasitəsi
+GenericName[bn]=অনুবাদ টুল
+GenericName[bs]=Alat za prevođenje
+GenericName[ca]=Eina de traducció
+GenericName[cs]=Překladatelský nástroj
+GenericName[cy]=Erfyn Cyfieithu
+GenericName[da]=Oversættelsesværktøj
+GenericName[de]=Übersetzungsprogramm
+GenericName[el]=Εργαλείο μεταφράσεων
+GenericName[eo]=Tradukilo por Qt-programoj
+GenericName[es]=Herramienta de traducción
+GenericName[et]=Tõlkimise rakendus
+GenericName[eu]=Itzulpenerako Tresnak
+GenericName[fa]=ابزار ترجمه
+GenericName[fi]=Käännöstyökalu
+GenericName[fo]=Umsetingaramboð
+GenericName[fr]=Outil de traduction
+GenericName[gl]=Ferramenta de Traducción
+GenericName[he]=כלי תרגום
+GenericName[hi]=अनुवाद उपकरण
+GenericName[hr]=Uslužni program za prevođenje
+GenericName[hu]=Fordítássegítő
+GenericName[is]=Þýðingartól
+GenericName[it]=Strumento per le traduzioni
+GenericName[ja]=翻訳ツール
+GenericName[ko]=번역 도구
+GenericName[lo]=ເຄື່ອງມືແປພາສາ
+GenericName[lt]=Vertimo įrankis
+GenericName[lv]=Tulkošanas Rīks
+GenericName[mn]=Орчуулгын програм
+GenericName[ms]=Perkakasan Penterjemahan
+GenericName[mt]=Għodda tat-traduzzjoni
+GenericName[nb]=Oversettelsesverktøy
+GenericName[nl]=Vertaalprogramma
+GenericName[nn]=Omsetjingsverktøy
+GenericName[nso]=Sebereka sa Thlathollo
+GenericName[pa]=ਅਨੁਵਾਦ ਸੰਦ
+GenericName[pl]=Narzędzie dla tłumaczy
+GenericName[pt]=Ferramenta de Tradução
+GenericName[pt_BR]=Ferramenta de Tradução
+GenericName[ro]=Utilitar de traducere
+GenericName[ru]=Утилита локализации приложений
+GenericName[se]=Jorgalanneavvu
+GenericName[sk]=Prekladací nástroj
+GenericName[sl]=Orodje za prevajanje
+GenericName[sr]=Алат за превођење
+GenericName[sr@Latn]=Alat za prevođenje
+GenericName[ss]=Lithulusi lekuhumusha
+GenericName[sv]=Översättningsverktyg
+GenericName[ta]=மொழிபெயர்ப்புக் கருவி
+GenericName[tg]=Тарҷумагар барои QT
+GenericName[th]=เครื่องมือแปลภาษา
+GenericName[tr]=Çeviri Aracı
+GenericName[uk]=Засіб для перекладів
+GenericName[uz]=Таржима қилиш воситаси
+GenericName[ven]=Zwishumiswa zwau Dologa
+GenericName[vi]=Công cụ dịch
+GenericName[wa]=Usteye di ratournaedje
+GenericName[xh]=Isixhobo Soguqulelo lomsebenzi kolunye ulwimi
+GenericName[xx]=xxTranslation Toolxx
+GenericName[zh_CN]=翻译工具
+GenericName[zh_TW]=翻譯工具
+GenericName[zu]=Ithuluzi Lokuguqulela
+X-KDE-StartupNotify=true
+MimeType=application/x-linguist
+Terminal=false
+Type=Application
+Icon=linguist
+
+GenericName[bg]=Инструмент за превод
+Name[hu]=Qt 4 Nyelvész
+Name[ja]=Qt 4リンギスト
+Name[km]=ភាសាវិទូ Qt 4
+GenericName[km]=ឧបករណ៍​បកប្រែ
+Name[nb]=Qt 4-Linguist
+Name[pa]=Qt 4 ਅਨੁਵਾਦਕ
+Name[pl]=Lingwista Qt 4
+Name[zh_TW]=Qt 4 語言專家
diff --git a/debian/desktop/qt4config.desktop b/debian/desktop/qt4config.desktop
new file mode 100644
index 0000000..58540f8
--- /dev/null
+++ b/debian/desktop/qt4config.desktop
@@ -0,0 +1,32 @@
+[Desktop Entry]
+Categories=Qt;Settings;Qt;Utility;DesktopSettings;
+Encoding=UTF-8
+Exec=/usr/bin/qtconfig-qt4
+Name=Qt 4 Settings
+X-KDE-StartupNotify=true
+Icon=designer
+Terminal=false
+Type=Application
+
+
+Name[bg]=Настройки на Qt 4
+Name[cs]=Qt 4 nastavení
+Name[de]=Qt 4-Einstellungen
+Name[el]=Ρυθμίσεις Qt 4
+Name[fi]=Qt 4 asetukset
+Name[fr]=Paramètres Qt 4
+Name[hu]=Qt 4 beállítások
+Name[it]=Impostazioni Qt 4
+Name[ja]=Qt 4設定
+Name[km]=ការ​កំណត់ Qt 4
+Name[nb]=Qt 4-innstillinger
+Name[nl]=Qt4 Instellingen
+Name[pa]=Qt 4 ਸਥਾਪਨ
+Name[pl]=Ustawienia Qt 4
+Name[pt]=Definições QT 4 
+Name[pt_BR]=Configurações do Qt 4
+Name[ru]=Настройки Qt 4
+Name[sv]=Qt 4-inställningar
+Name[uk]=Параметри Qt 4
+Name[zh_CN]=Qt 4 设置
+Name[zh_TW]=Qt 4 設定
diff --git a/debian/libqt4-core.install b/debian/libqt4-core.install
index d633e91..e805597 100644
--- a/debian/libqt4-core.install
+++ b/debian/libqt4-core.install
@@ -3,5 +3,6 @@ usr/lib/libQtNetwork.so.*
 usr/lib/libQtXml.so.*
 usr/lib/libQtTest.so.*
 usr/lib/libQtDBus.so.*
+usr/lib/libQtScript.so.*
 usr/bin/qdbus
 usr/share/qt4/translations/*.qm
diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install
index 4cee416..89da84b 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -2,7 +2,7 @@ usr/include/qt4/*
 usr/lib/*.a
 usr/lib/*.so
 usr/lib/*.prl
-usr/lib/*.pc usr/lib/pkgconfig/
+usr/lib/pkgconfig/
 usr/share/qt4/q3porting.xml
 usr/share/qt4/mkspecs/*
 usr/bin/qmake-qt4
@@ -13,6 +13,5 @@ usr/bin/moc-qt4
 usr/bin/qt3to4
 usr/bin/rcc
 usr/bin/uic3
-usr/bin/qtdemo
 usr/bin/qdbusxml2cpp
 usr/bin/qdbuscpp2xml
diff --git a/debian/patches/00_0163-fix-gcc43-support.dpatch b/debian/patches/00_0163-fix-gcc43-support.dpatch
new file mode 100755
index 0000000..5988f82
--- /dev/null
+++ b/debian/patches/00_0163-fix-gcc43-support.dpatch
@@ -0,0 +1,174 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0163-fix-gcc43-support.dpatch by Dirk Mueller <mueller@kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Various fixes to get Qt 4.3 without hundreds of warnings compiling.
+
+@DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/config.tests/unix/endian.test qt4-x11-4.3.0~rc1/config.tests/unix/endian.test
+--- qt4-x11-4.3.0~rc1~/config.tests/unix/endian.test	2007-05-06 17:54:44.000000000 +0200
++++ qt4-x11-4.3.0~rc1/config.tests/unix/endian.test	2007-05-17 19:09:20.000000000 +0200
+@@ -30,6 +30,7 @@
+     [ "$VERBOSE" = "yes" ] && echo "    Found 'MostSignificantByteFirst' in binary"
+     ENDIAN="BIG"
+ fi
++[ "$VERBOSE" = "yes" ] && make clean || make clean >/dev/null 2>&1
+ 
+ # done
+ if [ "$ENDIAN" = "LITTLE" ]; then
+diff -urNad qt4-x11-4.3.0~rc1~/config.tests/x11/glib/glib.cpp qt4-x11-4.3.0~rc1/config.tests/x11/glib/glib.cpp
+--- qt4-x11-4.3.0~rc1~/config.tests/x11/glib/glib.cpp	2007-05-06 17:54:37.000000000 +0200
++++ qt4-x11-4.3.0~rc1/config.tests/x11/glib/glib.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -6,7 +6,7 @@
+ {
+     GMainContext *context;
+     GSource *source;
+-    GPollFD *pollfd;
++    GPollFD *pollfd = NULL;
+     if (!g_thread_supported())
+         g_thread_init(NULL);
+     context = g_main_context_default();
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/codecs/qtextcodec.cpp qt4-x11-4.3.0~rc1/src/corelib/codecs/qtextcodec.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/codecs/qtextcodec.cpp	2007-05-06 17:54:22.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/codecs/qtextcodec.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -415,7 +415,7 @@
+             localeMapper = checkForCodec(lang);
+ 
+         // 5. "@euro"
+-        if (!localeMapper && ctype && strstr(ctype, "@euro") || lang && strstr(lang, "@euro"))
++        if ((!localeMapper && ctype && strstr(ctype, "@euro")) || (lang && strstr(lang, "@euro")))
+             localeMapper = checkForCodec("ISO 8859-15");
+ 
+         // 6. guess locale from ctype unless ctype is "C"
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qtextstream.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qtextstream.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qtextstream.cpp	2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qtextstream.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -541,8 +541,8 @@
+     if (!codec || autoDetectUnicode) {
+         autoDetectUnicode = false;
+         
+-        if (bytesRead >= 2 && (uchar(buf[0]) == 0xff && uchar(buf[1]) == 0xfe
+-                               || uchar(buf[0]) == 0xfe && uchar(buf[1]) == 0xff)) {
++        if (bytesRead >= 2 && ((uchar(buf[0]) == 0xff && uchar(buf[1]) == 0xfe)
++                               || (uchar(buf[0]) == 0xfe && uchar(buf[1]) == 0xff))) {
+             codec = QTextCodec::codecForName("UTF-16");
+         } else if (!codec) {
+             codec = QTextCodec::codecForLocale();
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qurl.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qurl.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qurl.cpp	2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qurl.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -4724,9 +4724,9 @@
+     if (include.isEmpty()) {
+         for (int i = 0; i < len; ++i) {
+             unsigned char c = *inputData++;
+-            if (c >= 0x61 && c <= 0x7A // ALPHA
+-                || c >= 0x41 && c <= 0x5A // ALPHA
+-                || c >= 0x30 && c <= 0x39 // DIGIT
++            if ((c >= 0x61 && c <= 0x7A) // ALPHA
++                || (c >= 0x41 && c <= 0x5A) // ALPHA
++                || (c >= 0x30 && c <= 0x39) // DIGIT
+                 || c == 0x2D // -
+                 || c == 0x2E // .
+                 || c == 0x5F // _
+@@ -4743,9 +4743,9 @@
+         const char * alsoEncode = include.constData();
+         for (int i = 0; i < len; ++i) {
+             unsigned char c = *inputData++;
+-            if ((c >= 0x61 && c <= 0x7A // ALPHA
+-                || c >= 0x41 && c <= 0x5A // ALPHA
+-                || c >= 0x30 && c <= 0x39 // DIGIT
++            if (((c >= 0x61 && c <= 0x7A) // ALPHA
++                || (c >= 0x41 && c <= 0x5A) // ALPHA
++                || (c >= 0x30 && c <= 0x39) // DIGIT
+                 || c == 0x2D // -
+                 || c == 0x2E // .
+                 || c == 0x5F // _
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp	2007-05-06 17:54:24.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -2589,8 +2589,8 @@
+ 
+         QChar c1 = format.at(i);
+         QChar c2 = format.at(i + 1);
+-        if (c1.unicode() == 'a' && c2.unicode() == 'p'
+-            || c1.unicode() == 'A' && c2.unicode() == 'P')
++        if ((c1.unicode() == 'a' && c2.unicode() == 'p')
++            || (c1.unicode() == 'A' && c2.unicode() == 'P'))
+             return true;
+ 
+         ++i;
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/kernel/qapplication.cpp qt4-x11-4.3.0~rc1/src/gui/kernel/qapplication.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/kernel/qapplication.cpp	2007-05-06 17:54:32.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/kernel/qapplication.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -2009,11 +2009,11 @@
+ #ifndef QT_NO_TRANSLATION
+ static bool qt_detectRTLLanguage()
+ {
+-    return force_reverse ^
++    return (force_reverse ^
+         QApplication::tr("QT_LAYOUT_DIRECTION",
+                          "Translate this string to the string 'LTR' in left-to-right"
+                          " languages or to 'RTL' in right-to-left languages (such as Hebrew"
+-                         " and Arabic) to get proper widget layout.") == QLatin1String("RTL");
++                         " and Arabic) to get proper widget layout.") == QLatin1String("RTL"));
+ }
+ #endif
+ 
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/kernel/qkeymapper_x11.cpp qt4-x11-4.3.0~rc1/src/gui/kernel/qkeymapper_x11.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/kernel/qkeymapper_x11.cpp	2007-05-06 17:54:32.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/kernel/qkeymapper_x11.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -1315,8 +1315,8 @@
+         }
+ 
+         if (directionKeyEvent && lastWinId == keyWidget->internalWinId()) {
+-            if (keysym == XK_Shift_L && directionKeyEvent == XK_Control_L ||
+-                keysym == XK_Control_L && directionKeyEvent == XK_Shift_L) {
++            if ((keysym == XK_Shift_L && directionKeyEvent == XK_Control_L) ||
++                (keysym == XK_Control_L && directionKeyEvent == XK_Shift_L)) {
+                 directionKeyEvent = Qt::Key_Direction_L;
+             } else if (keysym == XK_Shift_R && directionKeyEvent == XK_Control_R ||
+                        keysym == XK_Control_R && directionKeyEvent == XK_Shift_R) {
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/kernel/qwidget.cpp qt4-x11-4.3.0~rc1/src/gui/kernel/qwidget.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/kernel/qwidget.cpp	2007-05-06 17:54:31.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/kernel/qwidget.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -1804,7 +1804,7 @@
+ 
+             for (int i = 0; i < pd->children.size(); ++i) {
+                 QWidget *w = qobject_cast<QWidget *>(pd->children.at(i));
+-                if (w && !w->isWindow() && !w->testAttribute(Qt::WA_WState_Created))
++                if (w && !w->isWindow() && !w->testAttribute(Qt::WA_WState_Created)) {
+                     if (w!=q) {
+                         w->create();
+                     } else {
+@@ -1814,6 +1814,7 @@
+                         if (winid)
+                             w->raise();
+                     }
++                }
+             }
+         } else {
+             q->create();
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/painting/qregion_unix.cpp qt4-x11-4.3.0~rc1/src/gui/painting/qregion_unix.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/painting/qregion_unix.cpp	2007-05-06 17:54:26.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/painting/qregion_unix.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -1929,7 +1929,7 @@
+         else
+             --isInside;
+ 
+-        if (!inside && !isInside || inside && isInside) {
++        if ((!inside && !isInside) || (inside && isInside)) {
+             pWETE->nextWETE = AET;
+             pWETE = AET;
+             inside = !inside;
+diff -urNad qt4-x11-4.3.0~rc1~/src/tools/uic/driver.cpp qt4-x11-4.3.0~rc1/src/tools/uic/driver.cpp
+--- qt4-x11-4.3.0~rc1~/src/tools/uic/driver.cpp	2007-05-06 17:54:17.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/tools/uic/driver.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -160,7 +160,7 @@
+ 
+ static bool isAnsiCCharacter(const QChar& c)
+ {
+-    return c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z')
++    return (c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z'))
+            || c.isDigit() || c == QLatin1Char('_');
+ }
+ 
diff --git a/debian/patches/00_0167-fix-group-reading.dpatch b/debian/patches/00_0167-fix-group-reading.dpatch
new file mode 100755
index 0000000..0185410
--- /dev/null
+++ b/debian/patches/00_0167-fix-group-reading.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0167-fix-group-reading.dpatch by Dirk Mueller <mueller@kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: In big user environments, getgrgid_r() needs more memory than sysconf() returns.
+
+@DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp	2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp	2007-05-17 19:10:48.000000000 +0200
+@@ -830,9 +830,16 @@
+     } else if (own == OwnerGroup) {
+         struct group *gr = 0;
+ #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
+-        buf.resize(sysconf(_SC_GETGR_R_SIZE_MAX));
+-        struct group entry;
+-        getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr);
++        for (unsigned size = sysconf(_SC_GETGR_R_SIZE_MAX); size < 256000; size += size)
++        {
++            buf.resize(size);
++            struct group entry;
++            // ERANGE indicates that the buffer was too small
++            if (!getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr)
++                || errno != ERANGE)
++                break;
++        }
++
+ #else
+         gr = getgrgid(ownerId(own));
+ #endif
diff --git a/debian/patches/00_0175-fix-s390-qatomic.dpatch b/debian/patches/00_0175-fix-s390-qatomic.dpatch
new file mode 100755
index 0000000..11fec9e
--- /dev/null
+++ b/debian/patches/00_0175-fix-s390-qatomic.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0175-fix-s390-qatomic.dpatch by Dirk Mueller <mueller@kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix s390(x) build.
+
+@DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/arch/qatomic_s390.h qt4-x11-4.3.0~rc1/src/corelib/arch/qatomic_s390.h
+--- qt4-x11-4.3.0~rc1~/src/corelib/arch/qatomic_s390.h	2007-05-06 17:54:22.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/arch/qatomic_s390.h	2007-05-17 19:13:18.000000000 +0200
+@@ -182,10 +182,20 @@
+ #endif
+ }
+ 
+-#error "fetch-and-add not implemented"
+-// int q_atomic_fetch_and_add_int(volatile int *ptr, int value);
+-// int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value);
+-// int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value);
++inline int q_atomic_fetch_and_add_int(volatile int *ptr, int value)
++{
++    return __sync_fetch_and_add(ptr, value);
++}
++
++inline int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value)
++{
++    return __sync_fetch_and_add(ptr, value);
++}
++
++inline int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value)
++{
++    return __sync_fetch_and_add(ptr, value);
++}
+ 
+ QT_END_HEADER
+ 
diff --git a/debian/patches/00_0176-coverity-fixes.dpatch b/debian/patches/00_0176-coverity-fixes.dpatch
new file mode 100755
index 0000000..8e643c0
--- /dev/null
+++ b/debian/patches/00_0176-coverity-fixes.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0176-coverity-fixes.diff.dpatch by Dirk Mueller <mueller@kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix various obvious memory leaks.
+
+@DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/painting/qimagescale.cpp qt4-x11-4.3.0~rc1/src/gui/painting/qimagescale.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/painting/qimagescale.cpp	2007-05-06 17:54:25.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/painting/qimagescale.cpp	2007-05-19 08:46:30.000000000 +0200
+@@ -1005,6 +1005,7 @@
+     buffer = QImage(dw, dh, src.format());
+     if (buffer.isNull()) {
+         qWarning("QImage: out of memory, returning null");
++        qimageFreeScaleInfo(scaleinfo);
+         return QImage();
+     }
+ 
+diff -urNad qt4-x11-4.3.0~rc1~/src/tools/uic/cpp/cppwriteicondata.cpp qt4-x11-4.3.0~rc1/src/tools/uic/cpp/cppwriteicondata.cpp
+--- qt4-x11-4.3.0~rc1~/src/tools/uic/cpp/cppwriteicondata.cpp	2007-05-06 17:54:47.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/tools/uic/cpp/cppwriteicondata.cpp	2007-05-19 08:47:22.000000000 +0200
+@@ -50,7 +50,7 @@
+         ba[i] = r;
+     }
+     QByteArray ret(reinterpret_cast<const char *>(ba), baSize);
+-    delete ba;
++    delete [] ba;
+     return ret;
+ }
+ 
diff --git a/debian/patches/00list b/debian/patches/00list
index 792db17..09fd9f8 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,15 +1,18 @@
+00_0163-fix-gcc43-support
+00_0167-fix-group-reading
+00_0175-fix-s390-qatomic
+00_0176-coverity-fixes
 01_qmake_for_debian
 02_launch_assistant-qt4
 03_launch_moc-qt4
-04_utf8_bug_fix
 20_mips_atomic_ops
 30_arm_ftbfs_fixes
 31_arm_eabi_fix
 40_alpha_ice
-41_alpha_disable_opengl_visibility
+41_disable_opengl_visibility
 50_kfreebsd_build_fix
 51_kfreebsd_mkspecs
 60_m68k_inotify_fix
 70_hppa_ldcw_fix
-71_hppa_inotify_fix
 80_hurd_max_path
+
diff --git a/debian/patches/02_launch_assistant-qt4.dpatch b/debian/patches/02_launch_assistant-qt4.dpatch
index 4f623cf..e831a2c 100755
--- a/debian/patches/02_launch_assistant-qt4.dpatch
+++ b/debian/patches/02_launch_assistant-qt4.dpatch
@@ -5,20 +5,20 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./tools/assistant/lib/qassistantclient.cpp /home/nelson/tmp/dpep-work.Zny9K3/qt4-x11-4.0.1/tools/assistant/lib/qassistantclient.cpp
---- ./tools/assistant/lib/qassistantclient.cpp	2005-08-16 01:41:14.000000000 -0700
-+++ /home/nelson/tmp/dpep-work.Zny9K3/qt4-x11-4.0.1/tools/assistant/lib/qassistantclient.cpp	2005-09-11 09:01:31.000000000 -0700
-@@ -128,11 +128,11 @@
-     : QObject( parent ), host ( "localhost" )
+diff -urNad qt4-x11-4.3.0~rc1~/tools/assistant/lib/qassistantclient.cpp qt4-x11-4.3.0~rc1/tools/assistant/lib/qassistantclient.cpp
+--- qt4-x11-4.3.0~rc1~/tools/assistant/lib/qassistantclient.cpp	2007-05-06 17:54:36.000000000 +0200
++++ qt4-x11-4.3.0~rc1/tools/assistant/lib/qassistantclient.cpp	2007-05-18 09:43:26.000000000 +0200
+@@ -172,11 +172,11 @@
+     : QObject( parent ), host ( QLatin1String("localhost") )
  {
      if ( path.isEmpty() )
--        assistantCommand = "assistant";
-+        assistantCommand = "assistant-qt4";
+-        assistantCommand = QLatin1String("assistant");
++        assistantCommand = QLatin1String("assistant-qt4");
      else {
          QFileInfo fi( path );
          if ( fi.isDir() )
--            assistantCommand = path + "/assistant";
-+            assistantCommand = path + "/assistant-qt4";
+-            assistantCommand = path + QLatin1String("/assistant");
++            assistantCommand = path + QLatin1String("/assistant-qt4");
          else
              assistantCommand = path;
      }
diff --git a/debian/patches/03_launch_moc-qt4.dpatch b/debian/patches/03_launch_moc-qt4.dpatch
index e5d7cdd..dc621df 100755
--- a/debian/patches/03_launch_moc-qt4.dpatch
+++ b/debian/patches/03_launch_moc-qt4.dpatch
@@ -5,15 +5,15 @@
 ## DP: Ensure the Qt4 version of moc is launched.
 
 @DPATCH@
-diff -urNad qt4-x11-4.2.2~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp qt4-x11-4.2.2/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
---- qt4-x11-4.2.2~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	2006-11-27 12:26:30.000000000 -0500
-+++ qt4-x11-4.2.2/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	2007-03-03 12:53:16.000000000 -0500
-@@ -375,7 +375,7 @@
+diff -urNad qt4-x11-4.3.0~rc1~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp qt4-x11-4.3.0~rc1/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+--- qt4-x11-4.3.0~rc1~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	2007-05-06 17:54:54.000000000 +0200
++++ qt4-x11-4.3.0~rc1/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	2007-05-18 09:44:18.000000000 +0200
+@@ -376,7 +376,7 @@
          else {
              // run moc on this file
              QProcess proc;
--            proc.start(QLatin1String("moc"), QStringList() << QFile::decodeName(argv[i]));
-+            proc.start(QLatin1String("moc-qt4"), QStringList() << QFile::decodeName(argv[i]));
+-            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
++            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc-qt4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
  
              if (!proc.waitForStarted()) {
                  fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n");
diff --git a/debian/patches/04_utf8_bug_fix.dpatch b/debian/patches/04_utf8_bug_fix.dpatch
deleted file mode 100755
index a5453ce..0000000
--- a/debian/patches/04_utf8_bug_fix.dpatch
+++ /dev/null
@@ -1,141 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_utf8_bug_fix.dpatch by Brian Nelson <pyro@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt4-x11-4.2.2~/src/corelib/codecs/qutfcodec.cpp qt4-x11-4.2.2/src/corelib/codecs/qutfcodec.cpp
---- qt4-x11-4.2.2~/src/corelib/codecs/qutfcodec.cpp	2006-11-27 12:26:05.000000000 -0500
-+++ qt4-x11-4.2.2/src/corelib/codecs/qutfcodec.cpp	2007-03-30 10:38:53.000000000 -0400
-@@ -127,15 +127,19 @@
-     bool headerdone = false;
-     QChar replacement = QChar::ReplacementCharacter;
-     int need = 0;
-+    int error = -1;
-     uint uc = 0;
-+    uint min_uc = 0;
-     if (state) {
-         if (state->flags & IgnoreHeader)
-             headerdone = true;
-         if (state->flags & ConvertInvalidToNull)
-             replacement = QChar::Null;
-         need = state->remainingChars;
--        if (need)
-+        if (need) {
-             uc = state->state_data[0];
-+            min_uc = state->state_data[1];
-+        }
-     }
-     if (!headerdone && len > 3
-         && (uchar)chars[0] == 0xef && (uchar)chars[1] == 0xbb && (uchar)chars[2] == 0xbf) {
-@@ -152,7 +156,7 @@
-     int invalid = 0;
- 
-     for (int i=0; i<len; i++) {
--        ch = *chars++;
-+        ch = chars[i];
-         if (need) {
-             if ((ch&0xc0) == 0x80) {
-                 uc = (uc << 6) | (ch & 0x3f);
-@@ -163,14 +167,27 @@
-                         uc -= 0x10000;
-                         unsigned short high = uc/0x400 + 0xd800;
-                         unsigned short low = uc%0x400 + 0xdc00;
-+
-+                        // resize if necessary
-+                        long where = qch - result.unicode();
-+                        if (where + 2 >= result.size()) {
-+                            result.resize(where + 2);
-+                            qch = result.data() + where;
-+                        }
-+
-                         *qch++ = QChar(high);
-                         *qch++ = QChar(low);
-+                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+                        // error
-+                        *qch++ = QChar::ReplacementCharacter;
-+                        ++invalid;
-                     } else {
-                         *qch++ = uc;
-                     }
-                 }
-             } else {
-                 // error
-+                i = error;
-                 *qch++ = QChar::ReplacementCharacter;
-                 ++invalid;
-                 need = 0;
-@@ -181,12 +198,22 @@
-             } else if ((ch & 0xe0) == 0xc0) {
-                 uc = ch & 0x1f;
-                 need = 1;
-+                error = i;
-+                min_uc = 0x80;
-             } else if ((ch & 0xf0) == 0xe0) {
-                 uc = ch & 0x0f;
-                 need = 2;
-+                error = i;
-+                min_uc = 0x800;
-             } else if ((ch&0xf8) == 0xf0) {
-                 uc = ch & 0x07;
-                 need = 3;
-+                error = i;
-+                min_uc = 0x10000;
-+            } else {
-+                // error
-+                *qch++ = QChar::ReplacementCharacter;
-+                ++invalid;
-             }
-         }
-     }
-@@ -197,6 +224,7 @@
-         if (headerdone)
-             state->flags |= IgnoreHeader;
-         state->state_data[0] = need ? uc : 0;
-+        state->state_data[1] = need ? min_uc : 0;
-     }
-     return result;
- }
-diff -urNad qt4-x11-4.2.2~/src/corelib/tools/qstring.cpp qt4-x11-4.2.2/src/corelib/tools/qstring.cpp
---- qt4-x11-4.2.2~/src/corelib/tools/qstring.cpp	2006-11-27 12:26:07.000000000 -0500
-+++ qt4-x11-4.2.2/src/corelib/tools/qstring.cpp	2007-03-30 10:38:53.000000000 -0400
-@@ -3352,6 +3352,7 @@
-     result.resize(size); // worst case
-     ushort *qch = result.d->data;
-     uint uc = 0;
-+    uint min_uc = 0;
-     int need = 0;
-     int error = -1;
-     uchar ch;
-@@ -3369,6 +3370,12 @@
-                         ushort low = uc%0x400 + 0xdc00;
-                         *qch++ = high;
-                         *qch++ = low;
-+                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+			// overlong seqence, UTF16 surrogate or BOM
-+                        i = error;
-+                        qch = addOne(qch, result);
-+                        *qch++ = 0xdbff;
-+                        *qch++ = 0xde00 + ((uchar)str[i]);
-                     } else {
-                         *qch++ = uc;
-                     }
-@@ -3391,14 +3398,17 @@
-                 uc = ch & 0x1f;
-                 need = 1;
-                 error = i;
-+                min_uc = 0x80;
-             } else if ((ch & 0xf0) == 0xe0) {
-                 uc = ch & 0x0f;
-                 need = 2;
-                 error = i;
-+                min_uc = 0x800;
-             } else if ((ch&0xf8) == 0xf0) {
-                 uc = ch & 0x07;
-                 need = 3;
-                 error = i;
-+                min_uc = 0x10000;
-             } else {
-                 // Error
-                 qch = addOne(qch, result);
diff --git a/debian/patches/30_arm_ftbfs_fixes.dpatch b/debian/patches/30_arm_ftbfs_fixes.dpatch
index ae2f46c..32b7851 100755
--- a/debian/patches/30_arm_ftbfs_fixes.dpatch
+++ b/debian/patches/30_arm_ftbfs_fixes.dpatch
@@ -1,23 +1,35 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_arm_ftbfs_fixes.dpatch by Brian Nelson <pyro@debian.org> by way of
-## Jeremy Laine <jeremy.laine@m4x.org>.
+## 30_arm_ftbfs_fixes.dpatch by Fathi Boudra <fboudra@free.fr>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes FTBFS on arm
+## DP: Fix arm FTBFS. Add arm target to configure script.
 
 @DPATCH@
-diff -urNad qt4-x11-4.2.0~/src/corelib/global/qglobal.h qt4-x11-4.2.0/src/corelib/global/qglobal.h
---- qt4-x11-4.2.0~/src/corelib/global/qglobal.h	2006-10-05 21:46:36.000000000 -0400
-+++ qt4-x11-4.2.0/src/corelib/global/qglobal.h	2006-10-05 21:46:44.000000000 -0400
-@@ -792,8 +792,9 @@
+diff -urNad qt4-x11-4.3.0~rc1~/configure qt4-x11-4.3.0~rc1/configure
+--- qt4-x11-4.3.0~rc1~/configure	2007-05-06 17:54:53.000000000 +0200
++++ qt4-x11-4.3.0~rc1/configure	2007-05-20 16:10:15.000000000 +0200
+@@ -2204,6 +2204,12 @@
+     	fi
+     	ARCH=s390
+     	;;
++    *:*:arm*)
++        if [ "$OPT_VERBOSE" = "yes" ]; then
++            echo "    ARM (arm)"
++        fi
++        ARCH=arm
++        ;;
+     *:*:*)
+         if [ "$OPT_VERBOSE" = "yes" ]; then
+             echo "    Trying '$UNAME_MACHINE'..."
+diff -urNad qt4-x11-4.3.0~rc1~/tools/qtestlib/src/qtestcase.h qt4-x11-4.3.0~rc1/tools/qtestlib/src/qtestcase.h
+--- qt4-x11-4.3.0~rc1~/tools/qtestlib/src/qtestcase.h	2007-05-06 17:54:35.000000000 +0200
++++ qt4-x11-4.3.0~rc1/tools/qtestlib/src/qtestcase.h	2007-05-20 16:11:07.000000000 +0200
+@@ -195,7 +195,7 @@
+     template <typename T1, typename T2>
+     bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int);
  
- #if defined(QT_COORD_TYPE)
- typedef QT_COORD_TYPE qreal;
--#elif defined(__arm__)
--typedef float qreal;
-+// BN: Defining qreal as float on arm breaks compilation!
-+//#elif defined(__arm__)
-+//typedef float qreal;
- #else
- typedef double qreal;
- #endif
+-#if defined(QT_COORD_TYPE) || defined(__arm__)
++#if defined(QT_COORD_TYPE) || defined(QT_ARCH_ARM)
+     template <>
+     inline bool qCompare<qreal, double>(qreal const &t1, double const &t2, const char *actual,
+                                  const char *expected, const char *file, int line)
diff --git a/debian/patches/41_alpha_disable_opengl_visibility.dpatch b/debian/patches/41_disable_opengl_visibility.dpatch
index 040e695..040e695 100644..100755
--- a/debian/patches/41_alpha_disable_opengl_visibility.dpatch
+++ b/debian/patches/41_disable_opengl_visibility.dpatch
diff --git a/debian/patches/50_kfreebsd_build_fix.dpatch b/debian/patches/50_kfreebsd_build_fix.dpatch
index 1d018a3..2b20436 100755
--- a/debian/patches/50_kfreebsd_build_fix.dpatch
+++ b/debian/patches/50_kfreebsd_build_fix.dpatch
@@ -1,14 +1,14 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_kfreebsd_build_fix.dpatch by Petr Salinger <Petr.Salinger@seznam.cz> 
+## 14_kfreebsd_build_fix.dpatch by Petr Salinger <Petr.Salinger@seznam.cz>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC
+## DP: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
 
 @DPATCH@
-diff -ur qt4-x11-4.2.1/src/corelib/global/qglobal.h qt4-x11-4.2.1/src/corelib/global/qglobal.h
---- qt4-x11-4.2.1/src/corelib/global/qglobal.h	2006-10-20 17:35:14.000000000 +0200
-+++ qt4-x11-4.2.1/src/corelib/global/qglobal.h	2006-12-06 23:06:11.000000000 +0100
-@@ -101,6 +102,12 @@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/global/qglobal.h qt4-x11-4.3.0~rc1/src/corelib/global/qglobal.h
+--- qt4-x11-4.3.0~rc1~/src/corelib/global/qglobal.h	2007-05-06 17:54:22.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/global/qglobal.h	2007-05-18 10:48:20.000000000 +0200
+@@ -110,6 +110,12 @@
  #  define Q_OS_RELIANT
  #elif defined(__linux__) || defined(__linux)
  #  define Q_OS_LINUX
@@ -21,21 +21,21 @@ diff -ur qt4-x11-4.2.1/src/corelib/global/qglobal.h qt4-x11-4.2.1/src/corelib/gl
  #elif defined(__FreeBSD__) || defined(__DragonFly__)
  #  define Q_OS_FREEBSD
  #  define Q_OS_BSD4
-@@ -121,8 +128,6 @@
+@@ -130,8 +136,6 @@
  #  define Q_OS_AIX
  #elif defined(__Lynx__)
  #  define Q_OS_LYNX
--#elif defined(__GNU_HURD__)
+-#elif defined(__GNU__)
 -#  define Q_OS_HURD
  #elif defined(__DGUX__)
  #  define Q_OS_DGUX
  #elif defined(__QNXNTO__)
-diff -ur qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp
---- qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp	2006-10-20 17:35:15.000000000 +0200
-+++ qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp	2006-12-07 09:01:45.000000000 +0100
-@@ -248,11 +248,11 @@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/plugin/qlibrary.cpp qt4-x11-4.3.0~rc1/src/corelib/plugin/qlibrary.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/plugin/qlibrary.cpp	2007-05-06 17:54:24.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/plugin/qlibrary.cpp	2007-05-18 10:50:38.000000000 +0200
+@@ -278,11 +278,11 @@
  
- #if defined(Q_OS_UNIX)
+ #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
  
 -#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX)
 +#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC)
@@ -47,19 +47,19 @@ diff -ur qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp qt4-x11-4.2.1/src/corelib
  
  static long qt_find_pattern(const char *s, ulong s_len,
                               const char *pattern, ulong p_len)
-diff -ur qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp
---- qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp	2006-10-20 17:35:15.000000000 +0200
-+++ qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp	2006-12-07 09:01:22.000000000 +0100
-@@ -47,7 +47,7 @@
- #include <stdlib.h>
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp	2007-05-06 17:54:24.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp	2007-05-18 10:51:21.000000000 +0200
+@@ -48,7 +48,7 @@
  #include <qdebug.h>
+ #include <time.h>
  
 -#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
 +#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__)
  #    include <fenv.h>
  #endif
  
-@@ -5639,7 +5639,7 @@
+@@ -5906,7 +5906,7 @@
      _control87(MCW_EM, MCW_EM);
  #endif
  
@@ -68,7 +68,7 @@ diff -ur qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp qt4-x11-4.2.1/src/corelib/t
      fenv_t envp;
      feholdexcept(&envp);
  #endif
-@@ -5655,7 +5655,7 @@
+@@ -5922,7 +5922,7 @@
  #endif //_M_X64
  #endif //Q_OS_WIN
  
diff --git a/debian/patches/71_hppa_inotify_fix.dpatch b/debian/patches/71_hppa_inotify_fix.dpatch
deleted file mode 100755
index fb679e6..0000000
--- a/debian/patches/71_hppa_inotify_fix.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_hppa_inotify_fix.dpatch by Brian Nelson <pyro@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt4-x11-4.2.1~/src/corelib/io/qfilesystemwatcher_inotify.cpp qt4-x11-4.2.1/src/corelib/io/qfilesystemwatcher_inotify.cpp
---- qt4-x11-4.2.1~/src/corelib/io/qfilesystemwatcher_inotify.cpp	2006-10-24 12:10:36.000000000 -0400
-+++ qt4-x11-4.2.1/src/corelib/io/qfilesystemwatcher_inotify.cpp	2006-10-24 12:16:35.000000000 -0400
-@@ -88,6 +88,10 @@
- # define __NR_inotify_init      284
- # define __NR_inotify_add_watch 285
- # define __NR_inotify_rm_watch  286
-+#elif defined (__hppa__)
-+# define __NR_inotify_init      269
-+# define __NR_inotify_add_watch 270
-+# define __NR_inotify_rm_watch  271
- #else
- # error "This architecture is not supported. Please talk to qt-bugs@trolltech.com"
- #endif
diff --git a/debian/patches/80_hurd_max_path.dpatch b/debian/patches/80_hurd_max_path.dpatch
index 8a2b341..f43dfd5 100644
--- a/debian/patches/80_hurd_max_path.dpatch
+++ b/debian/patches/80_hurd_max_path.dpatch
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad qt4-x11-4.2.2~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.2.2/src/corelib/io/qfsfileengine_unix.cpp
---- qt4-x11-4.2.2~/src/corelib/io/qfsfileengine_unix.cpp	2006-11-27 12:26:06.000000000 -0500
-+++ qt4-x11-4.2.2/src/corelib/io/qfsfileengine_unix.cpp	2007-03-04 10:50:03.000000000 -0500
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp	2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp	2007-05-18 11:11:35.000000000 +0200
 @@ -40,6 +40,10 @@
  # include <private/qcore_mac_p.h>
  #endif
@@ -16,6 +16,6 @@ diff -urNad qt4-x11-4.2.2~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.2.2/s
 +#define PATH_MAX 4096
 +#endif
 +
- void QFSFileEnginePrivate::init()
- {
- }
+ /*!
+     \internal
+ 
diff --git a/debian/qt4-dev-tools.install b/debian/qt4-dev-tools.install
index 6fe1401..cc8d7c1 100644
--- a/debian/qt4-dev-tools.install
+++ b/debian/qt4-dev-tools.install
@@ -1,3 +1,5 @@
 usr/bin/assistant-qt4
 usr/bin/linguist-qt4
+usr/bin/qdbusviewer
+usr/bin/pixeltool
 usr/share/qt4/phrasebooks/*
diff --git a/debian/rules b/debian/rules
index 4a31cd7..e130514 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,10 @@ export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_MAKE_INVOKE := $(MAKE)
-DEB_MAKE_BUILD_TARGET := sub-src sub-tools 
+DEB_MAKE_BUILD_TARGET := sub-src sub-tools
 DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
@@ -20,7 +21,9 @@ DEB_DH_INSTALL_ARGS := --exclude=.debug
 DEB_MAKE_CLEAN_TARGET := confclean distclean
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 
-DEB_INSTALL_CHANGELOGS_ALL := changes-4.2.3
+DEB_DH_STRIP_ARGS_libqt4-debug := -X.debug
+
+DEB_INSTALL_CHANGELOGS_ALL := changes-4.3.0
 
 ifeq ($(DEB_HOST_ARCH),arm)
 	EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
@@ -32,7 +35,6 @@ else
         PLATFORM_ARG = glibc-g++
 endif
 
-
 common-configure-arch::
 	./configure -confirm-license \
 	            -prefix "/usr" \
@@ -43,7 +45,6 @@ common-configure-arch::
 	            -translationdir "/usr/share/qt4/translations" \
 	            -sysconfdir "/etc/xdg" \
 	            -platform $(PLATFORM_ARG) \
-		    -debug-and-release \
 	            -fast \
 	            -no-rpath \
 	            -system-zlib \
@@ -53,12 +54,18 @@ common-configure-arch::
 	            -qt-gif \
 	            -qt-sql-psql \
 	            -qt-sql-mysql \
-		    -qt-sql-sqlite \
+	            -qt-sql-sqlite \
 	            -system-sqlite \
 	            -qt-sql-sqlite2 \
 	            -I/usr/include/freetype2 \
 	            -lfontconfig \
 	            -cups \
+	            -no-exceptions \
+	            -debug \
+	            -qdbus \
+	            -pch \
+	            -nomake examples \
+	            -nomake demos \
 	            $(EXTRA_CONFIGURE_OPTS)
 
 clean::
@@ -76,6 +83,11 @@ clean::
 
 	rm -rf lib/ plugins/
 
+	find . -exec file {} \; | grep ELF | sed 's/:.*//'  | xargs rm -f
+	rm -f examples/tools/plugandpaint/plugins/libpnp_basictools.a
+	rm -f examples/qdbus/complexpingpong/Makefile*
+	rm -f examples/qdbus/pingpong/Makefile*
+
 	find include/ -type l -print0 | xargs -0r rm -f
 	find . -mindepth 2 -name Makefile -print0 \
 	                -o -name Makefile.Debug -print0 \
@@ -85,7 +97,6 @@ clean::
 # Hack to fix dpatch-edit-patch
 unpatch: deapply-dpatches
 
-
 BINDIR := $(DEB_DESTDIR)/usr/bin
 common-install-arch::
 # Tack on -qt4 to the binaries that use the alternatives system
@@ -93,6 +104,20 @@ common-install-arch::
 	    mv "$(BINDIR)/$$f" "$(BINDIR)/$$f-qt4"; \
 	done
 
+install/qt4-designer::
+	install -D -p -m0644 debian/desktop/designer-qt4.desktop \
+		debian/qt4-designer/usr/share/applications/designer-qt4.desktop
+
+install/qt4-dev-tools::
+	install -D -p -m0644 debian/desktop/assistant-qt4.desktop \
+		debian/qt4-dev-tools/usr/share/applications/assistant-qt4.desktop
+	install -D -p -m0644 debian/desktop/linguist-qt4.desktop \
+		debian/qt4-dev-tools/usr/share/applications/linguist-qt4.desktop
+
+install/qt4-qtconfig::
+	install -D -p -m0644 debian/desktop/qt4config.desktop \
+		debian/qt4-qtconfig/usr/share/applications/qt4config.desktop
+
 binary-install/qt4-doc::
 # Tar up the examples to include them in qt4-doc
 	-$(MAKE) -k -C examples distclean