[Python-modules-commits] r16144 - in packages/python-qt4/trunk/debian/patches (2 files)

[kitterman at users.alioth.debian.org]

    Date: Thursday, March 17, 2011 @ 16:46:17
  Author: kitterman
Revision: 16144

Rename fix_the_QAssitant_ftbfs.patch/fix_the_QAssitant_ftbfs.diff

Added:
  packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.diff
    (from rev 16139, packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.patch)
Deleted:
  packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.patch

Copied: packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.diff (from rev 16139, packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.patch)
===================================================================
--- packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.diff	                        (rev 0)
+++ packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.diff	2011-03-17 16:46:17 UTC (rev 16144)
@@ -0,0 +1,29 @@
+From aa85ab2be6be7cb3c4df68139a8271fc4c8c11c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
+Date: Tue, 1 Mar 2011 21:49:23 +0100
+Subject: [PATCH] * fix the QAssitant ftbfs
+
+---
+ configure.py |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index 7ed9582..185ec9f 100644
+--- a/configure.py
++++ b/configure.py
+@@ -354,10 +354,10 @@ class ConfigurePyQt4:
+ 
+         if opts.mwg_ssl_dir:
+             ass_lib_dirs = [os.path.join(opts.mwg_ssl_dir, "lib")]
+-            ass_libs = ["ssleay32", "libeay32"]
++            ass_libs = ["ssleay32", "libeay32", "QtCore"]
+         else:
+             ass_lib_dirs = None
+-            ass_libs = None
++            ass_libs = ["QtCore"]
+ 
+         # Note that the order in which we check is important for the
+         # consolidated module - a module's dependencies must be checked first.
+-- 
+1.7.4.1
+

Deleted: packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.patch
===================================================================
--- packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.patch	2011-03-17 16:06:37 UTC (rev 16143)
+++ packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.patch	2011-03-17 16:46:17 UTC (rev 16144)
@@ -1,29 +0,0 @@
-From aa85ab2be6be7cb3c4df68139a8271fc4c8c11c8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
-Date: Tue, 1 Mar 2011 21:49:23 +0100
-Subject: [PATCH] * fix the QAssitant ftbfs
-
----
- configure.py |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.py b/configure.py
-index 7ed9582..185ec9f 100644
---- a/configure.py
-+++ b/configure.py
-@@ -354,10 +354,10 @@ class ConfigurePyQt4:
- 
-         if opts.mwg_ssl_dir:
-             ass_lib_dirs = [os.path.join(opts.mwg_ssl_dir, "lib")]
--            ass_libs = ["ssleay32", "libeay32"]
-+            ass_libs = ["ssleay32", "libeay32", "QtCore"]
-         else:
-             ass_lib_dirs = None
--            ass_libs = None
-+            ass_libs = ["QtCore"]
- 
-         # Note that the order in which we check is important for the
-         # consolidated module - a module's dependencies must be checked first.
--- 
-1.7.4.1
-