* Move qglobal.h from libqt4-opengl-dev to libqt4-dev.debian/4.4.0-1

  * Split html documentation in qt4-doc-html package.
  * Merge Ubuntu patches:
    * Add lpia architecture in trusted dpkg-arch over uname.
    * Add sqlite3 workaround in config tests fixes.

13 files changed, 48 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index d6f4d60..29d90f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,10 @@ qt4-x11 (4.4.0-1) unstable; urgency=low
       This patch assures that if no header is shown, or if we only have one
       column (so no other columns become shrinked), the contents will be
       visible.
+  * Split html documentation in qt4-doc-html package.
+  * Merge Ubuntu patches:
+    * Add lpia architecture in trusted dpkg-arch over uname.
+    * Add sqlite3 workaround in config tests fixes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 06 May 2008 17:37:49 +0200
 
diff --git a/debian/control b/debian/control
index 36a2704..5dff360 100644
--- a/debian/control
+++ b/debian/control
@@ -453,8 +453,22 @@ Description: Qt 4 API documentation
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the complete Qt 4 API documentation.
+ This package contains the complete Qt 4 API documentation (new help format).
  .
- The documentation is provided in HTML and manpage format; the HTML version can
- be viewed in conjunction with the Qt Assistant found in the qt4-dev-tools
- package.
+ The documentation is provided in the new help format and manpage format;
+ the new help format version can be viewed in conjunction with the Qt Assistant
+ found in the qt4-dev-tools package.
+
+Package: qt4-doc-html
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: w3m | www-browser, libqt4-dev, qt4-dev-tools
+Description: Qt 4 API documentation (HTML format)
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the complete Qt 4 API documentation (HTML format).
+ .
+ The documentation is provided in HTML format; the HTML version can be viewed
+ in conjunction with the Qt Assistant adp found in the qt4-dev-tools package.
diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install
index 863103b..dd4d1a6 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -269,6 +269,7 @@ usr/include/qt4/Qt/qfuture.h
 usr/include/qt4/Qt/qfutureinterface.h
 usr/include/qt4/Qt/qfuturesynchronizer.h
 usr/include/qt4/Qt/qfuturewatcher.h
+usr/include/qt4/Qt/qglobal.h
 usr/include/qt4/Qt/qgraphicsgridlayout.h
 usr/include/qt4/Qt/qgraphicsitem.h
 usr/include/qt4/Qt/qgraphicsitemanimation.h
diff --git a/debian/libqt4-opengl-dev.install b/debian/libqt4-opengl-dev.install
index 9d3396f..fd86128 100644
--- a/debian/libqt4-opengl-dev.install
+++ b/debian/libqt4-opengl-dev.install
@@ -2,7 +2,6 @@ usr/include/qt4/Qt/QtOpenGL
 usr/include/qt4/Qt/qgl.h
 usr/include/qt4/Qt/qglcolormap.h
 usr/include/qt4/Qt/qglframebufferobject.h
-usr/include/qt4/Qt/qglobal.h
 usr/include/qt4/Qt/qglpixelbuffer.h
 usr/include/qt4/QtOpenGL/QGLColormap
 usr/include/qt4/QtOpenGL/QGLContext
diff --git a/debian/patches/0226-qtreeview-column_resize_when_needed.diff b/debian/patches/0226-qtreeview-column_resize_when_needed.diff
index 28bd458..180abec 100644
--- a/debian/patches/0226-qtreeview-column_resize_when_needed.diff
+++ b/debian/patches/0226-qtreeview-column_resize_when_needed.diff
@@ -1,5 +1,5 @@
-qt-bugs@ issue : None
-Trolltech task ID : None
+qt-bugs@ issue : N209927
+Trolltech task ID : 210390
 bugs.kde.org number : None
 applied: no
 author: Rafael Fernández López <ereslibre@kde.org>
diff --git a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
index ce40ef6..276ebd6 100644
--- a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
+++ b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
@@ -2,7 +2,7 @@ author: Sune Vuorela
 Reported to trolltech as N180631 - and task 181882
 --- a/configure
 +++ b/configure
