[Python-modules-team] Bug#536900: NMU diff

[Bastian Blank]

Please find attached the NMU diff.

Bastian

-- 
Insults are effective only where emotion is present.
		-- Spock, "Who Mourns for Adonais?"  stardate 3468.1
-------------- next part --------------
diff -u python-qt4-4.5.1/debian/changelog python-qt4-4.5.1/debian/changelog
--- python-qt4-4.5.1/debian/changelog
+++ python-qt4-4.5.1/debian/changelog
@@ -1,3 +1,10 @@
+python-qt4 (4.5.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix license check. (closes: #536900)
+
+ -- Bastian Blank <waldi at debian.org>  Tue, 28 Jul 2009 19:49:44 +0000
+
 python-qt4 (4.5.1-1) unstable; urgency=low
 
   * New upstream bugfix release
diff -u python-qt4-4.5.1/debian/patches/00list python-qt4-4.5.1/debian/patches/00list
--- python-qt4-4.5.1/debian/patches/00list
+++ python-qt4-4.5.1/debian/patches/00list
@@ -4,0 +5 @@
+05_license-check
only in patch2:
unchanged:
--- python-qt4-4.5.1.orig/debian/patches/05_license-check.dpatch
+++ python-qt4-4.5.1/debian/patches/05_license-check.dpatch
@@ -0,0 +1,81 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## DP: Fixed the license checks for Qt v4.5.2.
+## DP: ActiveQt became part of the open source version in v4.5.2.
+
+ at DPATCH@
+--- a/configure.py
++++ b/configure.py
+@@ -50,6 +50,7 @@ sip_min_version = 0x040801
+ 
+ qt_version = 0
+ qt_edition = ""
++qt_licensee = None
+ qt_dir = None
+ qt_incdir = None
+ qt_libdir = None
+@@ -909,6 +910,9 @@ def inform_user():
+ 
+     sipconfig.inform("Qt v%s %sis being used." % (sipconfig.version_to_string(qt_version), edstr))
+ 
++    if qt_licensee:
++        sipconfig.inform("Qt is licensed to %s." % qt_licensee)
++
+     if sys.platform == "darwin" and qt_framework:
+         sipconfig.inform("Qt is built as a framework.")
+ 
+@@ -1465,9 +1469,8 @@ def check_license():
+     sipconfig.inform("This is the %s version of PyQt %s (licensed under the %s) for Python %s on %s." % (ltype, pyqt_version_str, lname, sys.version.split()[0], sys.platform))
+ 
+     # Common checks.
+-    if qt_edition and ltype != "internal":
+-        if qt_edition != "free" and ltype == "GPL":
+-            sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qt_edition)
++    if qt_licensee and ltype == "GPL":
++        sipconfig.error("This version of PyQt and the commercial version of Qt have incompatible licenses.")
+ 
+     # Confirm the license if not already done.
+     if not opts.license_confirmed:
+@@ -1675,6 +1678,8 @@ int main(int, char **)
+     out << QT_VERSION << '\\n';
+     out << QT_EDITION << '\\n';
+ 
++    out << QLibraryInfo::licensee() << '\\n';
++
+ #if defined(QT_SHARED) || defined(QT_DLL)
+     out << "shared\\n";
+ #else
+@@ -1761,7 +1766,7 @@ int main(int, char **)
+     f.close()
+ 
+     global qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir, qt_pluginsdir
+-    global qt_version, qt_edition, qt_shared, qt_xfeatures
++    global qt_version, qt_edition, qt_licensee, qt_shared, qt_xfeatures
+ 
+     qt_dir = lines[0]
+     qt_incdir = lines[1]
+@@ -1771,8 +1776,12 @@ int main(int, char **)
+     qt_pluginsdir = lines[5]
+     qt_version = lines[6]
+     qt_edition = lines[7]
+-    qt_shared = lines[8]
+-    qt_xfeatures = lines[9:]
++    qt_licensee = lines[8]
++    qt_shared = lines[9]
++    qt_xfeatures = lines[10:]
++
++    if qt_licensee == 'Open Source':
++        qt_licensee = None
+ 
+     try:
+         qt_version = int(qt_version)
+@@ -1789,6 +1798,10 @@ int main(int, char **)
+     if qt_edition & 0x200:
+         # It has ActiveQt.
+         qt_edition = "Desktop"
++
++        # ActiveQt became part of the open source version in v4.5.2.
++        if qt_version >= 0x040502 and qt_licensee is None:
++            qt_edition = "free"
+     elif qt_edition & 0x008:
+         # It has OpenGL.
+         qt_edition = "free"