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

Thu Mar 17 14:23:33 UTC 2011

Date: Thursday, March 17, 2011 @ 14:23:22
  Author: kitterman
Revision: 16140

python-qt4 (4.8.3-2) UNRELEASED; urgency=low

 * Update from Ubuntu changes:
   - Refer to usr/share/common-licenses for BSD license in debian/copyright
   - Bump Qt build-depends version to 4.7.0, add build-depends on
     libqtwebkit-dev, and add QtDeclarative.so to python-qt.install
   - Remove obsolete dpatch artifacts from debian/patches/
     fix_the_QAssitant_ftbfs.diff
   - Add kubuntu_01_fix_uiparser_buttonbox.diff as fix_uiparser_buttonbox.diff
     - Fix AttributeError in ui/uiparser.py (Upstream 4.8.4-278054fd857c)

Added:
  packages/python-qt4/trunk/debian/patches/fix_uiparser_buttonbox.diff
Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/control
  packages/python-qt4/trunk/debian/copyright
  packages/python-qt4/trunk/debian/patches/qreal_float_support.diff
  packages/python-qt4/trunk/debian/patches/series
  packages/python-qt4/trunk/debian/python-qt4.install

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

--- packages/python-qt4/trunk/debian/changelog	2011-03-16 22:25:44 UTC (rev 16139)
+++ packages/python-qt4/trunk/debian/changelog	2011-03-17 14:23:22 UTC (rev 16140)
@@ -1,3 +1,16 @@
+python-qt4 (4.8.3-2) UNRELEASED; urgency=low
+
+ * Update from Ubuntu changes:
+   - Refer to usr/share/common-licenses for BSD license in debian/copyright
+   - Bump Qt build-depends version to 4.7.0, add build-depends on
+     libqtwebkit-dev, and add QtDeclarative.so to python-qt.install
+   - Remove obsolete dpatch artifacts from debian/patches/
+     fix_the_QAssitant_ftbfs.diff
+   - Add kubuntu_01_fix_uiparser_buttonbox.diff as fix_uiparser_buttonbox.diff
+     - Fix AttributeError in ui/uiparser.py (Upstream 4.8.4-278054fd857c)
+
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 17 Mar 2011 09:37:03 -0400
+
 python-qt4 (4.8.3-1) unstable; urgency=low
 
   * Team upload.

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2011-03-16 22:25:44 UTC (rev 16139)
+++ packages/python-qt4/trunk/debian/control	2011-03-17 14:23:22 UTC (rev 16140)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>, Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 7), python-all-dev, libqt4-dev (>= 4.6.0), python-sip-dev (>= 4.12.1), python-support (>= 0.7.1), python-dbus (>= 0.80.0), python-dbus-dbg, libdbus-1-dev (>= 1.0.2), python-all-dbg, python-sip-dbg, libqt4-opengl-dev, libphonon-dev (>= 4:4.2.0-2)
+Build-Depends: debhelper (>= 7), python-all-dev, libqt4-dev (>= 4.7.0), libqtwebkit-dev, python-sip-dev (>= 4.12.1), python-support (>= 0.7.1), python-dbus (>= 0.80.0), python-dbus-dbg, libdbus-1-dev (>= 1.0.2), python-all-dbg, python-sip-dbg, libqt4-opengl-dev, libphonon-dev (>= 4:4.2.0-2)
 Build-Conflicts: python-xml, python-xml-dbg
 Standards-Version: 3.8.4
 Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/

Modified: packages/python-qt4/trunk/debian/copyright
===================================================================
--- packages/python-qt4/trunk/debian/copyright	2011-03-16 22:25:44 UTC (rev 16139)
+++ packages/python-qt4/trunk/debian/copyright	2011-03-17 14:23:22 UTC (rev 16140)
@@ -29,34 +29,9 @@
 
 
 The files in pyuic/ are (c) 2005 Torsten Marek (shlomme at gmx.net) and
-double-licensted under the GPL and the BSD license.
-
-Copyright (c) The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+double-licensed under the GPL and the BSD license. A copy of the BSD
+license is available as /usr/share/common-licenses/BSD in the 
+Debian GNU/Linux distribution.
 -------------------------------------------------------------------
 
 

