[Python-modules-commits] r29728 - in packages/qscintilla2/trunk/debian (3 files)

[kitterman at users.alioth.debian.org]

    Date: Saturday, July 12, 2014 @ 03:04:45
  Author: kitterman
Revision: 29728

 * Patch designer-Qt4Qt5/designer.pro to explicitly link with the Qt4 version
   of the qscintilla2 library to fix runtime inability to find qscintilla2
   symbols (Closes: 753581) (really)

Added:
  packages/qscintilla2/trunk/debian/patches/designer_link_fix.patch
Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/patches/series

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2014-07-11 12:14:50 UTC (rev 29727)
+++ packages/qscintilla2/trunk/debian/changelog	2014-07-12 03:04:45 UTC (rev 29728)
@@ -1,7 +1,15 @@
+qscintilla2 (2.8.3+dfsg-2) unstable; urgency=medium
+
+   * Patch designer-Qt4Qt5/designer.pro to explicitly link with the Qt4 version
+     of the qscintilla2 library to fix runtime inability to find qscintilla2
+     symbols (Closes: 753581) (really)
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 11 Jul 2014 22:34:22 -0400
+
 qscintilla2 (2.8.3+dfsg-1) unstable; urgency=medium
 
   * New upstream release
-    - Repack tarball to remove sourceless javascript files (doc/html-Qt4Qt5/
+    - Repack tarball to remove sourcelss javascript files (doc/html-Qt4Qt5/
       jquery.js and doc/html-Qt3/jquery.js)
     - Rebuild should resolve #753581 (Closes: #753581)
     - Dropped debian/patches/pyconfigure_target_config_fix.patch, resolved
@@ -31,7 +39,7 @@
 qscintilla2 (2.8.2+dfsg-1) unstable; urgency=medium
 
   * New upstream release
-    - Repack tarball to remove sourceless javascript files
+    - Repack tarball to remove sourcelss javascript files
     - Refresh and update patches for upstream Python/configure.py changes
     - Add debian/patches/pyconfigure_target_config_fix.patch to fix a variable
       rename missed by upstream

Added: packages/qscintilla2/trunk/debian/patches/designer_link_fix.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/designer_link_fix.patch	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/patches/designer_link_fix.patch	2014-07-12 03:04:45 UTC (rev 29728)
@@ -0,0 +1,24 @@
+Description: Link Qt4 designer plugin with Qt4 library
+   * Patch designer-Qt4Qt5/designer.pro to explicitly link with the Qt4 version
+     of the qscintilla2 library to fix runtime inability to find qscintilla2
+     symbols (LP: #1314114)
+Author: Scott Kitterman <scott at kitterman.com>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/753581
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1314114
+Forwarded: not-needed
+Last-Update: 2014-07-11
+
+--- qscintilla2-2.8.1.orig/designer-Qt4Qt5/designer.pro
++++ qscintilla2-2.8.1/designer-Qt4Qt5/designer.pro
+@@ -8,8 +8,10 @@ CONFIG += release plugin qscintilla2
+ 
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     QT += designer
++    LIBS += -lqt5scintilla2
+ } else {
+     CONFIG += designer
++    LIBS += -lqscintilla2
+ }
+ 
+ macx {

Modified: packages/qscintilla2/trunk/debian/patches/series
===================================================================
--- packages/qscintilla2/trunk/debian/patches/series	2014-07-11 12:14:50 UTC (rev 29727)
+++ packages/qscintilla2/trunk/debian/patches/series	2014-07-12 03:04:45 UTC (rev 29728)
@@ -4,3 +4,4 @@
 qt5_includes.patch
 qt5_libname.patch
 qsci_link.patch
+designer_link_fix.patch