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

shlomme at users.alioth.debian.org shlomme at users.alioth.debian.org
Thu Mar 25 23:21:21 UTC 2010 

    Date: Thursday, March 25, 2010 @ 23:21:20
  Author: shlomme
Revision: 12397

prepare for uploading new upstream release

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/qreal_float_support.diff
  packages/python-qt4/trunk/debian/patches/series
  packages/python-qt4/trunk/debian/rules
Deleted:
  packages/python-qt4/trunk/debian/patches/fix_objdir_dbus_check.diff

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2010-03-25 22:51:15 UTC (rev 12396)
+++ packages/python-qt4/trunk/debian/changelog	2010-03-25 23:21:20 UTC (rev 12397)
@@ -1,3 +1,15 @@
+python-qt4 (4.7.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/control
+    - Bumped build dependency on sip to 4.10.1
+  * debian/patches/fix_objdir_dbus_check.diff
+    - Removed, fixed upstream
+  * debian/rules
+    - Upstream changelog has been removed, don't try to install it
+
+ -- Torsten Marek <shlomme at debian.org>  Wed, 24 Mar 2010 19:29:54 +0100
+
 python-qt4 (4.7-2) unstable; urgency=low
 
   * Uploaded new upstream to unstable

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2010-03-25 22:51:15 UTC (rev 12396)
+++ packages/python-qt4/trunk/debian/control	2010-03-25 23:21:20 UTC (rev 12397)
@@ -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.3.0), python-sip-dev (>= 4.10), 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.3.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-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	2010-03-25 22:51:15 UTC (rev 12396)
+++ packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff	2010-03-25 23:21:20 UTC (rev 12397)
@@ -1,8 +1,8 @@
-Index: python-qt4-4.7/configure.py
+Index: python-qt4-4.7.2/configure.py
 ===================================================================
---- python-qt4-4.7.orig/configure.py	2010-01-24 16:57:19.892385205 +0100
-+++ python-qt4-4.7/configure.py	2010-01-24 16:59:44.340373145 +0100
-@@ -801,33 +801,7 @@
+--- 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 @@
              makefile.generate()
              tool.append("dbus")
  
@@ -36,7 +36,7 @@
  
          sipconfig.inform("Creating pyuic4 Makefile...")
  
-@@ -836,7 +810,6 @@
+@@ -841,7 +815,6 @@
              dstdir=uicdir,
              srcdir=os.path.join(src_dir, "pyuic", "uic"),
              dir="pyuic",

Deleted: packages/python-qt4/trunk/debian/patches/fix_objdir_dbus_check.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/fix_objdir_dbus_check.diff	2010-03-25 22:51:15 UTC (rev 12396)
+++ packages/python-qt4/trunk/debian/patches/fix_objdir_dbus_check.diff	2010-03-25 23:21:20 UTC (rev 12397)
@@ -1,13 +0,0 @@
-Index: python-qt4-4.7/configure.py
-===================================================================
---- python-qt4-4.7.orig/configure.py	2010-01-26 23:21:58.668736196 +0100
-+++ python-qt4-4.7/configure.py	2010-01-26 23:22:15.497700697 +0100
-@@ -379,7 +379,7 @@
-         check_module("QAxContainer", "qaxobject.h", "new QAxObject()",
-                 extra_libs=["QAxContainer"])
- 
--        if os.path.isdir("dbus"):
-+        if os.path.isdir(os.path.join(src_dir, "dbus")):
-             check_dbus()
- 
-     def code(self):

Modified: packages/python-qt4/trunk/debian/patches/qreal_float_support.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/qreal_float_support.diff	2010-03-25 22:51:15 UTC (rev 12396)
+++ packages/python-qt4/trunk/debian/patches/qreal_float_support.diff	2010-03-25 23:21:20 UTC (rev 12397)
@@ -5,12 +5,12 @@
 ##     to qlist.sip on architectures where qreal != double
 
 @DPATCH@
-Index: python-qt4-4.7/configure.py
+Index: python-qt4-4.7.2/configure.py
 ===================================================================
---- python-qt4-4.7.orig/configure.py	2010-01-24 16:53:47.029378448 +0100
-+++ python-qt4-4.7/configure.py	2010-01-24 16:54:31.312380347 +0100
-@@ -1839,8 +1839,9 @@
-     out << "PyQt_NoPrintRangeBug\\n";
+--- 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 @@
+     out << "PyQt_NoOpenGLES\\n";
  #endif
  
 -    if (sizeof (qreal) != sizeof (double))
@@ -20,10 +20,10 @@
  
      return 0;
  }
-Index: python-qt4-4.7/sip/QtCore/qlist.sip
+Index: python-qt4-4.7.2/sip/QtCore/qlist.sip
 ===================================================================
---- python-qt4-4.7.orig/sip/QtCore/qlist.sip	2010-01-24 16:53:47.029378448 +0100
-+++ python-qt4-4.7/sip/QtCore/qlist.sip	2010-01-24 16:54:31.312380347 +0100
+--- 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 @@
      return sipGetState(sipTransferObj);
  %End

Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series	2010-03-25 22:51:15 UTC (rev 12396)
+++ packages/python-qt4/trunk/debian/patches/series	2010-03-25 23:21:20 UTC (rev 12397)
@@ -1,3 +1,2 @@
 qreal_float_support.diff
 debian_configure_changes.diff
-fix_objdir_dbus_check.diff

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2010-03-25 22:51:15 UTC (rev 12396)
+++ packages/python-qt4/trunk/debian/rules	2010-03-25 23:21:20 UTC (rev 12397)
@@ -174,7 +174,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installman
-	dh_installchangelogs ChangeLog
+	dh_installchangelogs
 	dh_installdocs -A NEWS THANKS
 	dh_link
 	dh_sip

More information about the Python-modules-commits mailing list