[Python-modules-commits] r28795 - in packages/qscintilla2/trunk/debian (5 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Wed May 7 06:00:52 UTC 2014
Date: Wednesday, May 7, 2014 @ 06:00:40
Author: kitterman
Revision: 28795
* Change PyQt5 build-deps to linux-any to match where it is available
* Limit Qt5 based packages to linux-any
* Reorder debian/rules and add guards to only run Qt5 related rules when
PyQt5 is available
* Install QScintilla2.api files for Qt4 and Qt5 in libqscintilla2-doc
Modified:
packages/qscintilla2/trunk/debian/changelog
packages/qscintilla2/trunk/debian/control
packages/qscintilla2/trunk/debian/libqscintilla2-doc.install
packages/qscintilla2/trunk/debian/patches/remove-logo-privacy-issue.diff
packages/qscintilla2/trunk/debian/rules
Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog 2014-05-05 22:09:25 UTC (rev 28794)
+++ packages/qscintilla2/trunk/debian/changelog 2014-05-07 06:00:40 UTC (rev 28795)
@@ -1,3 +1,13 @@
+qscintilla2 (2.8.1-3) unstable; urgency=medium
+
+ * Change PyQt5 build-deps to linux-any to match where it is available
+ * Limit Qt5 based packages to linux-any
+ * Reorder debian/rules and add guards to only run Qt5 related rules when
+ PyQt5 is available
+ * Install QScintilla2.api files for Qt4 and Qt5 in libqscintilla2-doc
+
+ -- Scott Kitterman <scott at kitterman.com> Tue, 06 May 2014 23:59:00 -0400
+
qscintilla2 (2.8.1-2) unstable; urgency=medium
* Add debian/patches/remove-logo-privacy-issue.diff to remove use of
Modified: packages/qscintilla2/trunk/debian/control
===================================================================
--- packages/qscintilla2/trunk/debian/control 2014-05-05 22:09:25 UTC (rev 28794)
+++ packages/qscintilla2/trunk/debian/control 2014-05-07 06:00:40 UTC (rev 28795)
@@ -2,7 +2,7 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Torsten Marek <shlomme at debian.org>, Gudjon I. Gudjonsson <gudjon at gudjon.org>, Scott Kitterman <scott at kitterman.com>
-Build-Depends: debhelper (>= 9), libqt4-dev (>= 4:4.8.0~), python-all-dev (>= 2.6.6-3~), python-sip-dev (>= 4.10), python-qt4 (>= 4.8.3-3~), python-qt4-dev (>= 4.8.3-3~), python3-all-dev (>= 3.1.3-13~), python3-sip-dev, python3-pyqt4, qtbase5-dev, python3-pyqt5, pyqt5-dev
+Build-Depends: debhelper (>= 9), libqt4-dev (>= 4:4.8.0~), python-all-dev (>= 2.6.6-3~), python-sip-dev (>= 4.10), python-qt4 (>= 4.8.3-3~), python-qt4-dev (>= 4.8.3-3~), python3-all-dev (>= 3.1.3-13~), python3-sip-dev, python3-pyqt4, qtbase5-dev, python3-pyqt5 [linux-any], pyqt5-dev [linux-any]
Standards-Version: 3.9.5
Section: libs
X-Python3-Version: >= 3.1
@@ -24,7 +24,7 @@
colours and multiple fonts.
Package: libqt5scintilla2-11
-Architecture: any
+Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}, libqt5scintilla2-l10n (>= ${source:Upstream-Version})
Pre-Depends: ${misc:Pre-Depends}
Description: Qt5 port of the Scintilla source code editing widget
@@ -135,7 +135,7 @@
Package: python3-pyqt5.qsci
Section: python
-Architecture: any
+Architecture: linux-any
Depends: ${python3:Depends}, ${shlibs:Depends}, python3-pyqt5, ${sip3:Depends}, ${misc:Depends}
Description: Python 3 bindings for QScintilla 2 with Qt 5
QScintilla is a text editor for Qt5 with features especially useful when
Modified: packages/qscintilla2/trunk/debian/libqscintilla2-doc.install
===================================================================
--- packages/qscintilla2/trunk/debian/libqscintilla2-doc.install 2014-05-05 22:09:25 UTC (rev 28794)
+++ packages/qscintilla2/trunk/debian/libqscintilla2-doc.install 2014-05-07 06:00:40 UTC (rev 28795)
@@ -1 +1,3 @@
usr/share/qt4/qsci/*
+../../Python/build-2.7/QScintilla2.api usr/share/qt4/api/python
+
Modified: packages/qscintilla2/trunk/debian/patches/remove-logo-privacy-issue.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/remove-logo-privacy-issue.diff 2014-05-05 22:09:25 UTC (rev 28794)
+++ packages/qscintilla2/trunk/debian/patches/remove-logo-privacy-issue.diff 2014-05-07 06:00:40 UTC (rev 28795)
@@ -5,7 +5,7 @@
Index: qscintilla2-2.8.1/doc/Scintilla/index.html
===================================================================
--- qscintilla2-2.8.1.orig/doc/Scintilla/index.html 2013-11-04 09:56:48.000000000 -0500
-+++ qscintilla2-2.8.1/doc/Scintilla/index.html 2014-03-19 18:03:38.102166838 -0400
++++ qscintilla2-2.8.1/doc/Scintilla/index.html 2014-05-07 00:20:32.370947393 -0400
@@ -63,13 +63,6 @@
</td>
</tr>
@@ -20,3 +20,12 @@
<ul id="versionlist">
<li>Version 3.3.6 adds support for the Rust language and fixes bugs.</li>
<li>Version 3.3.5 can represent characters with strings. This may be used for modes
+@@ -175,7 +168,7 @@
+ </script>
+ <noscript>
+ <a href="http://sourceforge.net/projects/scintilla">
+-<img src="http://sflogo.sourceforge.net/sflogo.php?group_id=2439&type=8" width="80" height="15" alt="Get Scintilla at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
++Get Scintilla at SourceForge.net. Fast, secure and Free Open Source software downloads</a>
+ </noscript>
+ </body>
+ </html>
Modified: packages/qscintilla2/trunk/debian/rules
===================================================================
--- packages/qscintilla2/trunk/debian/rules 2014-05-05 22:09:25 UTC (rev 28794)
+++ packages/qscintilla2/trunk/debian/rules 2014-05-07 06:00:40 UTC (rev 28795)
@@ -29,15 +29,24 @@
# Update this on SO name bumps so files get shoved around correctly
SONAME=11
+# Not all archs have Qt5 yet. This test means python3-pyqt5 is installed
+qt5 := "no"
+ifeq ($([ -e /usr/lib/python3/dist-packages/PyQt5/__init__.py ]), $(/usr/bin/true))
+ qt5 := "yes"
+endif
+
configure-stamp:
dh_testdir
mkdir QSciQt4
- mkdir QSciQt5
- cp -r Qt4Qt5/* QSciQt5
mkdir designer-Qt4
cd Qt4Qt5 && 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
+ mkdir QSciQt5
+ cp -r Qt4Qt5/* QSciQt5
cd QSciQt5 && qmake -qt=qt5-$(DEB_HOST_MULTIARCH) QMAKE_STRIP="" DESTDIR=../QSciQt5
+endif
touch $@
configure: configure-stamp $(PYTHONS:%=Python/build-%/configure-stamp)
@@ -49,6 +58,7 @@
&& python$* ../configure.py -n ../../Qt4Qt5/ -o ../../QSciQt4 \
--sip-incdir=/usr/include/python$* -c \
--destdir=$(CUR_DIR)/usr/lib/python$*/dist-packages/PyQt4
+ifeq ($(qt5), "yes")
case "$*" in 3*) \
mkdir -p Python/buildqt5-$* ; \
esac
@@ -59,13 +69,16 @@
--qmake=/usr/bin/qmake \
--destdir=$(CUR_DIR)/usr/lib/python$*/dist-packages/PyQt5; \
esac
+endif
touch $@
build-library-stamp: configure
dh_testdir
cd Qt4Qt5 && $(MAKE)
+ cd designer-Qt4Qt5 && $(MAKE)
+ifeq ($(qt5), "yes")
cd QSciQt5 && $(MAKE)
- cd designer-Qt4Qt5 && $(MAKE)
+endif
touch $@
build: build-arch build-indep
@@ -95,7 +108,9 @@
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
+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 \
@@ -110,10 +125,14 @@
dh_prep
dh_installdirs
cd Qt4Qt5 && $(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")
cd QSciQt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/libqt5scintilla2-$(SONAME) install
mkdir -p $(CURDIR)/debian/libqt5scintilla2-dev/usr/include/qt5/Qsci
mkdir -p $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib
mkdir -p $(CURDIR)/debian/libqt5scintilla2-dev/usr/share/qt5/mkspecs/features
+ mkdir -p $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/api/python3
mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/include/qt5/Qsci/*.h $(CURDIR)/debian/libqt5scintilla2-dev/usr/include/qt5/Qsci/
rm -rf $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/include
mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/lib/*.so $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib
@@ -123,6 +142,8 @@
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
+endif
cd designer-Qt4Qt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
for p in $(PYTHONS) ; do \
$(MAKE) -f debian/rules install-python-$$p;\
More information about the Python-modules-commits
mailing list