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

[mitya57-guest at users.alioth.debian.org]

    Date: Thursday, November 21, 2013 @ 17:20:20
  Author: mitya57-guest
Revision: 26456

Import 4.10.3+dfsg-1 release

Added:
  packages/python-qt4/trunk/debian/patches/config_flags.diff
Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/copyright
  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	2013-11-20 22:05:09 UTC (rev 26455)
+++ packages/python-qt4/trunk/debian/changelog	2013-11-21 17:20:20 UTC (rev 26456)
@@ -1,4 +1,4 @@
-python-qt4 (4.10.3+dfsg-1) UNRELEASED; urgency=low
+python-qt4 (4.10.3+dfsg-1) unstable; urgency=low
 
   * Update pyrcc4 man page to list -py2 and -py3 options.
   * Regenerate resource files during build.
@@ -7,12 +7,15 @@
   * Add debian/get-orig-source.sh script.
   * Update debian/watch to mangle dfsg version.
   * Drop debian/python-qt4-doc.docs, we install docs directly.
-  * Pass --debug to configure-ng.py when doing debug builds.
+  * Pass --debug to configure.py when doing debug builds.
   * Add a patch (phonon_cfgtest.diff) to fix detection of new Phonon
-    versions.
+    versions (closes: #729390).
+  * Add a patch (config_flags.diff) to apply build flags to designer
+    module.
+  * Remove duplicate references to GPL license file from debian/copyright.
   * Add myself to Uploaders.
 
- -- Dmitry Shachnev <mitya57 at gmail.com>  Fri, 01 Nov 2013 11:12:39 +0400
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Wed, 13 Nov 2013 14:02:27 +0400
 
 python-qt4 (4.10.3-2) unstable; urgency=low
 

Modified: packages/python-qt4/trunk/debian/copyright
===================================================================
--- packages/python-qt4/trunk/debian/copyright	2013-11-20 22:05:09 UTC (rev 26455)
+++ packages/python-qt4/trunk/debian/copyright	2013-11-21 17:20:20 UTC (rev 26456)
@@ -23,9 +23,6 @@
   the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
   if not, write to the Free Software Foundation, Inc., 51 Franklin St,
   Fifth Floor, Boston, MA  02110-1301 USA
-
-  On Debian systems, the complete text of the GNU General Public
-  License, can be found in /usr/share/common-licenses/GPL.
 -------------------------------------------------------------------
 
 
@@ -178,6 +175,3 @@
   the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
   if not, write to the Free Software Foundation, Inc., 51 Franklin St,
   Fifth Floor, Boston, MA  02110-1301 USA
-
-  On Debian systems, the complete text of the GNU General Public
-  License, version 2, can be found in /usr/share/common-licenses/GPL-2.

Added: packages/python-qt4/trunk/debian/patches/config_flags.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/config_flags.diff	                        (rev 0)
+++ packages/python-qt4/trunk/debian/patches/config_flags.diff	2013-11-21 17:20:20 UTC (rev 26456)
@@ -0,0 +1,26 @@
+Description: make sure build flags are applied when building designer plugin
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Forwarded: no
+Last-Update: 2013-11-11
+
+--- a/configure.py
++++ b/configure.py
+@@ -1004,6 +1004,10 @@
+                 if src_dir != os.path.curdir:
+                     fout.write("VPATH = %s\n" % os.path.join(src_dir, "designer"))
+ 
++                fout.write("QMAKE_CFLAGS += %s\n" % macros["CFLAGS"])
++                fout.write("QMAKE_CXXFLAGS += %s\n" % macros["CXXFLAGS"])
++                fout.write("QMAKE_LFLAGS += %s\n" % macros["LFLAGS"])
++
+                 fout.write(prj)
+                 fout.close()
+ 
+@@ -2257,6 +2261,7 @@
+         sipconfig.error("This version of PyQt requires SIP v%s or later" % sipconfig.version_to_string(sip_min_version))
+ 
+     global opts
++    global macros
+ 
+     # Parse the command line.
+     p = create_optparser()

Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series	2013-11-20 22:05:09 UTC (rev 26455)
+++ packages/python-qt4/trunk/debian/patches/series	2013-11-21 17:20:20 UTC (rev 26456)
@@ -2,3 +2,4 @@
 config_extra_headers.diff
 qreal_float_support.diff
 phonon_cfgtest.diff
+config_flags.diff

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2013-11-20 22:05:09 UTC (rev 26455)
+++ packages/python-qt4/trunk/debian/rules	2013-11-21 17:20:20 UTC (rev 26456)
@@ -53,9 +53,9 @@
 	-q /usr/bin/qmake-qt4 -c -j $(SPLIT) \
 	LIBDIR_QT=/usr/lib STRIP="" MOC=moc-qt4 \
 	LIBS_OPENGL="" LIBS_X11="" LIBS_THREAD="" \
-	CFLAGS="" CFLAGS_RELEASE="${CFLAGS} ${CPPFLAGS}" \
-	LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS} ${CPPFLAGS}" \
-	LFLAGS_RELEASE="${LDFLAGS}"
+	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+	CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
+	LFLAGS="${LDFLAGS}"
 
 
 .PRECIOUS: pyqtconfig-% build-%/configure-stamp dbg-build-%/configure-stamp