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

[mitya57 at users.alioth.debian.org]

    Date: Sunday, January 11, 2015 @ 12:27:22
  Author: mitya57
Revision: 31658

Added patch which removes embedding of timestamps in generated
files, to enable reproducible builds in packages build-depending
on python-qt4 (closes: #774509).

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

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2015-01-11 11:55:17 UTC (rev 31657)
+++ packages/python-qt4/trunk/debian/changelog	2015-01-11 12:27:22 UTC (rev 31658)
@@ -1,3 +1,12 @@
+python-qt4 (4.11.3+dfsg-1ubuntu1) UNRELEASED; urgency=medium
+
+  [ Reiner Herrmann ]
+  * Added patch which removes embedding of timestamps in generated
+    files, to enable reproducible builds in packages build-depending
+    on python-qt4 (closes: #774509).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 11 Jan 2015 14:54:54 +0300
+
 python-qt4 (4.11.3+dfsg-1) experimental; urgency=medium
 
   * New upstream bugfix release.

Added: packages/python-qt4/trunk/debian/patches/remove_timestamps.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/remove_timestamps.diff	                        (rev 0)
+++ packages/python-qt4/trunk/debian/patches/remove_timestamps.diff	2015-01-11 12:27:22 UTC (rev 31658)
@@ -0,0 +1,57 @@
+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.
+Author: Reiner Herrmann <reiner at reiner-h.de>
+Forwarded: yes
+Last-Update: 2015-01-11
+
+--- 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 PyQt (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-01-11 11:55:17 UTC (rev 31657)
+++ packages/python-qt4/trunk/debian/patches/series	2015-01-11 12:27:22 UTC (rev 31658)
@@ -1,3 +1,4 @@
 debian_configure_changes.diff
 qreal_float_support.diff
 config_flags.diff
+remove_timestamps.diff