-@@ -93,7 +93,44 @@
+@@ -93,7 +93,47 @@
  #-------------------------------------------------------------------------------
  
  # need that throughout the script
@@ -33,6 +33,9 @@ Reported to trolltech as N180631 - and task 181882
 +	kfreebsd-i386)
 +		UNAME_MACHINE="i586"
 +	;;
++	lpia)
++		UNAME_MACHINE="i686"
++	;;
 +	mipsel)
 +		UNAME_MACHINE="mips"
 +	;;
diff --git a/debian/patches/09_qmake_lflags_as-needed.diff b/debian/patches/09_qmake_lflags_as-needed.diff
index 6970386..3c6a848 100644
--- a/debian/patches/09_qmake_lflags_as-needed.diff
+++ b/debian/patches/09_qmake_lflags_as-needed.diff
@@ -5,7 +5,7 @@ Bug reported to Trolltech.
 
 --- a/configure
 +++ b/configure
-@@ -497,6 +497,8 @@
+@@ -500,6 +500,8 @@
  rm -f "$outpath/config.tests/.qmake.cache"
  cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
  
diff --git a/debian/patches/10_config_tests_fixes.diff b/debian/patches/10_config_tests_fixes.diff
index eafb8d3..14db57a 100644
--- a/debian/patches/10_config_tests_fixes.diff
+++ b/debian/patches/10_config_tests_fixes.diff
@@ -56,3 +56,11 @@
  
  win32:!contains( LIBS, .*gds.* ):!contains( LIBS, .*fbclient.* ) {
  	!win32-borland:LIBS *= -lgds32_ms
+--- a/config.tests/unix/sqlite/sqlite.pro
++++ b/config.tests/unix/sqlite/sqlite.pro
+@@ -1,4 +1,4 @@
+ SOURCES = sqlite.cpp
+ CONFIG -= qt dylib
+ mac:CONFIG -= app_bundle
+-LIBS += -lsqlite3
++LIBS += -lsqlite3 -ldl
diff --git a/debian/qt4-doc.doc-base b/debian/qt4-doc-html.doc-base
index edb398d..58063c6 100644
--- a/debian/qt4-doc.doc-base
+++ b/debian/qt4-doc-html.doc-base
@@ -1,4 +1,4 @@
-Document: qt4-doc
+Document: qt4-doc-html
 Title: Qt4 Reference Documentation
 Author: Trolltech AS
 Abstract: Qt is a cross-platform C++ application framework.  Qt's
@@ -7,5 +7,5 @@ Abstract: Qt is a cross-platform C++ application framework.  Qt's
 Section: Apps/programming
 
 Format: HTML
-Index: /usr/share/doc/qt4-doc/html/index.html
-Files: /usr/share/doc/qt4-doc/html/*.html
+Index: /usr/share/doc/qt4-doc-html/html/index.html
+Files: /usr/share/doc/qt4-doc-html/html/*.html
diff --git a/debian/qt4-doc-html.install b/debian/qt4-doc-html.install
new file mode 100644
index 0000000..8467be4
--- /dev/null
+++ b/debian/qt4-doc-html.install
@@ -0,0 +1,2 @@
+usr/share/qt4/doc/html
+
diff --git a/debian/qt4-doc-html.links b/debian/qt4-doc-html.links
new file mode 100644
index 0000000..d1fed65
--- /dev/null
+++ b/debian/qt4-doc-html.links
@@ -0,0 +1,2 @@
+usr/share/qt4/doc/html usr/share/doc/qt4-doc-html/html
+
diff --git a/debian/qt4-doc.install b/debian/qt4-doc.install
index 382ff3e..2329f40 100644
--- a/debian/qt4-doc.install
+++ b/debian/qt4-doc.install
@@ -1 +1,3 @@
-usr/share/qt4/doc
+usr/share/qt4/doc/qch
+usr/share/qt4/doc/src
+
diff --git a/debian/qt4-doc.links b/debian/qt4-doc.links
deleted file mode 100644
index a561f03..0000000
--- a/debian/qt4-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/qt4/doc/html          usr/share/doc/qt4-doc/html