Manual merge of version 2.10.4+dfsg-2.1+rpi1 and 2.11.2+dfsg-5 to produce 2.11.2...

diff --cc debian/changelog
index ef9f9185c9e2c0089abb9582d2cdd5e2d263a83e,dd0a412a12e0b87cb99bdb45365628f799e23123..a1d803d21514f5d3e1742726021d08d20449c15e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,66 +1,73 @@@
- qscintilla2 (2.10.4+dfsg-2.1+rpi1) buster-staging; urgency=medium
++qscintilla2 (2.11.2+dfsg-5+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.10.2+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 11 Jan 2018 16:07:42 +0000]
 +  * Add symbols file hack for Raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 18 Jun 2019 09:24:35 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 26 Nov 2019 00:52:51 +0000
 +
- qscintilla2 (2.10.4+dfsg-2.1) unstable; urgency=medium
+ qscintilla2 (2.11.2+dfsg-5) unstable; urgency=medium
  
-   * Non-maintainer upload.
-   * libqscintilla2-qt4-13: Add Breaks against libqscintilla2-3 from lenny
-     since some upgrade paths uncleanly delete files, causing debsums to
-     complain about missing /usr/share/qt4/translations/qscintilla_ru.qm.
-     (Closes: #925403)
+   * Team upload.
  
-  -- Andreas Beckmann <anbe@debian.org>  Sun, 16 Jun 2019 14:55:29 +0200
+   [ Dmitry Shachnev ]
+   * Update debian/libqscintilla2-qt5-15.symbols more carefully, to fix
+     build failure on mips64el.
+ 
+   [ Scott Kitterman ]
+   * Update autopkgtest for deletion of Python 2 and Qt4 packages
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 19 Nov 2019 08:31:13 +0300
+ 
+ qscintilla2 (2.11.2+dfsg-4) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Thu, 14 Nov 2019 13:45:56 -0300
+ 
+ qscintilla2 (2.11.2+dfsg-3) unstable; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Update symbols files with buildds' logs.
+ 
+  -- Gudjon I. Gudjonsson <gudjon@gudjon.org>  Sat, 02 Nov 2019 09:13:04 +0100
+ 
+ qscintilla2 (2.11.2+dfsg-2) experimental; urgency=medium
+ 
+   * Team upload.
+   * Fix Lintian warnings about debian/copyright.
+   * Update debian/libqscintilla2-qt5-15.symbols using pkgkde-symbolshelper.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Wed, 02 Oct 2019 17:18:28 +0300
+ 
+ qscintilla2 (2.11.2+dfsg-1) experimental; urgency=medium
+ 
+   [ Ondřej Nový ]
+   * d/changelog: Remove trailing whitespaces.
+ 
+   [ Gudjon I. Gudjonsson ]
+   * Update watch file, thanks to Dmitry Shachnev (Closes: #926204)
+   * New upstream release
+   * Refresh all patches
+   * Add patch Add-import-QUrl, fixes compilation
+   * Make two missing directories from rules file
+   * Bump standards version to 4.4.0.1
+   * Remove all -dbg files. They are autogenerated
+   * Bump ABI version from -13 to -15
+   * Rename -13 files to -15 in debian/
+   * Remove -dbg strip arguments in rules
+   * Bump SONAME in rules file to 15
+   * Copy sip files to qsci packages
+   * Add Build-Depends-Package to symbols files
+   * Remove +dfsg from symbols files
+   * Create new symbols files
+   * Remove python2 and Qt4 packages (Closes: #938318, #875144).
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Switch debian/copyright to use copyright format 1.0
+     - Remove minified version of jquery.js.
+ 
+  -- Gudjon I. Gudjonsson <gudjon@gudjon.org>  Sat, 28 Sep 2019 11:16:33 +0200
  
  qscintilla2 (2.10.4+dfsg-2) unstable; urgency=medium
  

diff --cc debian/rules
index 8a39f483058c674e756b7e82e2656d9c48b32c77,554bb753777f148701018b2450fc66d8f92ab64e..88904bb5eca22e5e264e4be72df231412332a7bf
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -41,18 -41,8 +41,12 @@@ endi
  
  configure-stamp:
        dh_testdir
-       mkdir QSciQt4
-       cp -r Qt4Qt5/* QSciQt4
-       mkdir designer-Qt4
-       cd QSciQt4 && qmake-qt4 QMAKE_STRIP="" DESTDIR=../QSciQt4
-       cd designer-Qt4Qt5 && qmake-qt4 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../QSciQt4 QMAKE_STRIP="" DESTDIR=../designer-Qt4
- ifeq ($(qt5), "yes")
 +      sed -i 's/(arch=armel)/(optional=meh)/' debian/libqscintilla2-qt4-13.symbols
 +      sed -i 's/(arch=!armel)/(optional=meh2)/' debian/libqscintilla2-qt4-13.symbols
 +      sed -i 's/(arch=armel)/(optional=meh)/' debian/libqscintilla2-qt5-13.symbols
 +      sed -i 's/(arch=!armel)/(optional=meh2)/' debian/libqscintilla2-qt5-13.symbols
        # Configuring for Qt5 support
-       mkdir QSciQt5
+       mkdir -p QSciQt5
        cp -r Qt4Qt5/* QSciQt5
        cd QSciQt5  && qmake -qt=qt5-$(DEB_HOST_MULTIARCH) QMAKE_STRIP="" DESTDIR=../QSciQt5
        cp -r designer-Qt4Qt5 designer-Qt5
@@@ -140,12 -107,7 +111,11 @@@ clean
        rm -f *-stamp
  
        dh_clean
 +      sed -i 's/(optional=meh)/(arch=armel)/' debian/libqscintilla2-qt4-13.symbols
 +      sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqscintilla2-qt4-13.symbols
 +      sed -i 's/(optional=meh)/(arch=armel)/' debian/libqscintilla2-qt5-13.symbols
 +      sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqscintilla2-qt5-13.symbols
  
- d3_qt4_dbg = debian/python3-pyqt4.qsci-dbg
  d3_qt5_dbg = debian/python3-pyqt5.qsci-dbg
  
  install-python-3%: