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

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

    Date: Thursday, May 29, 2014 @ 12:10:42
  Author: mitya57-guest
Revision: 29152

* New upstream release.
* Drop qstring_conversion.diff, applied upstream.
* Refresh other patches.
* Bump required sip4 version to 4.16.

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/control
  packages/python-qt4/trunk/debian/patches/config_flags.diff
  packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
  packages/python-qt4/trunk/debian/patches/series
Deleted:
  packages/python-qt4/trunk/debian/patches/qstring_conversion.diff

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2014-05-29 11:32:34 UTC (rev 29151)
+++ packages/python-qt4/trunk/debian/changelog	2014-05-29 12:10:42 UTC (rev 29152)
@@ -1,3 +1,12 @@
+python-qt4 (4.11+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Drop qstring_conversion.diff, applied upstream.
+  * Refresh other patches.
+  * Bump required sip4 version to 4.16.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Thu, 29 May 2014 16:00:57 +0400
+
 python-qt4 (4.10.4+dfsg-2) unstable; urgency=medium
 
   [ Dmitry Shachnev ]

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2014-05-29 11:32:34 UTC (rev 29151)
+++ packages/python-qt4/trunk/debian/control	2014-05-29 12:10:42 UTC (rev 29152)
@@ -26,9 +26,9 @@
                python3-dbus-dbg,
                python-dbus-dev,
                python-sip-dbg,
-               python-sip-dev (>= 4.15.5),
+               python-sip-dev (>= 4.16),
                python3-sip-dbg,
-               python3-sip-dev (>= 4.15.5),
+               python3-sip-dev (>= 4.16),
                python-sphinx (>= 1.0.7+dfsg-1~)
 Build-Conflicts: python3.2-dev (<< 3.2.3-8~), python2.7-dev (<< 2.7.5-2~)
 Standards-Version: 3.9.5

Modified: packages/python-qt4/trunk/debian/patches/config_flags.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/config_flags.diff	2014-05-29 11:32:34 UTC (rev 29151)
+++ packages/python-qt4/trunk/debian/patches/config_flags.diff	2014-05-29 12:10:42 UTC (rev 29152)
@@ -5,7 +5,7 @@
 
 --- a/configure.py
 +++ b/configure.py
-@@ -1001,6 +1001,10 @@
+@@ -1000,6 +1000,10 @@
                  if src_dir != os.path.curdir:
                      fout.write("VPATH = %s\n" % os.path.join(src_dir, "designer"))
  
@@ -16,7 +16,7 @@
                  fout.write(prj)
                  fout.close()
  
-@@ -2251,6 +2255,7 @@
+@@ -2183,6 +2187,7 @@
          sipconfig.error("This version of PyQt requires SIP v%s or later" % sipconfig.version_to_string(sip_min_version))
  
      global opts

Modified: packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff	2014-05-29 11:32:34 UTC (rev 29151)
+++ packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff	2014-05-29 12:10:42 UTC (rev 29152)
@@ -4,7 +4,7 @@
 
 --- a/configure.py
 +++ b/configure.py
-@@ -863,35 +863,6 @@
+@@ -862,35 +862,6 @@
              makefile.generate()
              tool.append("dbus")
  
@@ -40,7 +40,7 @@
          # The pyuic directory may not exist if we are building away from the
          # source directory.
          try:
-@@ -900,7 +871,6 @@
+@@ -899,7 +870,6 @@
              pass
  
          uicdir=os.path.join(pyqt_modroot, "uic")
@@ -48,7 +48,7 @@
  
          sipconfig.inform("Creating pyuic4 Makefile...")
  
-@@ -909,7 +879,6 @@
+@@ -908,7 +878,6 @@
              dstdir=uicdir,
              srcdir=os.path.join(src_dir, "pyuic", "uic"),
              dir="pyuic",

Deleted: packages/python-qt4/trunk/debian/patches/qstring_conversion.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/qstring_conversion.diff	2014-05-29 11:32:34 UTC (rev 29151)
+++ packages/python-qt4/trunk/debian/patches/qstring_conversion.diff	2014-05-29 12:10:42 UTC (rev 29152)
@@ -1,22 +0,0 @@
-Description: fix a bug in the conversion of QStrings with surrogate pairs
-Origin: upstream, changeset 850f2d2c1d2b
-Last-Update: 2014-04-19
-
---- a/qpy/QtCore/qpycore_qstring.cpp
-+++ b/qpy/QtCore/qpycore_qstring.cpp
-@@ -93,12 +93,13 @@
-                     {
-                         maxchar = 0x10ffff;
-                         --py_len;
--                        ++i;
-                         ++qch;
-                     }
-                 }
-+
-+                uch = (++qch)->unicode();
-             }
--            while (++i < qstr.length());
-+            while (!qch->isNull());
- 
-             // Create the correctly sized object.
-             if ((obj = PyUnicode_New(py_len, maxchar)) == NULL)

Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series	2014-05-29 11:32:34 UTC (rev 29151)
+++ packages/python-qt4/trunk/debian/patches/series	2014-05-29 12:10:42 UTC (rev 29152)
@@ -1,4 +1,3 @@
 debian_configure_changes.diff
 qreal_float_support.diff
 config_flags.diff
-qstring_conversion.diff