Manual merge of version 2.11.2+dfsg-7+rpi1 and 2.11.5+dfsg-3 to produce 2.11.5+dfsg... archive/raspbian/2.11.5+dfsg-3+rpi1 raspbian/2.11.5+dfsg-3+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 8 Oct 2020 02:46:27 +0000 (02:46 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 8 Oct 2020 02:46:27 +0000 (02:46 +0000)
1  2 
debian/changelog
debian/rules

index a154283c1227ed6cb7b69e2f74f78ec289d4e512,34d90e8a39170c6b48d714b164cd5973c74848bd..6c6e8204c5306ef4af9be95beaa6cd8d7e5c382e
@@@ -1,9 -1,47 +1,54 @@@
- qscintilla2 (2.11.2+dfsg-7+rpi1) bullseye-staging; urgency=medium
++qscintilla2 (2.11.5+dfsg-3+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>  Thu, 25 Jun 2020 08:42:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Oct 2020 02:45:54 +0000
++
+ qscintilla2 (2.11.5+dfsg-3) unstable; urgency=medium
+   * Team upload.
+   * Upload to unstable.
+   [ Ondřej Nový ]
+   * d/control: Update Maintainer field with new Debian Python Team
+     contact address.
+   * d/control: Update Vcs-* fields with new Debian Python Team Salsa
+     layout.
+  -- Dmitry Shachnev <mitya57@debian.org>  Thu, 24 Sep 2020 16:29:36 +0300
+ qscintilla2 (2.11.5+dfsg-2) experimental; urgency=medium
+   * Restore python3-pyqt5.qsci-dbg package. It contains the extension for
+     Python debug interpreter, which cannot be replaced with automatic
+     -dbgsym package.
+   * Update debian/libqscintilla2-qt5-15.symbols from buildds’ logs.
+   * Update debian/copyright.
+   * Regenerate the Doxygen documentation during indep builds.
+   * Update examples to the version from latest upstream snapshot, where
+     the license has been clarified.
+  -- Dmitry Shachnev <mitya57@debian.org>  Thu, 02 Jul 2020 12:43:07 +0300
+ qscintilla2 (2.11.5+dfsg-1) experimental; urgency=medium
+   * Team upload.
+   * New upstream release.
+   * Refresh patches for the new release.
+   * Properly pass build flags to qmake.
+   * Stop installing deleted README, install Python/README instead.
+   * Update debian/libqscintilla2-qt5-15.symbols.
+     - Mark some symbols as optional for GCC 10 (closes: #957725).
+   * Switch from sip4 to sip5.
+   * Drop patches for configure.py, we are no longer using it.
+   * Update to debhelper compat level 13.
+   * Use dh sequencer.
+   * Further simplify debian/rules by including dpkg's default.mk.
+   * Override missing-depends-on-python error for pyqt5.qsci-dev.
+   * Bump Standards-Version to 4.5.0, no changes needed.
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 23 Jun 2020 16:13:10 +0300
  
  qscintilla2 (2.11.2+dfsg-7) unstable; urgency=medium
  
diff --cc debian/rules
index 645fa98cb494c82b90436557d3ea8851e3d72c07,e7f106953b72920bfe0a2e93cdd91c543efe954a..e8f3792b87b46e4b7e2abefc507c736f48a6fcc7
@@@ -94,103 -70,29 +73,35 @@@ Python/build-%/build-stamp: Python/buil
  
  Python/dbg-build-%/build-stamp: Python/dbg-build-%/configure-stamp
        dh_testdir
-       #$(MAKE) -C Python/build-$*
+       $(MAKE) -C Python/dbg-build-$*
        touch $@
  
+ override_dh_auto_build: build-library-stamp $(PYTHONS:%=Python/build-%/build-stamp) $(PYTHONS:%=Python/dbg-build-%/build-stamp)
  
- build-indep: build-stamp
- build-stamp:
- clean:
-       dh_testdir
-       dh_testroot
-       rm -rf Python/*build*
-       rm -rf QSciQt5
-       rm -rf designer-Qt5
-       rm -f *-stamp
-       dh_clean
-       sed -i 's/(optional=meh)/(arch=armel)/' debian/libqscintilla2-qt5-*.symbols
-       sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqscintilla2-qt5-*.symbols
-       sed -i 's/(optional=meh3)/(arch=!armel !riscv64)/' debian/libqscintilla2-qt5-*.symbols
- d3_qt5_dbg = debian/python3-pyqt5.qsci-dbg
+ execute_after_dh_auto_build-indep:
+       cd doc && doxygen qscintilla.dxy
  
- install-python-3%:
-       #$(MAKE) -C Python/build-3$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
-       $(MAKE) -C Python/buildqt5-3$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
-       $(MAKE) -C Python/dbg-buildqt5-3$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
-       ABITAG=`python3$* -c "import sysconfig; print(sysconfig.get_config_var('SOABI'))"`; \
-         for f in `find debian/tmp/usr/lib/python3* -name '*.so' ! -name '*.cpython*.so'`; do \
-         mv $$f $${f%.so}.$$ABITAG.so || exit 1; \
-       done;
+ override_dh_auto_install:
+       $(MAKE) -C QSciQt5 install INSTALL_ROOT=$(CURDIR)/debian/tmp
+       $(MAKE) -C designer-Qt5 install INSTALL_ROOT=$(CURDIR)/debian/libqscintilla2-qt5-designer
+       set -ex; for p in $(PYTHONS); do \
+               $(MAKE) -C Python/build-$$p install INSTALL_ROOT=$(CURDIR)/debian/tmp; \
+               $(MAKE) -C Python/dbg-build-$$p install INSTALL_ROOT=$(CURDIR)/debian/tmp; \
+       done
  
- d_qt5_dbg = debian/python-pyqt5.qsci-dbg
+ override_dh_installdocs:
+       dh_installdocs -ppython3-pyqt5.qsci-dbg --link-doc=python3-pyqt5.qsci
+       dh_installdocs --remaining-packages -A NEWS
  
- install-python-%:
-       #$(MAKE) -C Python/buildqt5-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
-       #$(MAKE) -C Python/dbg-buildqt5-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+ execute_after_dh_installdocs-indep:
+       dh_doxygen
  
- install: build
-       dh_testdir
-       dh_testroot
-       dh_prep
-       dh_installdirs
-       mkdir -p $(CURDIR)/debian/tmp/usr/share/sip/PyQt5/Qsci
-       cp $(CURDIR)/Python/sip/* $(CURDIR)/debian/tmp/usr/share/sip/PyQt5/Qsci
-       cd QSciQt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/libqscintilla2-qt5-$(SONAME) install
-       mkdir -p $(CURDIR)/debian/libqscintilla2-qt5-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci
-       mkdir -p $(CURDIR)/debian/libqscintilla2-qt5-dev/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features
-       mkdir -p $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/api/python3
-       cp $(CURDIR)/debian/libqscintilla2-qt5-$(SONAME)/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci/*.h $(CURDIR)/debian/libqscintilla2-qt5-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci/
-       rm -rf $(CURDIR)/debian/libqscintilla2-qt5-$(SONAME)/usr/include
-       mv $(CURDIR)/debian/libqscintilla2-qt5-$(SONAME)/usr/lib/*.so $(CURDIR)/debian/libqscintilla2-qt5-dev/usr/lib
-       cp $(CURDIR)/debian/libqscintilla2-qt5-$(SONAME)/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features/* $(CURDIR)/debian/libqscintilla2-qt5-dev/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features
-       rm -rf $(CURDIR)/debian/libqscintilla2-qt5-$(SONAME)/usr/lib/$(DEB_HOST_MULTIARCH)
-       cd designer-Qt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/libqscintilla2-qt5-designer install
-       mkdir -p $(CURDIR)/debian/libqscintilla2-qt5-l10n/usr/share/qt5/translations
-       cp $(CURDIR)/debian/libqscintilla2-qt5-$(SONAME)/usr/share/qt5/translations/* $(CURDIR)/debian/libqscintilla2-qt5-l10n/usr/share/qt5/translations
-       mkdir -p $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/qsci/api/python
-       cp $(CURDIR)/debian/libqscintilla2-qt5-$(SONAME)/usr/share/qt5/qsci/api/python/Python-3* $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/qsci/api/python
-       rm -rf $(CURDIR)/debian/libqscintilla2-qt5-$(SONAME)/usr/share/qt5
-       cp $(CURDIR)/Python/buildqt5-$(shell py3versions -dv)/QScintilla2.api $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/api/python3
-       #cd designer-Qt4Qt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
-       for p in $(PYTHONS) ; do \
-                 $(MAKE) -f debian/rules install-python-$$p || exit 1;\
-         done
- binary-common:
-       dh_testdir
-       dh_testroot
-       dh_installman
-       dh_install --sourcedir=$(CURDIR)/debian/tmp
-       dh_installchangelogs NEWS
-       dh_installdocs -A
-       dh_installexamples
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_python3
-       rm -rf $(CURDIR)/debian/python-qscintilla2/usr/share/pyshared
-       dh_sip3
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
- # Build architecture independant packages using the common target.
- binary-indep: install
-       $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
- # Build architecture dependant packages using the common target.
- binary-arch: install
-       $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install configure
- .NOTPARALLEL:
+ override_dh_strip:
+       dh_strip -ppython3-pyqt5.qsci --dbg-package=python3-pyqt5.qsci-dbg
+       dh_strip --remaining-packages
 +
++override_dh_auto_clean:
++      dh_auto_clean
++      sed -i 's/(optional=meh)/(arch=armel)/' debian/libqscintilla2-qt5-*.symbols
++      sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqscintilla2-qt5-*.symbols
++      sed -i 's/(optional=meh3)/(arch=!armel !riscv64)/' debian/libqscintilla2-qt5-*.symbols