rev 10507 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Fri May 9 12:42:37 UTC 2008
Author: fabo
Date: 2008-05-09 12:42:37 +0000 (Fri, 09 May 2008)
New Revision: 10507
Added:
trunk/packages/qt4-x11/debian/qt4-doc-html.doc-base
trunk/packages/qt4-x11/debian/qt4-doc-html.install
trunk/packages/qt4-x11/debian/qt4-doc-html.links
Removed:
trunk/packages/qt4-x11/debian/qt4-doc.doc-base
trunk/packages/qt4-x11/debian/qt4-doc.links
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/control
trunk/packages/qt4-x11/debian/libqt4-dev.install
trunk/packages/qt4-x11/debian/libqt4-opengl-dev.install
trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff
trunk/packages/qt4-x11/debian/qt4-doc.install
Log:
* Move qglobal.h from libqt4-opengl-dev to libqt4-dev.
* 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.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2008-05-07 23:19:28 UTC (rev 10506)
+++ trunk/packages/qt4-x11/debian/changelog 2008-05-09 12:42:37 UTC (rev 10507)
@@ -34,6 +34,10 @@
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 at lists.debian.org> Tue, 06 May 2008 17:37:49 +0200
Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control 2008-05-07 23:19:28 UTC (rev 10506)
+++ trunk/packages/qt4-x11/debian/control 2008-05-09 12:42:37 UTC (rev 10507)
@@ -453,8 +453,22 @@
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.
Modified: trunk/packages/qt4-x11/debian/libqt4-dev.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dev.install 2008-05-07 23:19:28 UTC (rev 10506)
+++ trunk/packages/qt4-x11/debian/libqt4-dev.install 2008-05-09 12:42:37 UTC (rev 10507)
@@ -269,6 +269,7 @@
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
Modified: trunk/packages/qt4-x11/debian/libqt4-opengl-dev.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-opengl-dev.install 2008-05-07 23:19:28 UTC (rev 10506)
+++ trunk/packages/qt4-x11/debian/libqt4-opengl-dev.install 2008-05-09 12:42:37 UTC (rev 10507)
@@ -2,7 +2,6 @@
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
Modified: trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff 2008-05-07 23:19:28 UTC (rev 10506)
+++ trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff 2008-05-09 12:42:37 UTC (rev 10507)
@@ -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 at kde.org>
Modified: trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff 2008-05-07 23:19:28 UTC (rev 10506)
+++ trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff 2008-05-09 12:42:37 UTC (rev 10507)
@@ -2,7 +2,7 @@
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 @@
+ kfreebsd-i386)
+ UNAME_MACHINE="i586"
+ ;;
++ lpia)
++ UNAME_MACHINE="i686"
++ ;;
+ mipsel)
+ UNAME_MACHINE="mips"
+ ;;
Modified: trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2008-05-07 23:19:28 UTC (rev 10506)
+++ trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2008-05-09 12:42:37 UTC (rev 10507)
@@ -5,7 +5,7 @@
--- 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"
Modified: trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff 2008-05-07 23:19:28 UTC (rev 10506)
+++ trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff 2008-05-09 12:42:37 UTC (rev 10507)
@@ -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
Added: trunk/packages/qt4-x11/debian/qt4-doc-html.doc-base
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-doc-html.doc-base (rev 0)
+++ trunk/packages/qt4-x11/debian/qt4-doc-html.doc-base 2008-05-09 12:42:37 UTC (rev 10507)
@@ -0,0 +1,11 @@
+Document: qt4-doc-html
+Title: Qt4 Reference Documentation
+Author: Trolltech AS
+Abstract: Qt is a cross-platform C++ application framework. Qt's
+ primary feature is its rich set of widgets that provide standard GUI
+ functionality.
+Section: Apps/programming
+
+Format: HTML
+Index: /usr/share/doc/qt4-doc-html/html/index.html
+Files: /usr/share/doc/qt4-doc-html/html/*.html
Added: trunk/packages/qt4-x11/debian/qt4-doc-html.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-doc-html.install (rev 0)
+++ trunk/packages/qt4-x11/debian/qt4-doc-html.install 2008-05-09 12:42:37 UTC (rev 10507)
@@ -0,0 +1,2 @@
+usr/share/qt4/doc/html
+
Added: trunk/packages/qt4-x11/debian/qt4-doc-html.links
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-doc-html.links (rev 0)
+++ trunk/packages/qt4-x11/debian/qt4-doc-html.links 2008-05-09 12:42:37 UTC (rev 10507)
@@ -0,0 +1,2 @@
+usr/share/qt4/doc/html usr/share/doc/qt4-doc-html/html
+
Deleted: trunk/packages/qt4-x11/debian/qt4-doc.doc-base
Modified: trunk/packages/qt4-x11/debian/qt4-doc.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-doc.install 2008-05-07 23:19:28 UTC (rev 10506)
+++ trunk/packages/qt4-x11/debian/qt4-doc.install 2008-05-09 12:42:37 UTC (rev 10507)
@@ -1 +1,3 @@
-usr/share/qt4/doc
+usr/share/qt4/doc/qch
+usr/share/qt4/doc/src
+
Deleted: trunk/packages/qt4-x11/debian/qt4-doc.links
More information about the pkg-kde-commits
mailing list