Package: python-qscintilla2 Version: 2.8.3+dfsg-2 Severity: normal Tags: patch
Hi, python-qscintilla2 doesn't currently include the sip files. In turn it's not possible to provide sip bindings to classes derived from Qscintilla classes (like we recently started in qgis). Attached a patch to include that includes the sip files (also makes some steps in debian/rules bailout, that were earlier ignored). Jürgen -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.13-1-amd64 (SMP w/8 CPU cores) Locale: LANG=C, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages python-qscintilla2 depends on: ii libc6 2.19-4 ii libgcc1 1:4.9.0-10 ii libqscintilla2-11 2.8.3+dfsg-1 ii libqtcore4 4:4.8.6+dfsg-2 ii libqtgui4 4:4.8.6+dfsg-2 ii libstdc++6 4.9.0-10 ii python 2.7.8-1 ii python-qt4 4.11.1+dfsg-1 ii python-sip [sip-api-11.1] 4.16.2+dfsg-1 python-qscintilla2 recommends no packages. python-qscintilla2 suggests no packages. -- no debconf information -- Jürgen E. Fischer norBIT GmbH Tel. +49-4931-918175-31 Dipl.-Inf. (FH) Rheinstraße 13 Fax. +49-4931-918175-50 Software Engineer D-26506 Norden http://www.norbit.de -- norBIT Gesellschaft fuer Unternehmensberatung und Informationssysteme mbH Rheinstrasse 13, 26506 Norden GF: Jelto Buurman, HR: Amtsgericht Emden, HRB 5502
diff -ur orig/qscintilla2-2.8.3+dfsg/Python/configure.py qscintilla2-2.8.3+dfsg/Python/configure.py --- orig/qscintilla2-2.8.3+dfsg/Python/configure.py 2014-07-21 11:25:34.000000000 +0200 +++ qscintilla2-2.8.3+dfsg/Python/configure.py 2014-07-21 12:11:49.064222499 +0200 @@ -287,7 +287,7 @@ return None path = os.path.join(target_configuration.qsci_sip_dir, 'Qsci') - files = glob.glob('sip/*.sip') + files = glob.glob( '../sip/*.sip') return path, files diff -ur orig/qscintilla2-2.8.3+dfsg/debian/python-qscintilla2.install qscintilla2-2.8.3+dfsg/debian/python-qscintilla2.install --- orig/qscintilla2-2.8.3+dfsg/debian/python-qscintilla2.install 2014-07-05 16:00:23.000000000 +0200 +++ qscintilla2-2.8.3+dfsg/debian/python-qscintilla2.install 2014-07-21 09:22:15.304651934 +0200 @@ -1 +1,2 @@ -usr/lib/python2*/*-packages/PyQt4/* +usr/*/python2*/*-packages/PyQt4/* +usr/share/sip/PyQt4/Qsci/* diff -ur orig/qscintilla2-2.8.3+dfsg/debian/python3-pyqt4.qsci.install qscintilla2-2.8.3+dfsg/debian/python3-pyqt4.qsci.install --- orig/qscintilla2-2.8.3+dfsg/debian/python3-pyqt4.qsci.install 2014-07-05 16:00:23.000000000 +0200 +++ qscintilla2-2.8.3+dfsg/debian/python3-pyqt4.qsci.install 2014-07-21 09:21:40.068927309 +0200 @@ -1 +1,2 @@ -usr/lib/python3*/*-packages/PyQt4/* +usr/*/python3*/*-packages/PyQt4/* +usr/share/sip/PyQt4/Qsci/* diff -ur orig/qscintilla2-2.8.3+dfsg/debian/python3-pyqt5.qsci.install qscintilla2-2.8.3+dfsg/debian/python3-pyqt5.qsci.install --- orig/qscintilla2-2.8.3+dfsg/debian/python3-pyqt5.qsci.install 2014-07-05 16:00:23.000000000 +0200 +++ qscintilla2-2.8.3+dfsg/debian/python3-pyqt5.qsci.install 2014-07-21 09:21:53.048825867 +0200 @@ -1 +1,2 @@ usr/lib/python3*/*-packages/PyQt5/* +usr/share/sip/PyQt4/Qsci/ diff -ur orig/qscintilla2-2.8.3+dfsg/debian/rules qscintilla2-2.8.3+dfsg/debian/rules --- orig/qscintilla2-2.8.3+dfsg/debian/rules 2014-07-05 16:00:23.000000000 +0200 +++ qscintilla2-2.8.3+dfsg/debian/rules 2014-07-21 11:15:32.166197481 +0200 @@ -110,12 +110,14 @@ install-python-%: $(MAKE) -C Python/build-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp ifeq ($(qt5), "yes") - $(MAKE) -C Python/buildqt5-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp + case "$*" in 3*) \ + $(MAKE) -C Python/buildqt5-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp; \ + esac endif case "$*" in 3*) \ ABITAG=`python$* -c "import sysconfig; print(sysconfig.get_config_var('SOABI'))"`; \ for f in `find debian/tmp/usr/lib/python3* -name '*.so' ! -name '*.cpython*.so'`; do \ - mv $$f $${f%.so}.$$ABITAG.so; \ + mv $$f $${f%.so}.$$ABITAG.so || exit 1; \ done; \ esac @@ -127,7 +129,7 @@ dh_installdirs 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 + cp $(CURDIR)/Python/build-$(shell py3versions -dv)/QScintilla2.api $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt4/api/python3 ifeq ($(qt5), "yes") cd QSciQt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/libqt5scintilla2-$(SONAME) install mkdir -p $(CURDIR)/debian/libqt5scintilla2-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci @@ -142,11 +144,11 @@ mkdir -p $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/qsci/api/python mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/qsci/api/python/* $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/qsci/api/python rm -rf $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5 - mv $(CURDIR)/Python/buildqt5-$(shell py3versions -dv)/QScintilla2.api $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/api/python3 + cp $(CURDIR)/Python/buildqt5-$(shell py3versions -dv)/QScintilla2.api $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/api/python3 endif cd designer-Qt4Qt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install for p in $(PYTHONS) ; do \ - $(MAKE) -f debian/rules install-python-$$p;\ + $(MAKE) -f debian/rules install-python-$$p || exit 1; \ done binary-common:
_______________________________________________ Python-modules-team mailing list Python-modules-team@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team