[Python-modules-commits] r29280 - in packages/qscintilla2/trunk/debian (12 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Tue Jun 10 03:52:14 UTC 2014
Date: Tuesday, June 10, 2014 @ 03:52:12
Author: kitterman
Revision: 29280
* New upstream release
- Repack tarball to remove sourcelss javascript files
- Refresh and update patches for upstream Python/configure.py changes
- Add debian/patches/pyconfigure_target_config_fix.patch to fix a variable
rename missed by upstream
* Adjust debian/rules to use the new, multiarch Qt5 header installation
locations (Closes: #751071)
- Change libqt5scintilla2-dev to arch:linux-any kfreebsd-any now that
header locations are arch specific for the Qt5 build
* Build Qt5 packages for kfreebsd now that pyqt5 is built there
* Update debian/watch due to need to mangle upstream version
* Set minimum pyqt5 build-dep version to 5.3+dfsg-2~ Due to Qt 5.3 changes
* Fix libqt5scintilla2-l10n Suggests
Added:
packages/qscintilla2/trunk/debian/patches/pyconfigure_target_config_fix.patch
Modified:
packages/qscintilla2/trunk/debian/changelog
packages/qscintilla2/trunk/debian/control
packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff
packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff
packages/qscintilla2/trunk/debian/patches/qt5_includes.patch
packages/qscintilla2/trunk/debian/patches/qt5_libname.patch
packages/qscintilla2/trunk/debian/patches/remove-logo-privacy-issue.diff
packages/qscintilla2/trunk/debian/patches/series
packages/qscintilla2/trunk/debian/rules
packages/qscintilla2/trunk/debian/watch
Deleted:
packages/qscintilla2/trunk/debian/patches/py_conf_inc_dir.diff
Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog 2014-06-09 19:26:30 UTC (rev 29279)
+++ packages/qscintilla2/trunk/debian/changelog 2014-06-10 03:52:12 UTC (rev 29280)
@@ -1,3 +1,21 @@
+qscintilla2 (2.8.2+dfsg-1) unstable; urgency=medium
+
+ * New upstream release
+ - Repack tarball to remove sourcelss javascript files
+ - Refresh and update patches for upstream Python/configure.py changes
+ - Add debian/patches/pyconfigure_target_config_fix.patch to fix a variable
+ rename missed by upstream
+ * Adjust debian/rules to use the new, multiarch Qt5 header installation
+ locations (Closes: #751071)
+ - Change libqt5scintilla2-dev to arch:linux-any kfreebsd-any now that
+ header locations are arch specific for the Qt5 build
+ * Build Qt5 packages for kfreebsd now that pyqt5 is built there
+ * Update debian/watch due to need to mangle upstream version
+ * Set minimum pyqt5 build-dep version to 5.3+dfsg-2~ Due to Qt 5.3 changes
+ * Fix libqt5scintilla2-l10n Suggests
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 09 Jun 2014 14:45:54 -0400
+
qscintilla2 (2.8.1-4) unstable; urgency=medium
* Fix test for python-pyqt5 availability
Modified: packages/qscintilla2/trunk/debian/control
===================================================================
--- packages/qscintilla2/trunk/debian/control 2014-06-09 19:26:30 UTC (rev 29279)
+++ packages/qscintilla2/trunk/debian/control 2014-06-10 03:52:12 UTC (rev 29280)
@@ -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 [linux-any], pyqt5-dev [linux-any]
+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 (>= 5.3+dfsg-2~) [linux-any kfreebsd-any], pyqt5-dev [linux-any kfreebsd-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: linux-any
+Architecture: linux-any kfreebsd-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
@@ -52,7 +52,7 @@
Package: libqt5scintilla2-l10n
Architecture: all
Depends: ${misc:Depends}
-Suggests: libqscintilla2-qt5-11
+Suggests: libqt5scintilla2-11
Description: Scintilla source code editing widget for Qt5, translation files
QScintilla is a text editor for Qt5 with features especially useful when
writing and debugging source code. These include support for syntax
@@ -87,7 +87,7 @@
Package: libqt5scintilla2-dev
Section: libdevel
-Architecture: all
+Architecture: linux-any kfreebsd-any
Depends: libqt5scintilla2-11 (>= ${source:Upstream-Version}), libqt5scintilla2-11 (<< ${source:Upstream-Version}+1~), qtbase5-dev, ${misc:Depends}
Description: Scintilla source code editing widget for Qt5, development files
QScintilla is a text editor for Qt5 with features especially useful when
@@ -135,7 +135,7 @@
Package: python3-pyqt5.qsci
Section: python
-Architecture: linux-any
+Architecture: linux-any kfreebsd-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/patches/configure.py-objdir-support.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff 2014-06-09 19:26:30 UTC (rev 29279)
+++ packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff 2014-06-10 03:52:12 UTC (rev 29280)
@@ -1,10 +1,13 @@
02_configure.dpatch by Torsten Marek <shlomme at debian.org>
-patch the configure script for the Python bindings to support object dir builds
-Index: qscintilla2-2.8.1/Python/configure.py
+Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
+<scott at kitterman.com>
+patch the configure script for the Python bindings to support object dir
+builds
+Index: qscintilla2-2.8.2+dfsg/Python/configure.py
===================================================================
---- qscintilla2-2.8.1.orig/Python/configure.py 2014-03-17 19:09:29.155268568 -0400
-+++ qscintilla2-2.8.1/Python/configure.py 2014-03-17 19:11:15.267265433 -0400
-@@ -29,6 +29,8 @@
+--- qscintilla2-2.8.2+dfsg.orig/Python/configure.py 2014-06-09 16:33:03.267985662 -0400
++++ qscintilla2-2.8.2+dfsg/Python/configure.py 2014-06-09 16:34:38.239982856 -0400
+@@ -31,6 +31,8 @@
import glob
import optparse
@@ -13,24 +16,26 @@
try:
import sysconfig
except ImportError:
-@@ -544,6 +546,8 @@
- "The QScintilla version number could not be determined by "
- "reading %s." % sciglobal)
+@@ -210,6 +212,8 @@
+ "The QScintilla version number could not be determined by "
+ "reading %s." % sciglobal)
-+ return # Debian: do not check for the installed version, we're good this way.
++ return # Debian: do not check for the installed version, we're good this way.
+
- lib_dir = target_config.qsci_lib_dir
- if lib_dir is None:
- lib_dir = target_config.qsci_default_lib_dir
-@@ -631,9 +635,9 @@
- argv.append('.')
+ lib_dir = target_configuration.qsci_lib_dir
+ if lib_dir is None:
+ lib_dir = target_configuration.qt_lib_dir
+@@ -249,7 +253,12 @@
+ the target configuration.
+ """
- if opts.pyqt_package == 'PyQt5':
-- argv.append('sip/qscimod5.sip')
-+ argv.append(os.path.join(src_dir, 'sip/qscimod5.sip'))
- else:
-- argv.append('sip/qscimod4.sip')
-+ argv.append(os.path.join(src_dir, 'sip/qscimod4.sip'))
+- return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
++ if target_configuration.pyqt_package == 'PyQt5':
++ return os.path.join(src_dir, 'sip/qscimod5.sip')
++ else:
++ return os.path.join(src_dir, 'sip/qscimod4.sip')
++
++ #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
- rc = os.spawnv(os.P_WAIT, target_config.sip, argv)
- if rc != 0:
+ def get_sip_installs(self, target_configuration):
+ """ Return a tuple of the installation directory of the module's .sip
Modified: packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff 2014-06-09 19:26:30 UTC (rev 29279)
+++ packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff 2014-06-10 03:52:12 UTC (rev 29280)
@@ -1,10 +1,10 @@
01_qscintilla.pro.dpatch by Torsten Marek <shlomme at debian.org>
Don't install the library directly
-Index: qscintilla2-2.8.1/Qt4Qt5/qscintilla.pro
+Index: qscintilla2-2.8.2+dfsg/Qt4Qt5/qscintilla.pro
===================================================================
---- qscintilla2-2.8.1.orig/Qt4Qt5/qscintilla.pro 2014-03-17 19:11:57.271264192 -0400
-+++ qscintilla2-2.8.1/Qt4Qt5/qscintilla.pro 2014-03-17 19:11:57.259264192 -0400
-@@ -47,7 +47,7 @@
+--- qscintilla2-2.8.2+dfsg.orig/Qt4Qt5/qscintilla.pro 2014-06-09 15:09:55.924432554 -0400
++++ qscintilla2-2.8.2+dfsg/Qt4Qt5/qscintilla.pro 2014-06-09 15:09:55.920432554 -0400
+@@ -52,7 +52,7 @@
#DEFINES += SCI_NAMESPACE
# Handle both Qt v4 and v3.
Deleted: packages/qscintilla2/trunk/debian/patches/py_conf_inc_dir.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/py_conf_inc_dir.diff 2014-06-09 19:26:30 UTC (rev 29279)
+++ packages/qscintilla2/trunk/debian/patches/py_conf_inc_dir.diff 2014-06-10 03:52:12 UTC (rev 29280)
@@ -1,33 +0,0 @@
-Added to support multiple Python header directories for multi-arch
--I/usr/include/i386-linux-gnu/python2.7
-Patch by Scott Kitterman <scott at kitterman.com>, will be sent upstream
-
-Index: qscintilla2-2.8.1/Python/configure.py
-===================================================================
---- qscintilla2-2.8.1.orig/Python/configure.py 2014-03-17 19:12:22.995263432 -0400
-+++ qscintilla2-2.8.1/Python/configure.py 2014-03-17 19:12:22.991263432 -0400
-@@ -99,6 +99,7 @@
- if hasattr(sysconfig, 'get_path'):
- # The modern API.
- self.inc_dir = sysconfig.get_path('include')
-+ self.py_conf_inc_dir = os.path.dirname(sysconfig.get_config_h_filename())
- self.module_dir = sysconfig.get_path('platlib')
- else:
- # The legacy distutils API.
-@@ -153,6 +154,7 @@
- py_config = HostPythonConfiguration()
- self.py_module_dir = py_config.module_dir
- self.py_inc_dir = py_config.inc_dir
-+ self.py_conf_inc_dir = py_config.py_conf_inc_dir
- self.py_lib_dir = py_config.lib_dir
- self.py_platform = py_config.platform
- self.py_sip_dir = os.path.join(py_config.data_dir, 'sip')
-@@ -743,6 +745,8 @@
- pro.write('INCLUDEPATH += %s\n' % target_config.qsci_inc_dir)
-
- pro.write('INCLUDEPATH += %s\n' % target_config.py_inc_dir)
-+ if target_config.py_inc_dir != target_config.py_conf_inc_dir:
-+ pro.write('INCLUDEPATH += %s\n' % target_config.py_conf_inc_dir)
- if target_config.py_inc_dir != target_config.sip_inc_dir:
- pro.write('INCLUDEPATH += %s\n' % target_config.sip_inc_dir)
-
Added: packages/qscintilla2/trunk/debian/patches/pyconfigure_target_config_fix.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/pyconfigure_target_config_fix.patch (rev 0)
+++ packages/qscintilla2/trunk/debian/patches/pyconfigure_target_config_fix.patch 2014-06-10 03:52:12 UTC (rev 29280)
@@ -0,0 +1,17 @@
+Index: qscintilla2-2.8.2+dfsg/Python/configure.py
+===================================================================
+--- qscintilla2-2.8.2+dfsg.orig/Python/configure.py 2014-06-09 23:00:46.691298305 -0400
++++ qscintilla2-2.8.2+dfsg/Python/configure.py 2014-06-09 23:24:53.000000000 -0400
+@@ -285,10 +285,10 @@
+ qmake = dict(CONFIG='qscintilla2')
+
+ if target_configuration.qsci_inc_dir is not None:
+- qmake['INCLUDEPATH'] = quote(target_config.qsci_inc_dir)
++ qmake['INCLUDEPATH'] = quote(target_configuration.qsci_inc_dir)
+
+ if target_configuration.qsci_lib_dir is not None:
+- qmake['LIBS'] = '-L%s' % quote(target_config.qsci_inc_dir)
++ qmake['LIBS'] = '-L%s' % quote(target_configuration.qsci_inc_dir)
+
+ if target_configuration.qsci_is_dll:
+ qmake['DEFINES'] = 'QSCINTILLA_DLL'
Modified: packages/qscintilla2/trunk/debian/patches/qt5_includes.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/qt5_includes.patch 2014-06-09 19:26:30 UTC (rev 29279)
+++ packages/qscintilla2/trunk/debian/patches/qt5_includes.patch 2014-06-10 03:52:12 UTC (rev 29280)
@@ -1,17 +1,17 @@
When building for Qt5, the python extension needs QtWidgets and QtPrintSupport
because things moved there from QtGui in Qt4. Sent upstream.
-Index: qscintilla2-2.8.1/Python/configure.py
+Index: qscintilla2-2.8.2+dfsg/Python/configure.py
===================================================================
---- qscintilla2-2.8.1.orig/Python/configure.py 2014-03-25 03:27:52.000000000 +0000
-+++ qscintilla2-2.8.1/Python/configure.py 2014-03-28 04:46:49.862018963 +0000
-@@ -741,6 +741,9 @@
- if target_config.qscintilla_is_dll:
- pro.write('DEFINES += QSCINTILLA_DLL\n')
+--- qscintilla2-2.8.2+dfsg.orig/Python/configure.py 2014-06-09 22:56:25.711306016 -0400
++++ qscintilla2-2.8.2+dfsg/Python/configure.py 2014-06-09 23:25:54.000000000 -0400
+@@ -1321,6 +1321,9 @@
+ if includepath:
+ pro.write('INCLUDEPATH += %s\n' % includepath)
-+ if opts.pyqt_package == 'PyQt5':
-+ pro.write('INCLUDEPATH += %s\n' % '/usr/include/qt5/QtWidgets /usr/include/qt5/QtPrintSupport')
++ if target_config.pyqt_package == 'PyQt5':
++ pro.write('INCLUDEPATH += %s\n' % (target_config.qt_inc_dir + '/QtWidgets ' + target_config.qt_inc_dir + '/QtPrintSupport'))
+
- if target_config.qsci_inc_dir is not None:
- pro.write('INCLUDEPATH += %s\n' % target_config.qsci_inc_dir)
-
+ # Make sure the SIP include directory is searched before the Python include
+ # directory if they are different.
+ pro.write('INCLUDEPATH += %s\n' % quote(target_config.sip_inc_dir))
Modified: packages/qscintilla2/trunk/debian/patches/qt5_libname.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/qt5_libname.patch 2014-06-09 19:26:30 UTC (rev 29279)
+++ packages/qscintilla2/trunk/debian/patches/qt5_libname.patch 2014-06-10 03:52:12 UTC (rev 29280)
@@ -1,22 +1,22 @@
Rename library when built with Qt5 for co-installability. Discussed with
upstream, but not reviewed as they aren't particularly interested in it.
-Index: qscintilla2-2.8.1/Qt4Qt5/qscintilla.pro
+Index: qscintilla2-2.8.2+dfsg/Qt4Qt5/qscintilla.pro
===================================================================
---- qscintilla2-2.8.1.orig/Qt4Qt5/qscintilla.pro 2014-03-25 03:47:55.314827158 +0000
-+++ qscintilla2-2.8.1/Qt4Qt5/qscintilla.pro 2014-03-29 03:43:03.744577181 +0000
-@@ -36,6 +36,7 @@
+--- 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
+@@ -41,6 +41,7 @@
+
greaterThan(QT_MAJOR_VERSION, 4) {
- QT += widgets
- QT += printsupport
-+ TARGET = qt5scintilla2
+ QT += widgets printsupport
++ TARGET = qt5scintilla2
greaterThan(QT_MINOR_VERSION, 1) {
macx:QT += macextras
-Index: qscintilla2-2.8.1/Qt4Qt5/features/qscintilla2.prf
+Index: qscintilla2-2.8.2+dfsg/Qt4Qt5/features/qscintilla2.prf
===================================================================
---- qscintilla2-2.8.1.orig/Qt4Qt5/features/qscintilla2.prf 2014-03-14 14:12:58.000000000 +0000
-+++ qscintilla2-2.8.1/Qt4Qt5/features/qscintilla2.prf 2014-03-29 15:43:20.429152445 +0000
-@@ -17,5 +17,10 @@
+--- 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 @@
}
}
} else {
@@ -27,31 +27,3 @@
LIBS += -lqscintilla2
+ }
}
-Index: qscintilla2-2.8.1/Python/configure.py
-===================================================================
---- qscintilla2-2.8.1.orig/Python/configure.py 2014-03-29 03:46:27.368573880 +0000
-+++ qscintilla2-2.8.1/Python/configure.py 2014-03-29 15:56:56.917139208 +0000
-@@ -676,7 +676,10 @@
- pro.write('TEMPLATE = lib\n')
- pro.write('CONFIG += %s\n' % ('debug' if opts.debug else 'release'))
- pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin'))
-- pro.write('CONFIG += qscintilla2\n')
-+ if opts.pyqt_package == 'PyQt5':
-+ pro.write('CONFIG += qst5cintilla2\n')
-+ else:
-+ pro.write('CONFIG += qscintilla2\n')
-
- if not opts.static:
- # I don't really understand why the linker needs to find the Python
-@@ -757,7 +760,10 @@
- if lib_dir is None:
- lib_dir = target_config.qsci_default_lib_dir
- else:
-- pro.write('LIBS += -L%s -lqscintilla2\n' % lib_dir)
-+ if opts.pyqt_package == 'PyQt5':
-+ pro.write('LIBS += -L%s -lqt5scintilla2\n' % lib_dir)
-+ else:
-+ pro.write('LIBS += -L%s -lqscintilla2\n' % lib_dir)
-
- if not opts.static:
- pro.write('''
Modified: packages/qscintilla2/trunk/debian/patches/remove-logo-privacy-issue.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/remove-logo-privacy-issue.diff 2014-06-09 19:26:30 UTC (rev 29279)
+++ packages/qscintilla2/trunk/debian/patches/remove-logo-privacy-issue.diff 2014-06-10 03:52:12 UTC (rev 29280)
@@ -2,10 +2,10 @@
are accessed to resolve privacy-breach-logo lintian error. Not forwarded, not
needed.
-Index: qscintilla2-2.8.1/doc/Scintilla/index.html
+Index: qscintilla2-2.8.2+dfsg/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-05-07 00:20:32.370947393 -0400
+--- qscintilla2-2.8.2+dfsg.orig/doc/Scintilla/index.html 2014-06-09 15:14:43.944424044 -0400
++++ qscintilla2-2.8.2+dfsg/doc/Scintilla/index.html 2014-06-09 15:16:03.672421688 -0400
@@ -63,13 +63,6 @@
</td>
</tr>
@@ -20,7 +20,15 @@
<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 @@
+@@ -167,7 +160,6 @@
+ <!--
+ if (IsRemote()) {
+ document.write('<a href="http://sourceforge.net/projects/scintilla">');
+- document.write('<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> ');
+ } else {
+ document.write('<a href="http://sourceforge.net/projects/scintilla">SourceForge<\/a>');
+ }
+@@ -175,7 +167,7 @@
</script>
<noscript>
<a href="http://sourceforge.net/projects/scintilla">
Modified: packages/qscintilla2/trunk/debian/patches/series
===================================================================
--- packages/qscintilla2/trunk/debian/patches/series 2014-06-09 19:26:30 UTC (rev 29279)
+++ packages/qscintilla2/trunk/debian/patches/series 2014-06-10 03:52:12 UTC (rev 29280)
@@ -1,6 +1,6 @@
configure.py-objdir-support.diff
fix-lib-install-dir.diff
-py_conf_inc_dir.diff
remove-logo-privacy-issue.diff
qt5_includes.patch
qt5_libname.patch
+pyconfigure_target_config_fix.patch
Modified: packages/qscintilla2/trunk/debian/rules
===================================================================
--- packages/qscintilla2/trunk/debian/rules 2014-06-09 19:26:30 UTC (rev 29279)
+++ packages/qscintilla2/trunk/debian/rules 2014-06-10 03:52:12 UTC (rev 29280)
@@ -129,11 +129,11 @@
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/include/$(DEB_HOST_MULTIARCH)/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/
+ mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci/*.h $(CURDIR)/debian/libqt5scintilla2-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci/
rm -rf $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/include
mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/lib/*.so $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib
mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/mkspecs/features/* $(CURDIR)/debian/libqt5scintilla2-dev/usr/share/qt5/mkspecs/features
Modified: packages/qscintilla2/trunk/debian/watch
===================================================================
--- packages/qscintilla2/trunk/debian/watch 2014-06-09 19:26:30 UTC (rev 29279)
+++ packages/qscintilla2/trunk/debian/watch 2014-06-10 03:52:12 UTC (rev 29280)
@@ -1,5 +1,3 @@
version=3
-opts=uversionmangle=s/(.*\db?)([\._\-]snapshot)/0.0.$1~$2/ \
-http://www.riverbankcomputing.co.uk/software/qscintilla/download \
-(?:.*/|.*=|)QScintilla-gpl[\-\._](\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)(?:/\S*)?
-# Bart Martens <bartm at debian.org> Fri, 17 May 2013 04:03:41 +0000
+opts=dversionmangle=s/\+dfsg// \
+http://sf.net/pyqt/QScintilla-gpl-(.*)\.tar\.gz debian uupdate
More information about the Python-modules-commits
mailing list