[Python-modules-commits] [qscintilla2] 11/14: change version to 2.9.1+dfsg-1 (UNRELEASED) New upstream release (Closes: #803142)
Scott Kitterman
kitterman at moszumanska.debian.org
Thu Oct 29 17:57:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
kitterman pushed a commit to branch master
in repository qscintilla2.
commit 38b6dbd53fa651479738d3db9fbe8405f2120f59
Merge: 4be61c4 5ab094d
Author: Scott Kitterman <scott at kitterman.com>
Date: Thu Oct 29 13:09:00 2015 -0400
change version to 2.9.1+dfsg-1 (UNRELEASED)
New upstream release (Closes: #803142)
ChangeLog | 82 +-
NEWS | 4 +
Python/configure-old.py | 6 +-
Python/configure.py | 29 +-
Python/sip/qsciabstractapis.sip | 2 +-
Python/sip/qsciapis.sip | 2 +-
Qt4Qt5/Qsci/qsciglobal.h | 4 +-
Qt4Qt5/qscintilla.pro | 38 +-
Qt4Qt5/qsciscintilla.cpp | 14 +-
debian/.git-dpm | 6 +-
debian/changelog | 6 +
debian/patches/build_debug_libs.patch | 6 +-
debian/patches/configure.py-objdir-support.diff | 4 +-
debian/patches/fix-lib-install-dir.diff | 14 +-
debian/patches/qsci_link.patch | 4 +-
debian/patches/qt5_includes.patch | 4 +-
debian/patches/qt5_libname.patch | 6 +-
debian/patches/remove-logo-privacy-issue.diff | 2 +-
debian/patches/sip_install_loc.patch | 4 +-
designer-Qt4Qt5/qscintillaplugin.h | 2 +-
doc/html-Qt4Qt5/annotated.html | 4 +-
doc/html-Qt4Qt5/classQsciAPIs-members.html | 4 +-
doc/html-Qt4Qt5/classQsciAPIs.html | 4 +-
doc/html-Qt4Qt5/classQsciAbstractAPIs-members.html | 4 +-
doc/html-Qt4Qt5/classQsciAbstractAPIs.html | 4 +-
doc/html-Qt4Qt5/classQsciCommand-members.html | 4 +-
doc/html-Qt4Qt5/classQsciCommand.html | 4 +-
doc/html-Qt4Qt5/classQsciCommandSet-members.html | 4 +-
doc/html-Qt4Qt5/classQsciCommandSet.html | 4 +-
doc/html-Qt4Qt5/classQsciDocument-members.html | 4 +-
doc/html-Qt4Qt5/classQsciDocument.html | 4 +-
doc/html-Qt4Qt5/classQsciLexer-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexer.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerAVS-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerAVS.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerBash-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerBash.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerBatch-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerBatch.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCMake-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCMake.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCPP-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCPP.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCSS-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCSS.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCSharp-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCSharp.html | 4 +-
.../classQsciLexerCoffeeScript-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCoffeeScript.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCustom-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCustom.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerD-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerD.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerDiff-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerDiff.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerFortran-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerFortran.html | 4 +-
.../classQsciLexerFortran77-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerFortran77.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerHTML-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerHTML.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerIDL-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerIDL.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerJava-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerJava.html | 4 +-
.../classQsciLexerJavaScript-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerJavaScript.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerLua-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerLua.html | 4 +-
.../classQsciLexerMakefile-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerMakefile.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerMatlab-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerMatlab.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerOctave-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerOctave.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPO-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPO.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPOV-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPOV.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPascal-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPascal.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPerl-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPerl.html | 4 +-
.../classQsciLexerPostScript-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPostScript.html | 4 +-
.../classQsciLexerProperties-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerProperties.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPython-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPython.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerRuby-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerRuby.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerSQL-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerSQL.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerSpice-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerSpice.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerTCL-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerTCL.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerTeX-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerTeX.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerVHDL-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerVHDL.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerVerilog-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerVerilog.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerXML-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerXML.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerYAML-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerYAML.html | 4 +-
doc/html-Qt4Qt5/classQsciMacro-members.html | 4 +-
doc/html-Qt4Qt5/classQsciMacro.html | 4 +-
doc/html-Qt4Qt5/classQsciPrinter-members.html | 4 +-
doc/html-Qt4Qt5/classQsciPrinter.html | 4 +-
doc/html-Qt4Qt5/classQsciScintilla-members.html | 4 +-
doc/html-Qt4Qt5/classQsciScintilla.html | 4 +-
.../classQsciScintillaBase-members.html | 4 +-
doc/html-Qt4Qt5/classQsciScintillaBase.html | 4 +-
doc/html-Qt4Qt5/classQsciStyle-members.html | 4 +-
doc/html-Qt4Qt5/classQsciStyle.html | 4 +-
doc/html-Qt4Qt5/classQsciStyledText-members.html | 4 +-
doc/html-Qt4Qt5/classQsciStyledText.html | 4 +-
doc/html-Qt4Qt5/classes.html | 4 +-
.../dir_7748dc2bc19d24806c9f0ac63a9f96c8.html | 4 +-
.../dir_a8871a339b4996dff2a2bca902b97660.html | 4 +-
doc/html-Qt4Qt5/dynsections.js | 97 -
doc/html-Qt4Qt5/functions.html | 4 +-
doc/html-Qt4Qt5/functions_b.html | 4 +-
doc/html-Qt4Qt5/functions_c.html | 4 +-
doc/html-Qt4Qt5/functions_d.html | 4 +-
doc/html-Qt4Qt5/functions_e.html | 4 +-
doc/html-Qt4Qt5/functions_enum.html | 4 +-
doc/html-Qt4Qt5/functions_eval.html | 4 +-
doc/html-Qt4Qt5/functions_eval_b.html | 4 +-
doc/html-Qt4Qt5/functions_eval_c.html | 4 +-
doc/html-Qt4Qt5/functions_eval_d.html | 4 +-
doc/html-Qt4Qt5/functions_eval_e.html | 4 +-
doc/html-Qt4Qt5/functions_eval_f.html | 4 +-
doc/html-Qt4Qt5/functions_eval_g.html | 4 +-
doc/html-Qt4Qt5/functions_eval_h.html | 4 +-
doc/html-Qt4Qt5/functions_eval_i.html | 4 +-
doc/html-Qt4Qt5/functions_eval_j.html | 4 +-
doc/html-Qt4Qt5/functions_eval_k.html | 4 +-
doc/html-Qt4Qt5/functions_eval_l.html | 4 +-
doc/html-Qt4Qt5/functions_eval_m.html | 4 +-
doc/html-Qt4Qt5/functions_eval_n.html | 4 +-
doc/html-Qt4Qt5/functions_eval_o.html | 4 +-
doc/html-Qt4Qt5/functions_eval_p.html | 4 +-
doc/html-Qt4Qt5/functions_eval_q.html | 4 +-
doc/html-Qt4Qt5/functions_eval_r.html | 4 +-
doc/html-Qt4Qt5/functions_eval_s.html | 4 +-
doc/html-Qt4Qt5/functions_eval_t.html | 4 +-
doc/html-Qt4Qt5/functions_eval_u.html | 4 +-
doc/html-Qt4Qt5/functions_eval_v.html | 4 +-
doc/html-Qt4Qt5/functions_eval_w.html | 4 +-
doc/html-Qt4Qt5/functions_eval_x.html | 4 +-
doc/html-Qt4Qt5/functions_eval_z.html | 4 +-
doc/html-Qt4Qt5/functions_f.html | 4 +-
doc/html-Qt4Qt5/functions_func.html | 4 +-
doc/html-Qt4Qt5/functions_func_b.html | 4 +-
doc/html-Qt4Qt5/functions_func_c.html | 4 +-
doc/html-Qt4Qt5/functions_func_d.html | 4 +-
doc/html-Qt4Qt5/functions_func_e.html | 4 +-
doc/html-Qt4Qt5/functions_func_f.html | 4 +-
doc/html-Qt4Qt5/functions_func_g.html | 4 +-
doc/html-Qt4Qt5/functions_func_h.html | 4 +-
doc/html-Qt4Qt5/functions_func_i.html | 4 +-
doc/html-Qt4Qt5/functions_func_k.html | 4 +-
doc/html-Qt4Qt5/functions_func_l.html | 4 +-
doc/html-Qt4Qt5/functions_func_m.html | 4 +-
doc/html-Qt4Qt5/functions_func_o.html | 4 +-
doc/html-Qt4Qt5/functions_func_p.html | 4 +-
doc/html-Qt4Qt5/functions_func_q.html | 4 +-
doc/html-Qt4Qt5/functions_func_r.html | 4 +-
doc/html-Qt4Qt5/functions_func_s.html | 4 +-
doc/html-Qt4Qt5/functions_func_t.html | 4 +-
doc/html-Qt4Qt5/functions_func_u.html | 4 +-
doc/html-Qt4Qt5/functions_func_v.html | 4 +-
doc/html-Qt4Qt5/functions_func_w.html | 4 +-
doc/html-Qt4Qt5/functions_func_z.html | 4 +-
doc/html-Qt4Qt5/functions_func_~.html | 4 +-
doc/html-Qt4Qt5/functions_g.html | 4 +-
doc/html-Qt4Qt5/functions_h.html | 4 +-
doc/html-Qt4Qt5/functions_i.html | 4 +-
doc/html-Qt4Qt5/functions_j.html | 4 +-
doc/html-Qt4Qt5/functions_k.html | 4 +-
doc/html-Qt4Qt5/functions_l.html | 4 +-
doc/html-Qt4Qt5/functions_m.html | 4 +-
doc/html-Qt4Qt5/functions_n.html | 4 +-
doc/html-Qt4Qt5/functions_o.html | 4 +-
doc/html-Qt4Qt5/functions_p.html | 4 +-
doc/html-Qt4Qt5/functions_q.html | 4 +-
doc/html-Qt4Qt5/functions_r.html | 4 +-
doc/html-Qt4Qt5/functions_s.html | 4 +-
doc/html-Qt4Qt5/functions_t.html | 4 +-
doc/html-Qt4Qt5/functions_u.html | 4 +-
doc/html-Qt4Qt5/functions_v.html | 4 +-
doc/html-Qt4Qt5/functions_w.html | 4 +-
doc/html-Qt4Qt5/functions_x.html | 4 +-
doc/html-Qt4Qt5/functions_z.html | 4 +-
doc/html-Qt4Qt5/functions_~.html | 4 +-
doc/html-Qt4Qt5/hierarchy.html | 4 +-
doc/html-Qt4Qt5/index.html | 4 +-
doc/qscintilla-Qt4Qt5.dxy | 2 +-
qsci/api/python/Python-3.5.api | 9717 ++++++++++++++++++++
202 files changed, 10235 insertions(+), 536 deletions(-)
diff --cc debian/.git-dpm
index 381867c,0000000..e0ed3bf
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- da013c51600edcf64fd0f4ce680aff28eb484a6f
- da013c51600edcf64fd0f4ce680aff28eb484a6f
- 80805bdddece9fe60ea3426cf3b7578d2eaf83ac
++5ab094dce050606e85a04947589916b811eaa779
++5ab094dce050606e85a04947589916b811eaa779
++6a58580f3e17567b23ed0e6699ffcf68ca3881d3
+6a58580f3e17567b23ed0e6699ffcf68ca3881d3
+qscintilla2_2.9.1+dfsg.orig.tar.gz
+1979c4ee99cfb9125db8841409d1592968ea312a
+2548780
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 04f6e60,0000000..82e5b72
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,604 -1,0 +1,610 @@@
++qscintilla2 (2.9.1+dfsg-1) UNRELEASED; urgency=medium
++
++ * New upstream release (Closes: #803142)
++
++ -- Scott Kitterman <scott at kitterman.com> Thu, 29 Oct 2015 13:09:01 -0400
++
+qscintilla2 (2.9+dfsg-9+alpha) unreleased; urgency=medium
+
+ * Update symbols files for Alpha.
+
+ -- Michael Cree <mcree at orcon.net.nz> Wed, 30 Sep 2015 21:12:01 +1300
+
+qscintilla2 (2.9+dfsg-9) unstable; urgency=medium
+
+ * Update symbols files from buildlogs
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 28 Sep 2015 23:09:41 -0400
+
+qscintilla2 (2.9+dfsg-8) unstable; urgency=medium
+
+ * Upload to unstable
+ * Update libqt5scintilla2 symbols file for hurd-i386 from build-logs
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 16 Aug 2015 10:42:31 -0400
+
+qscintilla2 (2.9+dfsg-7) experimental; urgency=medium
+
+ * Update symbols files from build logs
+ * Revert DPKG_GENSYMBOLS_CHECK_LEVEL=0
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 14 Aug 2015 00:24:13 -0400
+
+qscintilla2 (2.9+dfsg-6) experimental; urgency=medium
+
+ * Update for g++5 transition (See #791257)
+ - Bump library packages to libq{t5}scintilla2-12v5 for transition
+ - Update debian/control, including conflicts/replaces for previous libs
+ * Temporarily export DPKG_GENSYMBOLS_CHECK_LEVEL=0 to collect symbols file
+ changes for both libraries
+ * cp instead of mv QScintilla2.api in debian/rules so build can be re-run
+ after a failure for testing
+ * Drop -dbg tests from autopkgtests for now since that part of the test
+ fails and such falures will mask failures due to sip issues, which is the
+ main value of the test
+
+ -- Scott Kitterman <scott at kitterman.com> Tue, 11 Aug 2015 23:02:34 -0400
+
+qscintilla2 (2.9+dfsg-5) unstable; urgency=medium
+
+ * Update symbols files from buildd build logs and try again
+ (Closes: #790420)
+ * Update libqt5scintilla2-l10n Suggests to libqt5scintilla2-12
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 29 Jun 2015 10:39:03 -0400
+
+qscintilla2 (2.9+dfsg-4) unstable; urgency=medium
+
+ * Upload to unstable
+ * Re-add symbols files
+ * Correct exporting path to use pkg-kde-tools symbolshelper
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 29 Jun 2015 01:32:46 -0400
+
+qscintilla2 (2.9+dfsg-3) experimental; urgency=medium
+
+ * Correct library dependencies for libqt5scintilla2-designer,
+ python-qscintilla2, and python3-pyqt4.qsci (Closes: #790016)
+ * Start with empty symbols files to have experimental build logs for all
+ archs
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 22 Jun 2015 00:07:09 -0400
+
+qscintilla2 (2.9+dfsg-2) experimental; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Add an autopkgtest to check importability of Python modules.
+
+ [ Scott Kitterman ]
+ * Add BSD license information for Python/configure.py to debian/copyright
+ * Add dh-python to build-depends
+ * Generate correctly versioned depends for python extensions
+ (Closes: #784091)
+ - Add symbols files for libqscintilla2 and libqt5scintilla2
+ - Add pkg-kde-tools to build-depends
+ - Export path for symbolshelper in debian/rules
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 21 Jun 2015 14:29:13 -0400
+
+qscintilla2 (2.9+dfsg-1) experimental; urgency=medium
+
+ * New upstream release
+ - Repack tarball to remove sourcelss javascript files (doc/html-Qt4Qt5/
+ jquery.js)
+ - Update debian/patches/configure.py-objdir-support.diff and debian/
+ patches/remove-logo-privacy-issue.diff to match upstream changes
+ - Refresh other patches
+ - Update debian/copyright - Now GPLv3 only vice previous GPLv2/3
+ * Bump libqt5scintilla2-12 and libqscintilla2-12 package names to match new
+ soname
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 15 Jun 2015 23:04:39 -0400
+
+qscintilla2 (2.8.4+dfsg-1) unstable; urgency=medium
+
+ * New upstream release
+ - Repack tarball to remove sourcelss javascript files (doc/html-Qt4Qt5/
+ jquery.js and doc/html-Qt3/jquery.js)
+ - Update debian/patches/qt5_libname.patch to match upstream changes in the
+ same area
+ - Refresh patches
+ - Temporarily bump pyqt5 build-dep version to 5.3.2+dfsg-2~ to make sure
+ it builds against the current pyqt5 on all archs
+ * Bump standards version to 3.9.6 without further change
+ * Remove obsolete debian/README.Debian
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 21 Sep 2014 22:09:22 -0400
+
+qscintilla2 (2.8.3+dfsg-3) unstable; urgency=medium
+
+ * Add support for Qt designer plugin with Qt5
+ - Add new binary, libqt5scintilla2-designer, in debian/control
+ - Add qttools5-dev to build-depends
+ - Update debian/rules
+ - Merge debian/patches/designer_link_fix.patch into debian/patches/
+ qt5_libname.patch and update for Qt5 name for designer plugin
+ * Add -dbg packages (Closes: #618985)
+ - Add -dbg packages to debian/control
+ - Add python-qt4-dbg, python3-pyqt4-dbg, python3-pyqt5-dbg, python-all-dbg
+ and python3-all-dbg to build-depends
+ - Rework debian/rules based on how python-qt4 does it to actually build
+ and install the dbg variants
+ - Add debian/patches/build_debug_libs.patch to enable debug build in lib
+ and designer plugin
+ - Adjust configure to build python bindings with debug enabled
+ * Add dev packages (pyqt5.qsci-dev and pyqt4.qsci-dev) for sip files to make
+ it possible to provide sip bindings to classes derived from Qscintilla
+ classes (Closes: #755491)
+ - Add debian/pyqt5.qsci-dev.install and pyqt4.qsci-dev.install
+ - Add debian/patches/sip_install_loc.patch to adjust sip file location in
+ Python/QSci.pro for Debian python build locations (Thanks to Jürgen E.
+ Fischer)
+ * Additional adjustments to debian/rules to prevent errors from being
+ ignored (thanks to Jürgen E. Fischer)
+ * Make Qt5 arch any since pyqt5 now builds on hurd
+ * Update debian/copyright
+ * Wrap and sort
+ * Drop obsolete Breaks/Replaces
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 27 Jul 2014 12:47:35 -0400
+
+qscintilla2 (2.8.3+dfsg-2) unstable; urgency=medium
+
+ * Patch designer-Qt4Qt5/designer.pro to explicitly link with the Qt4 version
+ of the qscintilla2 library to fix runtime inability to find qscintilla2
+ symbols (Closes: 753581) (really)
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 11 Jul 2014 22:34:22 -0400
+
+qscintilla2 (2.8.3+dfsg-1) unstable; urgency=medium
+
+ * New upstream release
+ - Repack tarball to remove sourcelss javascript files (doc/html-Qt4Qt5/
+ jquery.js and doc/html-Qt3/jquery.js)
+ - Rebuild should resolve #753581 (Closes: #753581)
+ - Dropped debian/patches/pyconfigure_target_config_fix.patch, resolved
+ upstream
+ - Refreshed patches
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 05 Jul 2014 10:00:28 -0400
+
+qscintilla2 (2.8.2+dfsg-3) unstable; urgency=medium
+
+ * Correct location and content of qscintilla2.prf for Qt5 build
+ (Closes: #751531)
+ - Set libqt5scintilla2 in LIBS if debug is enabled in qscintilla2.prf
+ - Change qscintilla2.prf from usr/share to usr/lib so Qt5 finds it
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 14 Jun 2014 10:37:34 -0400
+
+qscintilla2 (2.8.2+dfsg-2) unstable; urgency=medium
+
+ * Fix failure to link python* packages to the lib (Closes: #751239)
+ - Add debian/patches/qsci_link.patch so that the correct (Qt4/Qt5) is used
+ - Update debian/rules to match build system changes so that the correct
+ search path for the libs is used
+
+ -- Scott Kitterman <scott at kitterman.com> Wed, 11 Jun 2014 09:59:25 -0400
+
+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
+
+ -- Scott Kitterman <scott at kitterman.com> Wed, 07 May 2014 09:07:37 -0400
+
+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
+ http://www.scintilla.org/SciBreak.jpg when the SCintilla docs are
+ accessed in order to resolve privacy-breach-logo lintian error
+ * Add packaging for Qt5
+ - Add new binaries: libqt5scintilla2--11, libqt5scintilla2-dev,
+ libqt5scintilla2-l10n, and python3-pyqt5.qsci
+ - Add qtbase5-dev, python3-pyqt5, and pyqt5-dev to build-depend
+ - Add debian/patches/qt5_includes.patch to use correct Qt5 includes for
+ the Python bindings
+ - Add debian/patches/qt5_libname.patch to change the qscintilla2 library
+ name when built with Qt5 so the Qt4 and Qt5 versions are co-installable
+ - Update debian/rules to build both Qt4 and Qt5 versions
+ - Update package descriptions to make it clear which is for Qt4 and which
+ is for Qt5
+ * Install prf file in libqscintilla2-dev
+ * Correct symlink for jquery.js in libqscintilla2-doc
+ * Bump standards version to 3.9.5 without further change
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 29 Mar 2014 14:34:54 -0400
+
+qscintilla2 (2.8.1-1) unstable; urgency=medium
+
+ * New upstream release
+ - Update library name to libqscintilla2-11 based on upstream soname change
+ - Refresh patches
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 17 Mar 2014 19:02:44 -0400
+
+qscintilla2 (2.7.2-1) unstable; urgency=low
+
+ * New upstream release
+ - Update debian/patches/configure.py-objdir-support.diff to account for
+ the potential for both PyQt4 and PyQt5 (when packaged) builds
+ - Update debian/patches/py_conf_inc_dir.diff for upstream updates to
+ Python/configure.py
+ * Update watch file, thanks to Bart Martens
+
+ -- Scott Kitterman <scott at kitterman.com> Wed, 19 Jun 2013 02:46:07 -0400
+
+qscintilla2 (2.7.1-1) unstable; urgency=low
+
+ * Upload to unstable
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ [ Scott Kitterman ]
+ * New upstream release
+ - Refresh patches
+ - Update debian/patches/configure.py-objdir-support.diff for upstream
+ Python/configure.py changes
+ - Update debian/rules to work with new Qt4/Qt5 dirctory naming and removal
+ of Qt3 support
+ - Update debian/rules and add debian/patches/py_conf_inc_dir.diff to get
+ new configure.py script to work with Python multia-arch header locations
+ * Drop symbols file for now until it is reliable
+ * Rename libqscintilla2-translations to libqscintilla2-l10n
+ (Closes: #700641)
+ * Revert bad watch file change
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 18 May 2013 17:08:40 -0400
+
+qscintilla2 (2.7-2) experimental; urgency=low
+
+ * Update symbols files for new upstream version
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 16 Feb 2013 17:39:06 -0500
+
+qscintilla2 (2.7-1) experimental; urgency=low
+
+ [ Scott Kitterman ]
+ * New upstream release
+ - Update for new SO name (rename libqscintilla2-8 to libqscintilla2-9)
+ - Update debian/copyright
+ * Add symbols file for libqscintilla2-9
+ * Move translations for libqscintilla2 to a separate binary,
+ libqscintilla2-translations, so that the library itself is
+ co-installable with other versions
+ * Update debian/rules to use dpkg-buildflags
+ * Bump compat and debhelper version requirement to 9
+ * Bump standards version to 3.9.4 without further change
+
+ [ Matthias Klose ]
+ * Fix installation of multiple python3 extensions.
+
+ [ Bart Martens ]
+ * Updated debian/watch file
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 15 Dec 2012 00:29:31 -0500
+
+qscintilla2 (2.6.2-3) experimental; urgency=low
+
+ * Rebuild in experimental with new sip4
+
+ -- Scott Kitterman <scott at kitterman.com> Tue, 01 Oct 2012 23:29:40 -0400
+
+qscintilla2 (2.6.2-2) unstable; urgency=low
+
+ * Upload to Unstable (Closes: #681107)
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 15 Sep 2012 15:29:21 -0400
+
+qscintilla2 (2.6.2-1) experimental; urgency=low
+
+ * New upstream release
+ - Update debian rules for new directory naming Qt4/Qt4Qt5
+ - Update debian/libqscintilla2-doc.docs, libqscintilla2-doc.doc-base.api,
+ and libqscintilla2-doc.examples for new documentation and examples
+ directory names
+ - Refresh patches
+ - Update debian/copyright
+ * Add missing X-Python3-Version to specify Python 3.1 as minimum Python 3
+
+ -- Scott Kitterman <scott at kitterman.com> Tue, 10 Jul 2012 01:17:03 -0400
+
+qscintilla2 (2.6.1-5) unstable; urgency=low
+
+ * Upload to unstable for qt4-x11 multiarch transition
+
+ -- Scott Kitterman <scott at kitterman.com> Tue, 01 May 2012 21:27:32 -0400
+
+qscintilla2 (2.6.1-4) experimental; urgency=low
+
+ [ Thomas Kluyver ]
+ * Package for Python 3 (LP: #608962)
+
+ [ Scott Kitterman ]
+ * Use Python policy compliant binary name for Python 3 (python3-pyqt4.qsci)
+ * Remove pointless Build-depends and Depends versioning
+ * Fix debian/rules to build for all python3 variants, not just the default
+ * Use dh_sip3 for python3-pyqt4.qsci, not dh_sip
+ * Drop incorrect Multi-Arch: same for libqscintilla2-8
+
+ -- Scott Kitterman <scott at kitterman.com> Tue, 13 Mar 2012 22:19:28 -0400
+
+qscintilla2 (2.6.1-3) experimental; urgency=low
+
+ * Re-upload due to broken -2 attempt
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 04 Mar 2012 13:27:00 -0500
+
+qscintilla2 (2.6.1-2) experimental; urgency=low
+
+ * Update for multi-arch
+ - Fix libqscintilla2-designer.install paths for multiarch
+ - Bump version requirement for debhelper and add minumum version for
+ libqt4-dev
+ - For libqscintilla2-8, add misc:Pre-Depends and set Multi-Arch: same
+ * Set compat to 8
+ * Bump standards version to 3.9.3 without further change
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 04 Mar 2012 02:52:05 -0500
+
+qscintilla2 (2.6.1-1) unstable; urgency=low
+
+ * New upstream release
+ - Drop debian/patches/snapshot-keys.patch as it was cherrypicked from
+ upstream to start with
+ - Refresh remaining patches
+ * Add libqscintilla2-8 Breaks previous versions of the library since they
+ aren't completely co-installable
+ * Install NEWS file as upstream changelog
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 12 Feb 2012 11:01:43 -0500
+
+qscintilla2 (2.6-4) unstable; urgency=low
+
+ * Add debian/patches/snapshot-keys.patch to fix custom keyboard shortcuts
+ (Closes: #659356)
+ * Add libjs-jquery to libqscintilla2-doc depends and use symlink to its
+ jquery.js instead of the embedded minified version
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 10 Feb 2012 23:00:05 -0500
+
+qscintilla2 (2.6-3) unstable; urgency=high
+
+ * Readd libqscintilla2-5 to libqscintilla2-8 Replaces to support upgrades
+ from squeeze
+
+ -- Scott Kitterman <scott at kitterman.com> Tue, 29 Nov 2011 22:12:23 -0500
+
+qscintilla2 (2.6-2) unstable; urgency=low
+
+ * Drop symbols file for the moment due to per-arch symbol differences
+ causing FTBFS
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 19 Nov 2011 09:29:47 -0500
+
+qscintilla2 (2.6-1) unstable; urgency=low
+
+ * New upstream release with updated ABI
+ - Change libqscintilla2-6 to libqscintilla2-8 for new ABI and adjust
+ internal depends
+ - Rename libqscintilla2-6.install to libqscintilla2-8.install
+ - Adjust libqscintilla2-dev depends
+ - Updated debian/copyright
+ * Added symbols file for libqscintilla2-8 (libqscintilla2-8.symbols)
+ * Add missing build-arch/build-indep targets
+ * Remove empty /usr/share/pyshared/ directory from python-qscintilla2
+ * Fix upstream homepage
+ * Improve libqscintilla2-8 and libqscintilla2-dev short descriptions
+
+ -- Scott Kitterman <scott at kitterman.com> Wed, 16 Nov 2011 01:03:39 -0500
+
+qscintilla2 (2.5.1-1) unstable; urgency=low
+
+ * New upstream release with updated ABI (Closes: #638209)
+ - Change libqscintilla2-5 to libqscintilla2-6 for new ABI and adjust
+ internal depends
+ - Rename libqscintilla2-5.install to libqscintilla2-6.install
+ * Add DPMT Vcs-* fields
+ * Bump standards version to 3.9.2 without further change
+
+ -- Scott Kitterman <scott at kitterman.com> Thu, 18 Aug 2011 13:15:31 -0400
+
+qscintilla2 (2.4.5-1) unstable; urgency=low
+
+ [ José Manuel Santamaría Lema ]
+ * Switch to dh_python2 (Closes: #634861)
+
+ [ Scott Kitterman ]
+ * New upstream release
+ * Agreed maintainer change to DPMT
+ * Add myself to uploaders
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 01 Aug 2011 10:06:11 -0400
+
+qscintilla2 (2.4.3-2) unstable; urgency=low
+
+ * Rebuilding (Closes: #619096)
+ * Remove dpatch references from patches
+ * Remove README.source file (Closes: #618983)
+ * Bump standards version to 3.9.1
+ * Remove unneded Section: in control file
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Thu, 31 Mar 2011 08:44:12 +0200
+
+qscintilla2 (2.4.3-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/rules
+ - Changelog is not distributed any more, don't try to install
+
+ -- Torsten Marek <shlomme at debian.org> Sun, 18 Apr 2010 18:17:14 +0200
+
+qscintilla2 (2.4.2-3) unstable; urgency=low
+
+ * Fix dependencies of libqscintilla2-dev (Closes: #568217)
+
+ -- Torsten Marek <shlomme at debian.org> Wed, 03 Feb 2010 09:01:40 +0100
+
+qscintilla2 (2.4.2-2) unstable; urgency=low
+
+ * Upload to unstable. (Closes: #567220)
+ * debian/control
+ - Change priority from extra to optional (Closes: #563198)
+ - Bumped standards version to 3.8.4, no changes necessary
+ * debian/rules
+ - Make sure stripping is handled by dh_strip (Closes: #560395)
+
+ -- Torsten Marek <shlomme at debian.org> Tue, 02 Feb 2010 22:50:52 +0100
+
+qscintilla2 (2.4.2-1) experimental; urgency=low
+
+ * New upstream release
+ * Convered to source format "3.0 (quilt)"
+ * debian/control
+ - Dropped build dependency on dpatch
+ - Added ${sip:Depends} to dependencies of python-qscintilla2
+ - Fixed lintian warning for libqscintilla2-dev dependencies
+ * debian/patches/*
+ - Converted all patches to quilt
+ * debian/rules
+ - Reorder rules to make safe for parallel builds
+ - Removed dpatch handling and workarounds
+ - Added call to dh_sip
+
+ -- Torsten Marek <shlomme at debian.org> Wed, 27 Jan 2010 22:49:13 +0100
+
+qscintilla2 (2.4-5) unstable; urgency=low
+
+ [ Gudjon I. Gudjonsson ]
+ * Rebuilt (Closes: #550570)
+ * Add fields to the copyright file, Thanks to Mathieu Parent
+ (Closes: #516122)
+ * Ask debian release for binNMU (Closes: #541379)
+ * Change libqscintilla2-dev dependency to ${source:Version}
+ removes lintian error
+ * Add README.source file
+
+ [ Torsten Marek ]
+ * debian/control
+ - Added Gudjon to Uploaders
+ * debian/watch
+ - Fixed watch file to check on download page
+
+ -- Torsten Marek <shlomme at debian.org> Sat, 28 Nov 2009 15:39:15 +0100
+
+qscintilla2 (2.4-4) unstable; urgency=low
+
+ * Rebuilt against new sip
+ * debian/control
+ - Bumped standards version to 3.8.3, no changes necessary
+ - Update sip dependency to 4.9 and PyQt4 dependencies to 4.6
+
+ -- Torsten Marek <shlomme at debian.org> Wed, 14 Oct 2009 19:47:54 +0200
+
+qscintilla2 (2.4-3) unstable; urgency=low
+
+ * Upload rebuilt packages
+ * Fixes segfault on import
+
+ -- Torsten Marek <shlomme at debian.org> Sat, 20 Jun 2009 12:11:11 +0200
+
+qscintilla2 (2.4-2) unstable; urgency=low
+
+ * Upload to unstable
+ * debian/control
+ - Bump dependencies on sip to 4.8.1
+ - Depend on python-qt4 4.5.1
+
+ -- Torsten Marek <shlomme at debian.org> Thu, 18 Jun 2009 20:46:57 +0200
+
+qscintilla2 (2.4-1) experimental; urgency=low
+
+ * New upstream release
+ * Switch to python-support
+ * debian/control
+ - Updated all sip dependencies to 4.8
+ - Bumped standards version to 3.8.1, no changes necessary
+ - Updated PyQt dependencies to 4.5
+ * debian/python-qscintilla2.install
+ - Update install paths for Python 2.6 (Closes: #531847)
+
+ -- Torsten Marek <shlomme at debian.org> Tue, 09 Jun 2009 20:28:51 +0200
+
+qscintilla2 (2.3.2-1) experimental; urgency=low
+
+ * New upstream release
+ * debian/control
+ - bump build dependency to sip 4.7.9 and python-qt4 4.4.4
+ - add build dependency on python-sip4 (Closes: #453895)
+ - upstream SONAME bump, renamed library package to
+ libqscintilla2-5, replaces libqscintilla2-3 because
+ of translation files in library package
+
+ -- Torsten Marek <shlomme at debian.org> Sat, 22 Nov 2008 22:14:17 +0100
+
+qscintilla2 (2.2-4) unstable; urgency=low
+
+ * debian/control
+ - tighten build dependencies on sip 4.7.6
+
+ -- Torsten Marek <shlomme at debian.org> Thu, 12 Jun 2008 14:24:04 +0200
+
+qscintilla2 (2.2-3) unstable; urgency=low
+
+ * Rebuild with PyQt 4.4.2 and sip 4.7.6
+ * debian/control
+ - bumped python-qt4 dependencies to 4.4.2
+ - bumped standards version to 3.8.0, no changes necessary
+
+ -- Torsten Marek <shlomme at debian.org> Wed, 11 Jun 2008 23:34:44 +0200
+
+qscintilla2 (2.2-2) unstable; urgency=low
+
+ * New upload to trigger a rebuild on all architectures.
+ * debian/control
+ - Build-depend on newest PyQt4 revision 4.3.3-3
+ - python-qscintilla2 depends on newest PyQt4 revision
+
+ -- Torsten Marek <shlomme at debian.org> Fri, 21 Mar 2008 21:55:13 +0100
+
+qscintilla2 (2.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated Standards version to 3.7.3, no changes necessary.
+ * Fixed regex in debian/watch file.
+
+ -- Torsten Marek <shlomme at debian.org> Fri, 21 Mar 2008 21:38:44 +0100
+
+qscintilla2 (2.1+snapshot20070923-1) unstable; urgency=low
+
+ * Initial upload (Closes: #435151)
+
+ -- Torsten Marek <shlomme at debian.org> Sun, 30 Sep 2007 14:23:18 +0200
diff --cc debian/patches/build_debug_libs.patch
index 01ff9b0,0000000..775c483
mode 100644,000000..100644
--- a/debian/patches/build_debug_libs.patch
+++ b/debian/patches/build_debug_libs.patch
@@@ -1,38 -1,0 +1,38 @@@
- From da013c51600edcf64fd0f4ce680aff28eb484a6f Mon Sep 17 00:00:00 2001
++From 5ab094dce050606e85a04947589916b811eaa779 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 13:39:22 -0700
+Subject: build_debug_libs
+
+Build libs and designer plugin with debug for -dbg packages
+Patch-Name: build_debug_libs.patch
+---
+ Qt4Qt5/qscintilla.pro | 2 +-
+ designer-Qt4Qt5/designer.pro | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Qt4Qt5/qscintilla.pro b/Qt4Qt5/qscintilla.pro
- index 92ad554..778294b 100644
++index bd94e0f..0ce9fe3 100644
+--- a/Qt4Qt5/qscintilla.pro
++++ b/Qt4Qt5/qscintilla.pro
+@@ -24,7 +24,7 @@
+
+ TEMPLATE = lib
+ TARGET = qscintilla2
+-CONFIG += qt warn_off release thread exceptions
++CONFIG += qt warn_off release thread exceptions debug
+ INCLUDEPATH += . ../include ../lexlib ../src
+
- DEFINES += QSCINTILLA_MAKE_DLL SCINTILLA_QT SCI_LEXER
++ !CONFIG(staticlib) {
+diff --git a/designer-Qt4Qt5/designer.pro b/designer-Qt4Qt5/designer.pro
+index 18339ee..ef0125d 100644
+--- a/designer-Qt4Qt5/designer.pro
++++ b/designer-Qt4Qt5/designer.pro
+@@ -4,7 +4,7 @@
+ TEMPLATE = lib
+ TARGET = qscintillaplugin
+
+-CONFIG += release plugin qscintilla2
++CONFIG += release plugin qscintilla2 debug
+
+ greaterThan(QT_MAJOR_VERSION, 4) {
+ QT += designer
diff --cc debian/patches/configure.py-objdir-support.diff
index 0761314,0000000..ecc6aea
mode 100644,000000..100644
--- a/debian/patches/configure.py-objdir-support.diff
+++ b/debian/patches/configure.py-objdir-support.diff
@@@ -1,50 -1,0 +1,50 @@@
- From 8bc114ae1094554ac682a3baae889e5f1d57fa33 Mon Sep 17 00:00:00 2001
++From 30d670faa8ace703c8351cf8abc675b08057e218 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 13:39:16 -0700
+Subject: configure.py-objdir-support.diff
+
+02_configure.dpatch by Torsten Marek <shlomme at debian.org>
+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
+Patch-Name: configure.py-objdir-support.diff
+---
+ Python/configure.py | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/Python/configure.py b/Python/configure.py
- index e078d42..c3c0562 100644
++index 6792db9..820d937 100644
+--- a/Python/configure.py
++++ b/Python/configure.py
+@@ -37,6 +37,7 @@ 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.
+@@ -206,6 +207,8 @@ 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
+@@ -260,7 +263,12 @@ class ModuleConfiguration(object):
+ the target configuration.
+ """
+
+- 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'
+
+ def get_sip_installs(self, target_configuration):
+ """ Return a tuple of the installation directory of the module's .sip
diff --cc debian/patches/fix-lib-install-dir.diff
index 1025186,0000000..9d0107c
mode 100644,000000..100644
--- a/debian/patches/fix-lib-install-dir.diff
+++ b/debian/patches/fix-lib-install-dir.diff
@@@ -1,25 -1,0 +1,25 @@@
- From 90de462ceb2d48229eca4b8281c6e11704ae01e5 Mon Sep 17 00:00:00 2001
++From f06bc703cca122c326ec35767f970aabce6565bc Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 13:39:17 -0700
+Subject: fix-lib-install-dir.diff
+
+01_qscintilla.pro.dpatch by Torsten Marek <shlomme at debian.org>
+Don't install the library directly
+Patch-Name: fix-lib-install-dir.diff
+---
+ Qt4Qt5/qscintilla.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Qt4Qt5/qscintilla.pro b/Qt4Qt5/qscintilla.pro
- index 4394927..dcb1f67 100644
++index 66fea9b..f04ed2a 100644
+--- a/Qt4Qt5/qscintilla.pro
++++ b/Qt4Qt5/qscintilla.pro
- @@ -50,7 +50,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
++@@ -47,7 +47,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
++ # Scintilla namespace rather than pollute the global namespace.
+ #DEFINES += SCI_NAMESPACE
+
- # Handle both Qt v4 and v3.
+-target.path = $$[QT_INSTALL_LIBS]
++target.path = /usr/lib
- isEmpty(target.path) {
- target.path = $(QTDIR)/lib
- }
++ INSTALLS += target
++
++ header.path = $$[QT_INSTALL_HEADERS]
diff --cc debian/patches/qsci_link.patch
index 1307b1e,0000000..07c1508
mode 100644,000000..100644
--- a/debian/patches/qsci_link.patch
+++ b/debian/patches/qsci_link.patch
@@@ -1,26 -1,0 +1,26 @@@
- From e7118585825e91822237861da7b74fdbcef7dc34 Mon Sep 17 00:00:00 2001
++From 133b07068ca7ff5d1112044980aeb06b62279557 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
... 223 lines suppressed ...
--
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