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

Wed Dec 28 19:07:37 UTC 2011

Date: Wednesday, December 28, 2011 @ 19:07:35
  Author: kitterman
Revision: 19767

Refresh patches and fixup python3 package long descriptions.

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/control
  packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
  packages/python-qt4/trunk/debian/patches/fix_qthelp_ftbfs.diff
  packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.diff
  packages/python-qt4/trunk/debian/patches/qreal_float_support.diff

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

--- packages/python-qt4/trunk/debian/changelog	2011-12-28 18:54:03 UTC (rev 19766)
+++ packages/python-qt4/trunk/debian/changelog	2011-12-28 19:07:35 UTC (rev 19767)
@@ -11,6 +11,7 @@
     - Bump minimum python-sip-dev and python3-sip-dev version required to
       4.13.1
     - Add Breaks for python[3]-sip4 (<< 4.13.1~)
+    - Refreshed patches
   * Build for python3 (Closes: #558389) (LP: #400826)
     - Add python3-all-dev/dbg and python3-sip-dev/dbg to build-depends
     - Add python3-qt4-* packages
@@ -26,7 +27,7 @@
   [ Felix Geyer ]
   * Add build-arch/build-indep targets.
 
- -- Scott Kitterman <scott at kitterman.com>  Sun, 30 Oct 2011 00:42:05 -0400
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 28 Dec 2011 14:04:51 -0500
 
 python-qt4 (4.8.6-2) unstable; urgency=low
 

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2011-12-28 18:54:03 UTC (rev 19766)
+++ packages/python-qt4/trunk/debian/control	2011-12-28 19:07:35 UTC (rev 19767)
@@ -231,7 +231,7 @@
          ${shlibs:Depends}
 Description: Python 3 bindings for Qt4's OpenGL module
  The OpenGL module of PyQt4 provides widgets and utility classes
- for OpenGL rendering in a PyQt4 application.
+ for OpenGL rendering in a Python3 PyQt4 application.
 
 Package: python3-pyqt4.gtopengl-dbg
 Priority: extra
@@ -244,7 +244,7 @@
          ${shlibs:Depends}
 Description: Python 3 bindings for Qt4's OpenGL module (debug extension)
  The OpenGL module of PyQt4 provides widgets and utility classes
- for OpenGL rendering in a PyQt4 application.
+ for OpenGL rendering in a Python3 PyQt4 application.
  .
  This package contains the extension built for the Python 3 debug interpreter.
 
@@ -268,7 +268,7 @@
          ${shlibs:Depends}
 Description: Python3 bindings for PyQt4's SQL module
  The SQL module of PyQt4 provides widgets and utility classes for
- SQL database access.
+ Python3 SQL database access.
 
 Package: python-qt4-sql-dbg
 Priority: extra
@@ -296,7 +296,7 @@
          ${shlibs:Depends}
 Description: Python3 bindings for PyQt4's SQL module (debug extension)
  The SQL module of PyQt4 provides widgets and utility classes for
- SQL database access.
+ Python3 SQL database access.
  .
  This package contains the extension built for the Python3 debug interpreter.
 

Modified: packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff	2011-12-28 18:54:03 UTC (rev 19766)
+++ packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff	2011-12-28 19:07:35 UTC (rev 19767)
@@ -1,8 +1,8 @@
-Index: python-qt4-4.8.3/configure.py
+Index: python-qt4-4.9/configure.py
 ===================================================================
---- python-qt4-4.8.3.org/configure.py	2011-01-25 22:28:37.000000000 +0100
-+++ python-qt4-4.8.3/configure.py	2011-01-26 00:04:40.174212637 +0100
-@@ -843,31 +843,6 @@
+--- python-qt4-4.9.orig/configure.py	2011-12-28 14:01:13.755143235 -0500
++++ python-qt4-4.9/configure.py	2011-12-28 14:01:23.211142955 -0500
+@@ -873,31 +873,6 @@
              makefile.generate()
              tool.append("dbus")
  
@@ -34,7 +34,7 @@
          # The pyuic directory may not exist if we are building away from the
          # source directory.
          try:
-@@ -876,7 +851,6 @@
+@@ -906,7 +881,6 @@
              pass
  
          uicdir=os.path.join(pyqt_modroot, "uic")
@@ -42,7 +42,7 @@
  
          sipconfig.inform("Creating pyuic4 Makefile...")
  
-@@ -885,7 +859,6 @@
+@@ -915,7 +889,6 @@
              dstdir=uicdir,
              srcdir=os.path.join(src_dir, "pyuic", "uic"),
              dir="pyuic",

Modified: packages/python-qt4/trunk/debian/patches/fix_qthelp_ftbfs.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/fix_qthelp_ftbfs.diff	2011-12-28 18:54:03 UTC (rev 19766)
+++ packages/python-qt4/trunk/debian/patches/fix_qthelp_ftbfs.diff	2011-12-28 19:07:35 UTC (rev 19767)
@@ -1,9 +1,11 @@
 Description: Fix QtHelp FTBFS with ld --no-add-needed.
 Author: Felix Geyer <debfx-pkg at fobos.de>
 
---- python-qt4-4.8.1.orig/configure.py
-+++ python-qt4-4.8.1/configure.py
-@@ -364,7 +364,8 @@ class ConfigurePyQt4:
+Index: python-qt4-4.9/configure.py
+===================================================================
+--- python-qt4-4.9.orig/configure.py	2011-12-28 14:01:23.211142955 -0500
++++ python-qt4-4.9/configure.py	2011-12-28 14:01:29.783142761 -0500
+@@ -356,7 +356,8 @@
          pyqt_modules.append("QtCore")
  
          check_module("QtGui", "qwidget.h", "new QWidget()")

Modified: packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.diff	2011-12-28 18:54:03 UTC (rev 19766)
+++ packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.diff	2011-12-28 19:07:35 UTC (rev 19767)
@@ -7,11 +7,11 @@
  configure.py |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/configure.py b/configure.py
-index 7ed9582..185ec9f 100644
---- a/configure.py
-+++ b/configure.py
-@@ -354,10 +354,10 @@ class ConfigurePyQt4:
+Index: python-qt4-4.9/configure.py
+===================================================================
+--- python-qt4-4.9.orig/configure.py	2011-12-28 14:01:29.783142761 -0500
++++ python-qt4-4.9/configure.py	2011-12-28 14:01:35.419142594 -0500
+@@ -346,10 +346,10 @@
  
          if opts.mwg_ssl_dir:
              ass_lib_dirs = [os.path.join(opts.mwg_ssl_dir, "lib")]
@@ -24,6 +24,3 @@
  
          # Note that the order in which we check is important for the
          # consolidated module - a module's dependencies must be checked first.
--- 
-1.7.4.1
-

Modified: packages/python-qt4/trunk/debian/patches/qreal_float_support.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/qreal_float_support.diff	2011-12-28 18:54:03 UTC (rev 19766)
+++ packages/python-qt4/trunk/debian/patches/qreal_float_support.diff	2011-12-28 19:07:35 UTC (rev 19767)
@@ -1,9 +1,9 @@
 ## 03_qreal_float_support.dpatch by Michael Casadevall <sonicmctails at gmail.com>
-Index: python-qt4-4.8.3/configure.py
+Index: python-qt4-4.9/configure.py
 ===================================================================
---- python-qt4-4.8.3.orig/configure.py	2011-02-24 10:33:30.000000000 +0200
-+++ python-qt4-4.8.3/configure.py	2011-02-24 10:33:18.000000000 +0200
-@@ -2004,8 +2004,9 @@
+--- python-qt4-4.9.orig/configure.py	2011-12-28 14:01:08.503143391 -0500
++++ python-qt4-4.9/configure.py	2011-12-28 14:01:13.755143235 -0500
+@@ -2073,8 +2073,9 @@
      out << "PyQt_NoOpenGLES\\n";
  #endif
  
@@ -14,11 +14,11 @@
  
      return 0;
  }
-Index: python-qt4-4.8.3/sip/QtCore/qlist.sip
+Index: python-qt4-4.9/sip/QtCore/qlist.sip
 ===================================================================
---- python-qt4-4.8.3.orig/sip/QtCore/qlist.sip	2011-02-24 10:33:27.000000000 +0200
-+++ python-qt4-4.8.3/sip/QtCore/qlist.sip	2011-02-24 10:33:18.000000000 +0200
-@@ -811,3 +811,227 @@
+--- python-qt4-4.9.orig/sip/QtCore/qlist.sip	2011-12-28 14:01:08.515143389 -0500
++++ python-qt4-4.9/sip/QtCore/qlist.sip	2011-12-28 14:01:13.759143234 -0500
+@@ -807,3 +807,227 @@
      return sipGetState(sipTransferObj);
  %End
  };


