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

[shlomme at users.alioth.debian.org]

    Date: Tuesday, July 1, 2008 @ 09:23:48
  Author: shlomme
Revision: 5768

* properly escape $ in sed exprs
* optimize with O1 only on gcc 4.2

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-07-01 01:51:42 UTC (rev 5767)
+++ packages/python-qt4/trunk/debian/changelog	2008-07-01 09:23:48 UTC (rev 5768)
@@ -1,3 +1,12 @@
+python-qt4 (4.4.2-3) unstable; urgency=medium
+
+  * urgency=medium to speed up QScintilla2 migration to testing
+  * debian/rules
+    - properly escape dollar sign in sed expressions
+    - compile with -O1 on gcc 4.2
+
+ -- Torsten Marek <shlomme at debian.org>  Tue, 01 Jul 2008 11:22:20 +0200
+
 python-qt4 (4.4.2-2) unstable; urgency=medium
 	
   * Fix build failure on Mips(el) architectures

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2008-07-01 01:51:42 UTC (rev 5767)
+++ packages/python-qt4/trunk/debian/rules	2008-07-01 09:23:48 UTC (rev 5768)
@@ -10,18 +10,23 @@
 
 CXXFLAGS=
 
+GCCVER := $(shell gcc -dumpversion | sed -e 's/.[0-9]$$//')
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CXXFLAGS += -O0
 else
+ifneq (,$(filter $(GCCVER),4.2))
+	CXXFLAGS += -O1
+else
 	CXXFLAGS += -O2
 endif
+endif
 
 PYTHONS := $(shell pyversions -vr debian/control)
 
 DEFAULT_PYTHON := $(shell pyversions -vd)
 
 
-GCCVER := $(shell gcc -dumpversion | sed 's/.[0-9]$//')
 ifneq (,$(filter $(GCCVER),4.2))
 	SPLIT=40
 else