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

[mitya57 at users.alioth.debian.org]

    Date: Saturday, June 13, 2015 @ 12:22:20
  Author: mitya57
Revision: 32971

* New upstream release.
  - pyuic now sorts imported modules (closes: #787250).
* Drop remove_timestamps.diff, applied upstream.
* Bump the required sip version to 4.16.4.

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

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2015-06-13 12:14:47 UTC (rev 32970)
+++ packages/python-qt4/trunk/debian/changelog	2015-06-13 12:22:20 UTC (rev 32971)
@@ -1,3 +1,12 @@
+python-qt4 (4.11.4+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - pyuic now sorts imported modules (closes: #787250).
+  * Drop remove_timestamps.diff, applied upstream.
+  * Bump the required sip version to 4.16.4.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 13 Jun 2015 15:17:18 +0300
+
 python-qt4 (4.11.3+dfsg-2) unstable; urgency=medium
 
   [ Reiner Herrmann ]

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2015-06-13 12:14:47 UTC (rev 32970)
+++ packages/python-qt4/trunk/debian/control	2015-06-13 12:22:20 UTC (rev 32971)
@@ -26,9 +26,9 @@
                python3-dbus-dbg,
                python-dbus-dev,
                python-sip-dbg,
-               python-sip-dev (>= 4.16),
+               python-sip-dev (>= 4.16.4),
                python3-sip-dbg,
-               python3-sip-dev (>= 4.16),
+               python3-sip-dev (>= 4.16.4),
                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.6

Deleted: packages/python-qt4/trunk/debian/patches/remove_timestamps.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/remove_timestamps.diff	2015-06-13 12:14:47 UTC (rev 32970)
+++ packages/python-qt4/trunk/debian/patches/remove_timestamps.diff	2015-06-13 12:22:20 UTC (rev 32971)
@@ -1,56 +0,0 @@
-Description: prevent embedding of timestamps in files generated by rcc and uic
- Timestamps in generated files will make packages using those tools no longer
- build reproducibly, because the files will differ in each build.
- As those timestamps are no useful information, they can be left out.
-Origin: upstream, changesets 4a18f77c9854 and f67a1a3ba439
-Last-Update: 2015-05-14
-
---- a/pyrcc/rcc.cpp
-+++ b/pyrcc/rcc.cpp
-@@ -24,7 +24,6 @@
- #include <qfile.h>
- #include <qfileinfo.h>
- #include <qlocale.h>
--#include <qdatetime.h>
- #include <qtextstream.h>
- #include <qbytearray.h>
- #include <qhash.h>
-@@ -407,8 +406,7 @@
-     fprintf(out, "# -*- coding: utf-8 -*-\n\n");
-     fprintf(out, "# Resource object code\n");
-     fprintf(out, "#\n");
--    fprintf(out, "# Created: %s\n", QDateTime::currentDateTime().toString().toUtf8().constData());
--    fprintf(out, "#      by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR);
-+    fprintf(out, "# Created by: The Resource Compiler for PyQt4 (Qt v%s)\n", QT_VERSION_STR);
-     fprintf(out, "#\n");
-     fprintf(out, "# WARNING! All changes made in this file will be lost!\n");
-     fprintf(out, "\n");
---- a/pyuic/uic/__init__.py
-+++ b/pyuic/uic/__init__.py
-@@ -47,8 +47,7 @@
- 
- # Form implementation generated from reading ui file '%s'
- #
--# Created: %s
--#      by: PyQt4 UI code generator %s
-+# Created by: PyQt4 UI code generator %s
- #
- # WARNING! All changes made in this file will be lost!
- 
-@@ -160,7 +159,6 @@
-     module is foo_rc.
-     """
- 
--    from time import ctime
-     from PyQt4.QtCore import PYQT_VERSION_STR
- 
-     try:
-@@ -170,7 +168,7 @@
- 
-     indenter.indentwidth = indent
- 
--    pyfile.write(_header % (uifname, ctime(), PYQT_VERSION_STR))
-+    pyfile.write(_header % (uifname, PYQT_VERSION_STR))
- 
-     winfo = compiler.UICompiler().compileUi(uifile, pyfile, from_imports, resource_suffix)
- 

Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series	2015-06-13 12:14:47 UTC (rev 32970)
+++ packages/python-qt4/trunk/debian/patches/series	2015-06-13 12:22:20 UTC (rev 32971)
@@ -1,4 +1,3 @@
 debian_configure_changes.diff
 qreal_float_support.diff
 config_flags.diff
-remove_timestamps.diff