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

[piotr at users.alioth.debian.org]

    Date: Thursday, January 27, 2011 @ 21:47:48
  Author: piotr
Revision: 15419

* New upstream release
* debian/control
  - Bump build dependency on sip to 4.12.1
* debian/rules
  - Add "--verbose" to common configure options
* debian/patches/qreal_float_support.diff
  - Drop, fixed upstream
* debian/patches/fix_qthelp_ftbfs.diff
  - Add patch to fix FTBFS with ld --no-add-needed
* debian/patches/debian_configure_changes.diff
  - Adapt to new upstream version

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/series
  packages/python-qt4/trunk/debian/rules

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2011-01-27 14:38:34 UTC (rev 15418)
+++ packages/python-qt4/trunk/debian/changelog	2011-01-27 21:47:48 UTC (rev 15419)
@@ -1,3 +1,19 @@
+python-qt4 (4.8.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/control
+    - Bump build dependency on sip to 4.12.1
+  * debian/rules
+    - Add "--verbose" to common configure options
+  * debian/patches/qreal_float_support.diff
+    - Drop, fixed upstream
+  * debian/patches/fix_qthelp_ftbfs.diff
+    - Add patch to fix FTBFS with ld --no-add-needed
+  * debian/patches/debian_configure_changes.diff
+    - Adapt to new upstream version
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Wed, 26 Jan 2011 16:39:41 +0100
+
 python-qt4 (4.7.3-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2011-01-27 14:38:34 UTC (rev 15418)
+++ packages/python-qt4/trunk/debian/control	2011-01-27 21:47:48 UTC (rev 15419)
@@ -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.10.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.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-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/patches/debian_configure_changes.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff	2011-01-27 14:38:34 UTC (rev 15418)
+++ packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff	2011-01-27 21:47:48 UTC (rev 15419)
@@ -1,8 +1,8 @@
-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-25 23:53:55.468631945 +0100
-+++ python-qt4-4.7.2/configure.py	2010-03-25 23:54:05.364664390 +0100
-@@ -806,33 +806,7 @@
+--- 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 @@
              makefile.generate()
              tool.append("dbus")
  
@@ -31,12 +31,18 @@
 -            gui = False
 -            use_arch = ''
 -
+         # The pyuic directory may not exist if we are building away from the
+         # source directory.
+         try:
+@@ -876,7 +851,6 @@
+             pass
+ 
          uicdir=os.path.join(pyqt_modroot, "uic")
 -        wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), gui, use_arch)
  
          sipconfig.inform("Creating pyuic4 Makefile...")
  
-@@ -841,7 +815,6 @@
+@@ -885,7 +859,6 @@
              dstdir=uicdir,
              srcdir=os.path.join(src_dir, "pyuic", "uic"),
              dir="pyuic",

Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series	2011-01-27 14:38:34 UTC (rev 15418)
+++ packages/python-qt4/trunk/debian/patches/series	2011-01-27 21:47:48 UTC (rev 15419)
@@ -1,2 +1,2 @@
-qreal_float_support.diff
 debian_configure_changes.diff
+fix_qthelp_ftbfs.diff

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2011-01-27 14:38:34 UTC (rev 15418)
+++ packages/python-qt4/trunk/debian/rules	2011-01-27 21:47:48 UTC (rev 15419)
@@ -42,7 +42,7 @@
 
 # LIBS_* is unset to avoid linking to too many libraries
 # STRIP is unset to let stripping be handled by dh_strip
-SHARED_CONFIGURE_OPTIONS=--confirm-license \
+SHARED_CONFIGURE_OPTIONS=--confirm-license --verbose \
 	-q /usr/bin/qmake-qt4 -c -j $(SPLIT) \
 	LIBDIR_QT=/usr/lib STRIP="" MOC=moc-qt4 \
 	LIBS_OPENGL="" LIBS_X11="" LIBS_THREAD="" \