Added: packages/python-qt4/trunk/debian/patches/fix_uiparser_buttonbox.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/fix_uiparser_buttonbox.diff	                        (rev 0)
+++ packages/python-qt4/trunk/debian/patches/fix_uiparser_buttonbox.diff	2011-03-17 14:23:22 UTC (rev 16140)
@@ -0,0 +1,20 @@
+Index: python-qt4-4.8.3/pyuic/uic/uiparser.py
+===================================================================
+--- python-qt4-4.8.3.orig/pyuic/uic/uiparser.py	2011-01-23 10:08:28.000000000 +0000
++++ python-qt4-4.8.3/pyuic/uic/uiparser.py	2011-02-07 15:13:39.038141245 +0000
+@@ -228,7 +228,14 @@
+         elif isinstance(widget, QtGui.QAbstractButton):
+             bg_i18n = self.wprops.getAttribute(elem, "buttonGroup")
+             if bg_i18n is not None:
+-                bg_name = bg_i18n.string
++                # This should be handled properly in case the problem arises
++                # elsewhere as well.
++                try:
++                    # We are compiling the .ui file.
++                    bg_name = bg_i18n.string
++                except AttributeError:
++                    # We are loading the .ui file.
++                    bg_name = bg_i18n
+ 
+                 for bg in self.button_groups:
+                     if bg.objectName() == bg_name:

Modified: packages/python-qt4/trunk/debian/patches/qreal_float_support.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/qreal_float_support.diff	2011-03-16 22:25:44 UTC (rev 16139)
+++ packages/python-qt4/trunk/debian/patches/qreal_float_support.diff	2011-03-17 14:23:22 UTC (rev 16140)
@@ -1,15 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 03_qreal_float_support.dpatch by Michael Casadevall <sonicmctails at gmail.com>
-##
-## DP: Corrects a configure test, and adds explicate double handling
-##     to qlist.sip on architectures where qreal != double
-
- at DPATCH@
-Index: python-qt4-4.7.2/configure.py
+Index: python-qt4-4.8.3/configure.py
 ===================================================================
---- python-qt4-4.7.2.orig/configure.py	2010-03-17 19:29:19.000000000 +0100
-+++ python-qt4-4.7.2/configure.py	2010-03-25 23:53:55.468631945 +0100
-@@ -1915,8 +1915,9 @@
+--- 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 @@
      out << "PyQt_NoOpenGLES\\n";
  #endif
  
@@ -20,11 +14,11 @@
  
      return 0;
  }
-Index: python-qt4-4.7.2/sip/QtCore/qlist.sip
+Index: python-qt4-4.8.3/sip/QtCore/qlist.sip
 ===================================================================
---- python-qt4-4.7.2.orig/sip/QtCore/qlist.sip	2010-03-17 19:29:26.000000000 +0100
-+++ python-qt4-4.7.2/sip/QtCore/qlist.sip	2010-03-25 23:53:55.468631945 +0100
-@@ -749,3 +749,227 @@
+--- 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 @@
      return sipGetState(sipTransferObj);
  %End
  };

Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series	2011-03-16 22:25:44 UTC (rev 16139)
+++ packages/python-qt4/trunk/debian/patches/series	2011-03-17 14:23:22 UTC (rev 16140)
@@ -1,4 +1,5 @@
 qreal_float_support.diff
 debian_configure_changes.diff
 fix_qthelp_ftbfs.diff
-fix_the_QAssitant_ftbfs.patch
+fix_the_QAssitant_ftbfs.diff
+fix_uiparser_buttonbox.diff

Modified: packages/python-qt4/trunk/debian/python-qt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4.install	2011-03-16 22:25:44 UTC (rev 16139)
+++ packages/python-qt4/trunk/debian/python-qt4.install	2011-03-17 14:23:22 UTC (rev 16140)
@@ -1,6 +1,7 @@
 usr/lib/python*/*-packages/PyQt4/Qt.so
 usr/lib/python*/*-packages/PyQt4/QtAssistant.so
 usr/lib/python*/*-packages/PyQt4/QtCore.so
+usr/lib/python*/*-packages/PyQt4/QtDeclarative.so
 usr/lib/python*/*-packages/PyQt4/QtDesigner.so
 usr/lib/python*/*-packages/PyQt4/QtGui.so
 usr/lib/python*/*-packages/PyQt4/QtHelp.so


