[Python-modules-commits] r5738 - in packages/python-qt4/trunk/debian (changelog rules)

[shlomme at users.alioth.debian.org]

    Date: Wednesday, June 25, 2008 @ 00:03:01
  Author: shlomme
Revision: 5738

* finally, g++ 4.3 builds are fast again

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/rules

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2008-06-24 23:37:39 UTC (rev 5737)
+++ packages/python-qt4/trunk/debian/changelog	2008-06-25 00:03:01 UTC (rev 5738)
@@ -3,7 +3,11 @@
   * debian/patches
     - drop qreal fixes for Mips(el) to fix build failures
   * urgency=medium to help QScintilla2 migration to testing
-
+  * debian/control
+    - fix GCC version detection
+    - only split into 10 parts for non-4.2 GCCs
+    - set optimization to -O2 
+	
  -- Torsten Marek <shlomme at debian.org>  Wed, 25 Jun 2008 01:33:43 +0200
 
 python-qt4 (4.4.2-1) unstable; urgency=low

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2008-06-24 23:37:39 UTC (rev 5737)
+++ packages/python-qt4/trunk/debian/rules	2008-06-25 00:03:01 UTC (rev 5738)
@@ -13,7 +13,7 @@
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CXXFLAGS += -O0
 else
-	CXXFLAGS += -O1
+	CXXFLAGS += -O2
 endif
 
 PYTHONS := $(shell pyversions -vr debian/control)
@@ -21,8 +21,8 @@
 DEFAULT_PYTHON := $(shell pyversions -vd)
 
 
-GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
-ifneq (,$(filter $(GCCVER),4.2 4.3))
+GCCVER := $(shell gcc -dumpversion | sed 's/.[0-9]$//')
+ifneq (,$(filter $(GCCVER),4.2))
 	SPLIT=40
 else	
 	SPLIT=10