[Python-modules-commits] r7131 - in packages/python-qt4/trunk/debian (2 files)

[ncommander-guest at users.alioth.debian.org]

    Date: Sunday, December 21, 2008 @ 14:36:25
  Author: ncommander-guest
Revision: 7131

    - Corrects a configuration test which caused qreals to end up
      as floats on non-ARM architectures, and as doubles on ARM architectures.
    - Added handling of doubles on qreal != float for QLists

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/patches/03_qreal_float_support.dpatch

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2008-12-21 06:49:53 UTC (rev 7130)
+++ packages/python-qt4/trunk/debian/changelog	2008-12-21 14:36:25 UTC (rev 7131)
@@ -7,9 +7,10 @@
   [ Michael Casadevall ]
   * Merge of patches from Ubuntu to correct ARM support
     - Added debian/patches/03_qreal_float_support.dpatch
-      - Renamed debian/patches/kubuntu_01_armel_support.dpatch
-        to better suite its contents and for Debian
-    - Modifed pyqtconfig from python-qt4-dev to python-qt4      
+      - Corrects a configuration test which caused qreals to end up
+        as floats on non-ARM architectures, and as doubles on ARM architectures.
+      - Added handling of doubles on qreal != float for QLists
+      - Modifed pyqtconfig from python-qt4-dev to python-qt4      
   * debian/rules
     - Modified debian/rules to install pyqtconfig.py files into
       python-qt4 vs. python-qt4-dev. This is because python-qt4 
@@ -21,15 +22,6 @@
 
  -- Michael Casadevall <sonicmctails at gmail.com>  Sun, 21 Dec 2008 01:09:39 -0500
 
-python-qt4 (4.4.4-2ubuntu1) jaunty; urgency=low
- 
-  * debian/patches/kubuntu_01_armel_support.dpatch (LP: #308814)
-    - Corrects a configuration test which caused qreals to end up
-      as floats on non-ARM architectures, and as doubles on ARM architectures.
-    - Added handling of doubles on qreal != float for QLists
- 
- -- Michael Casadevall <sonicmctails at gmail.com>  Tue, 16 Dec 2008 02:58:05 -0500
-
 python-qt4 (4.4.4-2) experimental; urgency=low
 
   * debian/patches

Modified: packages/python-qt4/trunk/debian/patches/03_qreal_float_support.dpatch
===================================================================
--- packages/python-qt4/trunk/debian/patches/03_qreal_float_support.dpatch	2008-12-21 06:49:53 UTC (rev 7130)
+++ packages/python-qt4/trunk/debian/patches/03_qreal_float_support.dpatch	2008-12-21 14:36:25 UTC (rev 7131)
@@ -27,7 +27,7 @@
  %End
  };
 +
-+// If we're on an architecture where qreal == double, then we need to also
++// If we're on an architecture where qreal != double, then we need to also
 +// explicately handle doubles. On architectures where qreal == double, they
 +// will automaticially be cast upwards
 +