[Python-modules-commits] [qscintilla2] 01/01: Add new binary packages python-pyqt5.qsci and python-pyqt5.qsci-dbg so QScintilla2 can be used with Python (2) and Qt5 to enable QGIS to be updated to Qt5

Sun Jan 10 21:33:09 UTC 2016

This is an automated email from the git hooks/post-receive script.

kitterman pushed a commit to branch master
in repository qscintilla2.

commit 7300323eb84c44a298bed8fbd4766ddab6620093
Author: Scott Kitterman <scott at kitterman.com>
Date:   Sun Jan 10 16:32:54 2016 -0500

    Add new binary packages python-pyqt5.qsci and python-pyqt5.qsci-dbg so QScintilla2 can be used with Python (2) and Qt5 to enable QGIS to be updated to Qt5
    
    * Add new binary packages python-pyqt5.qsci and python-pyqt5.qsci-dbg so
      QScintilla2 can be used with Python (2) and Qt5 to enable QGIS to be
      updated to Qt5
      - Add new packages to debian/control
      - Add python-pyqt5 and python-pyqt5-dbg to build-depends
      - Update debian/rules to do Qt5 builds for both python and python3
      - Add debian/python-pyqt5.qsci.install
---
 debian/changelog                 | 12 ++++++++++++
 debian/control                   | 37 ++++++++++++++++++++++++++++++++++++-
 debian/python-pyqt5.qsci.install |  1 +
 debian/rules                     | 39 +++++++++++++++++++++------------------
 4 files changed, 70 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6c3270..bb5f037 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+qscintilla2 (2.9.1+dfsg-4) unstable; urgency=medium
+
+  * Add new binary packages python-pyqt5.qsci and python-pyqt5.qsci-dbg so
+    QScintilla2 can be used with Python (2) and Qt5 to enable QGIS to be
+    updated to Qt5
+    - Add new packages to debian/control
+    - Add python-pyqt5 and python-pyqt5-dbg to build-depends
+    - Update debian/rules to do Qt5 builds for both python and python3
+    - Add debian/python-pyqt5.qsci.install
+
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 10 Jan 2016 15:42:57 -0500
+
 qscintilla2 (2.9.1+dfsg-3) unstable; urgency=medium
 
   * rm the mkspecs dir from libqt5scintilla2-12v5 in debian/rules so the prf
diff --git a/debian/control b/debian/control
index 370b7e5..f468292 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,8 @@ Build-Depends: debhelper (>= 9),
                python-all-dev (>= 2.6.6-3~),
                python-qt4 (>= 4.8.3-3~),
                python-qt4-dbg,
+               python-pyqt5,
+               python-pyqt5-dbg,
                python-qt4-dev (>= 4.8.3-3~),
                python-sip-dbg,
                python-sip-dev (>= 4.10),
@@ -304,6 +306,39 @@ Description: Python 3 bindings for QScintilla 2 (Qt 4 debug extensions)
  This package contains the extensions built for the Python 3 debug
  interpreter.
 
+Package: python-pyqt5.qsci
+Section: python
+Architecture: any
+Depends: python-pyqt5,
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends},
+         ${sip:Depends}
+Description: Python bindings for QScintilla 2 with Qt 5
+ QScintilla is a text editor for Qt5 with features especially useful when
+ writing and debugging source code. These include support for syntax
+ styling, error indicators, code completion, call tips and margins.
+ .
+ This package contains Python bindings so QScintilla 2 can be used in
+ PyQt5 applications.
+
+Package: python-pyqt5.qsci-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+         python-pyqt5-dbg,
+         python-pyqt5.qsci (= ${binary:Version}),
+         python-sip-dbg,
+         ${misc:Depends}
+Description: Python bindings for QScintilla 2 (Qt 5 debug extensions)
+ QScintilla is a text editor for Qt5 with features especially useful when
+ writing and debugging source code. These include support for syntax
+ styling, error indicators, code completion, call tips and margins.
+ .
+ This package contains the extensions built for the Python debug
+ interpreter.
+
 Package: python3-pyqt5.qsci
 Section: python
 Architecture: any
