[Python-modules-commits] r29297 - in packages/qscintilla2/trunk/debian (4 files)

[kitterman at users.alioth.debian.org]

    Date: Wednesday, June 11, 2014 @ 15:35:53
  Author: kitterman
Revision: 29297

* Fix failure to link python* packages to the lib (Closes: #751239)
  - Add debian/patches/qsci_link.patch so that the correct (Qt4/Qt5) is used
  - Update debian/rules to match build system changes so that the correct
    search path for the libs is used

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

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2014-06-10 22:25:32 UTC (rev 29296)
+++ packages/qscintilla2/trunk/debian/changelog	2014-06-11 15:35:53 UTC (rev 29297)
@@ -1,3 +1,12 @@
+qscintilla2 (2.8.2+dfsg-2) unstable; urgency=medium
+
+  * Fix failure to link python* packages to the lib (Closes: #751239)
+    - Add debian/patches/qsci_link.patch so that the correct (Qt4/Qt5) is used
+    - Update debian/rules to match build system changes so that the correct
+      search path for the libs is used
+
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 11 Jun 2014 09:59:25 -0400
+
 qscintilla2 (2.8.2+dfsg-1) unstable; urgency=medium
 
   * New upstream release

Added: packages/qscintilla2/trunk/debian/patches/qsci_link.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/qsci_link.patch	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/patches/qsci_link.patch	2014-06-11 15:35:53 UTC (rev 29297)
@@ -0,0 +1,16 @@
+Index: qscintilla2-2.8.2+dfsg/Python/configure.py
+===================================================================
+--- qscintilla2-2.8.2+dfsg.orig/Python/configure.py	2014-06-11 10:10:17.000000000 -0400
++++ qscintilla2-2.8.2+dfsg/Python/configure.py	2014-06-11 10:12:13.713987412 -0400
+@@ -1332,7 +1332,10 @@
+ 
+     libs = qmake_config.get('LIBS')
+     if libs:
+-        pro.write('LIBS += %s\n' % libs)
++        if target_config.pyqt_package == 'PyQt5':
++            pro.write('LIBS += %s -lqt5scintilla2\n' % libs)
++        else:
++            pro.write('LIBS += %s -lqscintilla2\n' % libs)
+ 
+     if not opts.static:
+         dylib = module_config.get_mac_wrapped_library_file(target_config)

Modified: packages/qscintilla2/trunk/debian/patches/series
===================================================================
--- packages/qscintilla2/trunk/debian/patches/series	2014-06-10 22:25:32 UTC (rev 29296)
+++ packages/qscintilla2/trunk/debian/patches/series	2014-06-11 15:35:53 UTC (rev 29297)
@@ -4,3 +4,4 @@
 qt5_includes.patch
 qt5_libname.patch
 pyconfigure_target_config_fix.patch
+qsci_link.patch

Modified: packages/qscintilla2/trunk/debian/rules
===================================================================
--- packages/qscintilla2/trunk/debian/rules	2014-06-10 22:25:32 UTC (rev 29296)
+++ packages/qscintilla2/trunk/debian/rules	2014-06-11 15:35:53 UTC (rev 29297)
@@ -38,8 +38,9 @@
 configure-stamp:
 	dh_testdir
 	mkdir QSciQt4
+	cp -r Qt4Qt5/* QSciQt4
 	mkdir designer-Qt4
-	cd Qt4Qt5 && qmake-qt4 QMAKE_STRIP="" DESTDIR=../QSciQt4
+	cd QSciQt4 && qmake-qt4 QMAKE_STRIP="" DESTDIR=../QSciQt4
 	cd designer-Qt4Qt5 && qmake-qt4 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../QSciQt4 QMAKE_STRIP="" DESTDIR=../designer-Qt4
 ifeq ($(qt5), "yes")
 	# Configuring for Qt5 support
@@ -55,9 +56,9 @@
 	dh_testdir
 	mkdir -p Python/build-$*
 	cd Python/build-$* \
-		&& python$* ../configure.py -n ../../Qt4Qt5/ -o ../../QSciQt4 \
-		--sip-incdir=/usr/include/python$* -c \
-		--destdir=$(CUR_DIR)/usr/lib/python$*/dist-packages/PyQt4
+		&& python$* ../configure.py -n ../../QSciQt4/ -o ../../QSciQt4 \
+		--sip-incdir=/usr/include/python$* -c --qsci-incdir=../../QSciQt4 \
+		--qsci-libdir=../../QSciQt4 --destdir=$(CUR_DIR)/usr/lib/python$*/dist-packages/PyQt4
 ifeq ($(qt5), "yes")
 	case "$*" in 3*) \
 		mkdir -p Python/buildqt5-$* ; \
@@ -65,8 +66,8 @@
 	case "$*" in 3*) \
 		cd Python/buildqt5-$* \
 		  && QT_SELECT=qt5-$(DEB_HOST_MULTIARCH) python$* ../configure.py -n ../../QSciQt5/ -o ../../QSciQt5 \
-		  --sip-incdir=/usr/include/python$* -c --pyqt=PyQt5 \
-		   --qmake=/usr/bin/qmake \
+		  --sip-incdir=/usr/include/python$* -c --qsci-incdir=../../QSciQt5 --pyqt=PyQt5 \
+		   --qsci-libdir=../../QSciQt5 --qmake=/usr/bin/qmake \
 		  --destdir=$(CUR_DIR)/usr/lib/python$*/dist-packages/PyQt5; \
 	esac
 endif
@@ -74,7 +75,7 @@
 
 build-library-stamp: configure
 	dh_testdir
-	cd Qt4Qt5 && $(MAKE)
+	cd QSciQt4 && $(MAKE)
 	cd designer-Qt4Qt5 && $(MAKE)
 ifeq ($(qt5), "yes")
 	cd QSciQt5 && $(MAKE)
@@ -95,7 +96,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	-cd Qt4Qt5 && $(MAKE) distclean
+	-cd QSciQt4 && $(MAKE) distclean
 	-cd designer-Qt4Qt5 && $(MAKE) distclean
 
 	rm -rf Python/build*
@@ -124,7 +125,7 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	cd Qt4Qt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
+	cd QSciQt4 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
 	mkdir -p $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt4/api/python3
 	mv $(CURDIR)/Python/build-$(shell py3versions -dv)/QScintilla2.api $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt4/api/python3
 ifeq ($(qt5), "yes")