rev 8677 - branches/qt4-x11/debian

[Fathi Boudra]

Author: fabo
Date: 2007-12-31 06:58:51 +0000 (Mon, 31 Dec 2007)
New Revision: 8677

Modified:
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/control
   branches/qt4-x11/debian/rules
Log:
* Sync with Qt4.3.3-2.


Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2007-12-31 06:55:51 UTC (rev 8676)
+++ branches/qt4-x11/debian/changelog	2007-12-31 06:58:51 UTC (rev 8677)
@@ -34,7 +34,7 @@
   * Downgrade libqt4-dev dependency to qt4-dev-tools from Recommends to
     Suggests.
   * Add semicolon at the end of the MimeType key. Thanks to Pino Toscano.
-  * Revert build with --as-needed linker flag:
+  * Remove 91_qmake_ldflags_as-needed patch:
     It breaks other packages. (Closes: #457038, #457284)
   * Add 91_qmake_lflags_no-undefined patch:
     By default, qmake adds --no-undefined linker flag.

Modified: branches/qt4-x11/debian/control
===================================================================
--- branches/qt4-x11/debian/control	2007-12-31 06:55:51 UTC (rev 8676)
+++ branches/qt4-x11/debian/control	2007-12-31 06:58:51 UTC (rev 8677)
@@ -138,7 +138,6 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libqt4-core (<< 4.4.0~tp1-1)
 Replaces: libqt4-core (<< 4.4.0~tp1-1)
 Description: Qt 4 D-Bus module
  Qt is a cross-platform C++ application framework.  Qt's primary feature

Modified: branches/qt4-x11/debian/rules
===================================================================
--- branches/qt4-x11/debian/rules	2007-12-31 06:55:51 UTC (rev 8676)
+++ branches/qt4-x11/debian/rules	2007-12-31 06:58:51 UTC (rev 8677)
@@ -4,6 +4,7 @@
 export PATH := $(QTDIR)/bin:$(PATH)
 export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
 export CXXFLAGS := -fpermissive
+export LDFLAGS := -Wl,--no-undefined -Wl,--as-needed
 
 QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
 CURRENTVERSION := $(shell head -1 debian/changelog  | sed 's/[^(]*(\([^)]*\)).*/\1/')
@@ -37,7 +38,7 @@
 	EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
 endif
 
-DEB_CONFIGURE_SCRIPT_ENV += CXXFLAGS="-fpermissive"
+DEB_CONFIGURE_SCRIPT_ENV += CXXFLAGS="-fpermissive" LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
         PLATFORM_ARG = linux-g++