rev 13318 - in branches/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-01-12 15:11:24 +0000 (Mon, 12 Jan 2009)
New Revision: 13318

Modified:
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
   branches/qt4-x11/debian/patches/series
   branches/qt4-x11/debian/qt4-doc-html.install
   branches/qt4-x11/debian/qt4-doc.install
   branches/qt4-x11/debian/rules
Log:
* Build documentations if current version is a snapshot.
* Update Debian patches:
  - 16_hide_std_symbols_on_qtwebkit.diff


Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2009-01-12 13:40:19 UTC (rev 13317)
+++ branches/qt4-x11/debian/changelog	2009-01-12 15:11:24 UTC (rev 13318)
@@ -1,20 +1,19 @@
 qt4-x11 (4.5.0~beta1+snapshot20090110-1) UNRELEASED; urgency=low
 
-  Note: snapshots don't contain documentations.
-
   * New upstream release.
   * Add libgtk2.0-dev build dependency to enable GTK theme support.
   * Add package libqt4-scripttools: The QtScriptTools module provides
     additional components for applications that use Qt Script.
   * Clean up the prl postprocessing.
-  * Refresh patches.
-  * Update patches.
+  * Build documentations if current version is a snapshot.
   * Add Debian patches:
     - 18_enable_qt3support_qtwebkit_debug_info.diff
       On Qt >= 4.5, debug info are disabled for Qt3Support and QtWebkit.
       This patch enable them.
   * Remove Debian patches:
     - 12_fix_qmake_pkgconfig.diff
+  * Update Debian patches:
+    - 16_hide_std_symbols_on_qtwebkit.diff
 
   +++ TODO:
 

Modified: branches/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
===================================================================
--- branches/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff	2009-01-12 13:40:19 UTC (rev 13317)
+++ branches/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff	2009-01-12 15:11:24 UTC (rev 13318)
@@ -1,13 +1,13 @@
 --- a/src/3rdparty/webkit/WebKit.pri
 +++ b/src/3rdparty/webkit/WebKit.pri
-@@ -27,6 +27,7 @@ CONFIG(release) {
+@@ -26,6 +26,7 @@ CONFIG(release) {
+ 
  BASE_DIR = $$PWD
- qt-port:INCLUDEPATH += \
-     $$PWD/WebKit/qt/Api
-+qt-port:QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
- gtk-port:INCLUDEPATH += \
-     $$BASE_DIR/WebCore/platform/gtk \
-     $$BASE_DIR/WebCore/platform/network/curl \
+ INCLUDEPATH += $$PWD/WebKit/qt/Api
++QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
+ 
+ #
+ # For builds inside Qt we interpret the output rule and the input of each extra compiler manually
 --- /dev/null
 +++ b/src/3rdparty/webkit/symbols.filter
 @@ -0,0 +1,5 @@

Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series	2009-01-12 13:40:19 UTC (rev 13317)
+++ branches/qt4-x11/debian/patches/series	2009-01-12 15:11:24 UTC (rev 13318)
@@ -34,7 +34,7 @@
 10_config_tests_fixes.diff
 14_add_libraries_to_gui_build_where_actually_needed.diff
 15_fix_qmake_makefile_generation.diff
-#16_hide_std_symbols_on_qtwebkit.diff
+16_hide_std_symbols_on_qtwebkit.diff
 17_add_postgresql_8.3_support.diff
 18_enable_qt3support_qtwebkit_debug_info.diff
 #20_mips_atomic_ops.diff

Modified: branches/qt4-x11/debian/qt4-doc-html.install
===================================================================
--- branches/qt4-x11/debian/qt4-doc-html.install	2009-01-12 13:40:19 UTC (rev 13317)
+++ branches/qt4-x11/debian/qt4-doc-html.install	2009-01-12 15:11:24 UTC (rev 13318)
@@ -1,2 +1 @@
-# Disable for unofficial release like snapshots
-#usr/share/qt4/doc/html
+usr/share/qt4/doc/html

Modified: branches/qt4-x11/debian/qt4-doc.install
===================================================================
--- branches/qt4-x11/debian/qt4-doc.install	2009-01-12 13:40:19 UTC (rev 13317)
+++ branches/qt4-x11/debian/qt4-doc.install	2009-01-12 15:11:24 UTC (rev 13318)
@@ -1,3 +1,2 @@
-# Disable for unofficial release like snapshots
-#usr/share/qt4/doc/qch
+usr/share/qt4/doc/qch
 usr/share/qt4/doc/src

Modified: branches/qt4-x11/debian/rules
===================================================================
--- branches/qt4-x11/debian/rules	2009-01-12 13:40:19 UTC (rev 13317)
+++ branches/qt4-x11/debian/rules	2009-01-12 15:11:24 UTC (rev 13318)
@@ -20,10 +20,6 @@
 DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
-#ifeq (snapshot, $(findstring snapshot, $(CURRENTVERSION)))
-#	DEB_MAKE_BUILD_TARGET += docs
-#endif
-
 # Ensure the *.debug files aren't included in any package other than libqt4-dbg
 DEB_DH_INSTALL_ARGS := --exclude=.debug
 
@@ -68,6 +64,14 @@
 
 debian/stamp-makefile-build-tools: debian/stamp-makefile-build
 	$(MAKE) sub-tools
+	# Test current version is a snapshot
+ifeq (snapshot, $(findstring snapshot, $(CURRENTVERSION)))
+	# Build documentations
+	$(MAKE) docs
+	# Workaround: It's a known qmake limitation.
+	# It can't generate install rules for files that don't exist yet like docs.
+	./config.status
+endif
 	touch $@
 
 common-configure-arch:: config.status
@@ -255,10 +259,9 @@
 # Run dh_install without the default DEB_DH_INSTALL_ARGS to install the *.debug files
 	dh_install -plibqt4-xmlpatterns-dbg --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)
 
-# Disable for unofficial release like snapshots
-#binary-post-install/libqt4-dev::
-#	install -D -p -m0644 doc/html/qt.tags \
-#		$(DEB_DESTDIR)/usr/share/qt4/doc/html/qt.tags
+binary-post-install/libqt4-dev::
+	install -D -p -m0644 doc/html/qt.tags \
+		$(DEB_DESTDIR)/usr/share/qt4/doc/html/qt.tags
 
 # Automatically install lintian overrides, stolen from debian-qt-kde.mk
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: