[Python-modules-commits] r29334 - in packages/qscintilla2/trunk/debian (2 files)

[kitterman at users.alioth.debian.org]

    Date: Saturday, June 14, 2014 @ 14:51:42
  Author: kitterman
Revision: 29334

Set libqt5scintilla2 in LIBS if debug is enabled in qscintilla2.prf

Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/patches/qt5_libname.patch

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2014-06-14 12:06:45 UTC (rev 29333)
+++ packages/qscintilla2/trunk/debian/changelog	2014-06-14 14:51:42 UTC (rev 29334)
@@ -1,3 +1,9 @@
+qscintilla2 (2.8.2+dfsg-3) UNRELEASED; urgency=medium
+
+  * Set libqt5scintilla2 in LIBS if debug is enabled in qscintilla2.prf
+
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 14 Jun 2014 10:37:34 -0400
+
 qscintilla2 (2.8.2+dfsg-2) unstable; urgency=medium
 
   * Fix failure to link python* packages to the lib (Closes: #751239)

Modified: packages/qscintilla2/trunk/debian/patches/qt5_libname.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/qt5_libname.patch	2014-06-14 12:06:45 UTC (rev 29333)
+++ packages/qscintilla2/trunk/debian/patches/qt5_libname.patch	2014-06-14 14:51:42 UTC (rev 29334)
@@ -2,27 +2,36 @@
 upstream, but not reviewed as they aren't particularly interested in it.
 Index: qscintilla2-2.8.2+dfsg/Qt4Qt5/qscintilla.pro
 ===================================================================
---- qscintilla2-2.8.2+dfsg.orig/Qt4Qt5/qscintilla.pro	2014-06-09 15:50:37.304360419 -0400
-+++ qscintilla2-2.8.2+dfsg/Qt4Qt5/qscintilla.pro	2014-06-09 15:50:51.756359992 -0400
+--- qscintilla2-2.8.2+dfsg.orig/Qt4Qt5/qscintilla.pro	2014-06-13 16:24:25.000000000 -0400
++++ qscintilla2-2.8.2+dfsg/Qt4Qt5/qscintilla.pro	2014-06-14 10:48:56.699335616 -0400
 @@ -41,6 +41,7 @@
  
  greaterThan(QT_MAJOR_VERSION, 4) {
  	QT += widgets printsupport
-+        TARGET = qt5scintilla2
++	TARGET = qt5scintilla2
  
      greaterThan(QT_MINOR_VERSION, 1) {
  	    macx:QT += macextras
 Index: qscintilla2-2.8.2+dfsg/Qt4Qt5/features/qscintilla2.prf
 ===================================================================
---- qscintilla2-2.8.2+dfsg.orig/Qt4Qt5/features/qscintilla2.prf	2014-06-09 15:50:37.304360419 -0400
-+++ qscintilla2-2.8.2+dfsg/Qt4Qt5/features/qscintilla2.prf	2014-06-09 15:50:37.300360419 -0400
-@@ -21,5 +21,10 @@
+--- qscintilla2-2.8.2+dfsg.orig/Qt4Qt5/features/qscintilla2.prf	2014-05-26 09:42:15.000000000 -0400
++++ qscintilla2-2.8.2+dfsg/Qt4Qt5/features/qscintilla2.prf	2014-06-14 10:46:29.935339463 -0400
+@@ -17,9 +17,18 @@
+         win32: {
+             LIBS += -lqscintilla2d
+         } else {
+-            LIBS += -lqscintilla2
++            greaterThan(QT_MAJOR_VERSION, 4) {
++                LIBS += -lqt5scintilla2
++            } else {
++                LIBS += -lqscintilla2
++            }
          }
      }
  } else {
 +    greaterThan(QT_MAJOR_VERSION, 4) {
 +        LIBS += -lqt5scintilla2
-+       }
++        }
 +        else {
      LIBS += -lqscintilla2
 +        }