@@ -324,7 +359,7 @@ Package: pyqt5.qsci-dev
 Architecture: all
 Depends: pyqt5-dev, python-sip-dev, ${misc:Depends}
 Description: Development files for Python Qscintilla2 (Qt5)
- This package contains the source SIP files from which the Python bindings for 
+ This package contains the source SIP files from which the Python bindings for
  Qscintilla2 (Qt5) are created. They are needed for building PyQt5 bindindgs
  for Qscintilla2 as well as creating bindings for own widgets written in C++.
 
diff --git a/debian/python-pyqt5.qsci.install b/debian/python-pyqt5.qsci.install
new file mode 100644
index 0000000..e398018
--- /dev/null
+++ b/debian/python-pyqt5.qsci.install
@@ -0,0 +1 @@
+usr/lib/python2*/*-packages/PyQt5/*
diff --git a/debian/rules b/debian/rules
index e357f6c..0addfb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,15 +66,13 @@ Python/build-%/configure-stamp:
 		--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-$* ; \
+	mkdir -p Python/buildqt5-$* ; \
 	esac
-	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 --qsci-incdir=../../QSciQt5 --pyqt=PyQt5 \
-		   --qsci-libdir=../../QSciQt5 --qmake=/usr/bin/qmake \
-		  --destdir=$(CUR_DIR)/usr/lib/python$*/dist-packages/PyQt5; \
+	cd Python/buildqt5-$* \
+	  && QT_SELECT=qt5-$(DEB_HOST_MULTIARCH) python$* ../configure.py -n ../../QSciQt5/ -o ../../QSciQt5 \
+	  --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
 	touch $@
@@ -88,16 +86,14 @@ Python/dbg-build-%/configure-stamp:
 		--qsci-libdir=../../QSciQt4 --destdir=$(CUR_DIR)/usr/lib/python$*/dist-packages/PyQt4 \
 		--debug 
 ifeq ($(qt5), "yes")
-	case "$*" in 3*) \
-		mkdir -p Python/dbg-buildqt5-$* ; \
+	mkdir -p Python/dbg-buildqt5-$* ; \
 	esac
-	case "$*" in 3*) \
-		cd Python/dbg-buildqt5-$* \
-		  && QT_SELECT=qt5-$(DEB_HOST_MULTIARCH) python$*-dbg ../configure.py -n ../../QSciQt5/ -o ../../QSciQt5 \
-		  --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 \
-		  --debug ; \
+	cd Python/dbg-buildqt5-$* \
+	  && QT_SELECT=qt5-$(DEB_HOST_MULTIARCH) python$*-dbg ../configure.py -n ../../QSciQt5/ -o ../../QSciQt5 \
+	  --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 \
+	  --debug ; \
 	esac
 endif
 	touch $@
@@ -162,11 +158,18 @@ endif
 	done; 
 
 d_qt4_dbg = debian/python-qscintilla2-dbg
+d_qt5_dbg = debian/python-pyqt5.qsci-dbg
 
 install-python-%: 
 	$(MAKE) -C Python/build-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C Python/dbg-build-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/$(d_qt4_dbg)
 
+ifeq ($(qt5), "yes")
+	$(MAKE) -C Python/buildqt5-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C Python/dbg-buildqt5-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+endif
+
+
 install: build
 	dh_testdir
 	dh_testroot
@@ -220,7 +223,7 @@ ifeq (,$(findstring -i, $(DH_OPTIONS)))
 ifeq ($(qt5), "yes")
 	set -e; \
 	for p in libqt5scintilla2-$(SONAME) libqt5scintilla2-designer \
-	    python3-pyqt5.qsci \
+	    python-pyqt5.qsci python3-pyqt5.qsci \
 	    ; do \
 	    DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
 	    rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/qscintilla2.git

