[Python-modules-commits] [qscintilla2] 01/02: Convert from git-dpm to patches unapplied format
Scott Kitterman
kitterman at moszumanska.debian.org
Tue Jun 27 22:23:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
kitterman pushed a commit to branch debian/master
in repository qscintilla2.
commit 3156381e84af027ebcd507aed3f0c3ed35ba0a9c
Author: Scott Kitterman <scott at kitterman.com>
Date: Tue Jun 27 18:21:06 2017 -0400
Convert from git-dpm to patches unapplied format
---
Python/configure.py | 20 +++-----------------
Qt4Qt5/features/qscintilla2.prf | 11 +----------
Qt4Qt5/qscintilla.pro | 5 ++---
debian/.git-dpm | 11 -----------
debian/gbp.conf | 2 ++
designer-Qt4Qt5/designer.pro | 5 +----
doc/Scintilla/index.html | 10 +++++++++-
7 files changed, 18 insertions(+), 46 deletions(-)
diff --git a/Python/configure.py b/Python/configure.py
index c0784ac..41a0179 100644
--- a/Python/configure.py
+++ b/Python/configure.py
@@ -37,7 +37,6 @@ import sys
# You shouldn't need to modify anything above this line.
###############################################################################
-src_dir = os.path.dirname(os.path.abspath(__file__))
# This must be kept in sync with Python/configure-old.py, qscintilla.pro,
# example-Qt4Qt5/application.pro and designer-Qt4Qt5/designer.pro.
@@ -215,8 +214,6 @@ class ModuleConfiguration(object):
"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.
-
lib_dir = target_configuration.qsci_lib_dir
if lib_dir is None:
lib_dir = target_configuration.qt_lib_dir
@@ -271,12 +268,7 @@ class ModuleConfiguration(object):
the target configuration.
"""
- 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'
+ return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
def get_sip_installs(self, target_configuration):
""" Return a tuple of the installation directory of the module's .sip
@@ -290,7 +282,7 @@ class ModuleConfiguration(object):
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
@@ -1456,9 +1448,6 @@ INSTALLS += sip
if includepath:
pro.write('INCLUDEPATH += %s\n' % includepath)
- if target_config.pyqt_package == 'PyQt5':
- pro.write('INCLUDEPATH += %s\n' % (target_config.qt_inc_dir + '/QtWidgets ' + target_config.qt_inc_dir + '/QtPrintSupport'))
-
# 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))
@@ -1467,10 +1456,7 @@ INSTALLS += sip
libs = qmake_config.get('LIBS')
if libs:
- if target_config.pyqt_package == 'PyQt5':
- pro.write('LIBS += %s -lqt5scintilla2\n' % libs)
- else:
- pro.write('LIBS += %s -lqscintilla2\n' % libs)
+ pro.write('LIBS += %s\n' % libs)
if not opts.static:
pro.write('''
diff --git a/Qt4Qt5/features/qscintilla2.prf b/Qt4Qt5/features/qscintilla2.prf
index 5be1ed2..1b12cdf 100644
--- a/Qt4Qt5/features/qscintilla2.prf
+++ b/Qt4Qt5/features/qscintilla2.prf
@@ -19,18 +19,9 @@ CONFIG(debug, debug|release) {
win32: {
LIBS += -lqscintilla2d
} else {
- greaterThan(QT_MAJOR_VERSION, 4) {
- LIBS += -lqt5scintilla2
- } else {
- LIBS += -lqscintilla2
- }
+ LIBS += -lqscintilla2
}
}
} else {
- greaterThan(QT_MAJOR_VERSION, 4) {
- LIBS += -lqt5scintilla2
- }
- else {
LIBS += -lqscintilla2
- }
}
diff --git a/Qt4Qt5/qscintilla.pro b/Qt4Qt5/qscintilla.pro
index 1e435f5..b243c73 100644
--- a/Qt4Qt5/qscintilla.pro
+++ b/Qt4Qt5/qscintilla.pro
@@ -24,7 +24,7 @@
TEMPLATE = lib
TARGET = qscintilla2
-CONFIG += qt warn_off release thread exceptions debug
+CONFIG += qt warn_off release thread exceptions hide_symbols
INCLUDEPATH += . ../include ../lexlib ../src
!CONFIG(staticlib) {
@@ -34,7 +34,6 @@ DEFINES += SCINTILLA_QT SCI_LEXER
greaterThan(QT_MAJOR_VERSION, 4) {
QT += widgets printsupport
- TARGET = qt5scintilla2
greaterThan(QT_MINOR_VERSION, 1) {
macx:QT += macextras
@@ -48,7 +47,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
# Scintilla namespace rather than pollute the global namespace.
#DEFINES += SCI_NAMESPACE
-target.path = /usr/lib
+target.path = $$[QT_INSTALL_LIBS]
INSTALLS += target
header.path = $$[QT_INSTALL_HEADERS]
diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 0076e8f..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-3e9d68332b0ddaad9ba0f864575e2b75b0608cc6
-3e9d68332b0ddaad9ba0f864575e2b75b0608cc6
-be4dc287741d236fde2abbf7797b6e89032e9eff
-be4dc287741d236fde2abbf7797b6e89032e9eff
-qscintilla2_2.9.3+dfsg.orig.tar.gz
-add3bd2dce924c00580f587070b780fd67484719
-2548673
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff --git a/designer-Qt4Qt5/designer.pro b/designer-Qt4Qt5/designer.pro
index ef0125d..bd4b084 100644
--- a/designer-Qt4Qt5/designer.pro
+++ b/designer-Qt4Qt5/designer.pro
@@ -4,18 +4,15 @@
TEMPLATE = lib
TARGET = qscintillaplugin
-CONFIG += release plugin qscintilla2 debug
+CONFIG += release plugin qscintilla2
greaterThan(QT_MAJOR_VERSION, 4) {
QT += designer
# Work around QTBUG-39300.
CONFIG -= android_install
- TARGET = qt5scintillaplugin
- LIBS += -lqt5scintilla2
} else {
CONFIG += designer
- LIBS += -lqscintilla2
}
macx {
diff --git a/doc/Scintilla/index.html b/doc/Scintilla/index.html
index 94c5233..f1010a8 100644
--- a/doc/Scintilla/index.html
+++ b/doc/Scintilla/index.html
@@ -63,6 +63,13 @@
</td>
</tr>
</table>
+ <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+ <tr>
+ <td width="100%" style="background: url(http://www.scintilla.org/SciBreak.jpg) no-repeat;height:150px;">
+
+ </td>
+ </tr>
+ </table>
<ul id="versionlist">
<li>Version 3.5.4 improves indicators to be able to change appearance on mouse-over and to use a wide variety of colours together.</li>
<li>Version 3.5.3 removes support for Windows 95, 98, and ME.</li>
@@ -160,6 +167,7 @@ hosted on
<!--
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>');
}
@@ -167,7 +175,7 @@ if (IsRemote()) {
</script>
<noscript>
<a href="http://sourceforge.net/projects/scintilla">
-Get Scintilla at SourceForge.net. Fast, secure and Free Open Source software downloads</a>
+<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>
</noscript>
</body>
</html>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/qscintilla2.git
More information about the Python-modules-commits
mailing list