Manual merge of version 1.19.2-1+rpi1 and 1.22.0-4 to produce 1.22.0-4+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 14 Apr 2022 16:58:30 +0000 (16:58 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 14 Apr 2022 16:58:30 +0000 (16:58 +0000)
1  2 
debian/changelog
debian/rules

index 726cdb7a158d208132ed89b5c1a93b83438befec,74cb9eb0d91bcf06ed494fbbb7ef90f7a327f795..a3da3d12a6360995f42fe8ce0817deb1fd3c9706
@@@ -1,21 -1,54 +1,73 @@@
- qbs (1.19.2-1+rpi1) bookworm-staging; urgency=medium
++qbs (1.22.0-4+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.10.0+dfsg-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 06 Feb 2018 00:27:38 +0000]
 +  * Add symbols file hack for Raspbian.
 +  * Fix clean target.
 +
 +  [changes introduced in 1.12.1+dfsg-2+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
 +  [changes introduced in 1.12.2+dfsg-1+rpi1 by Peter Michael Green]
 +  * Mark another symbol as optional. I'm guessing the presence or absesne of
 +    this one depends on optimisation descisions by the compiler and/or the
 +    version of libstdc++
 +
 +  [changes introduced in 1.13.1-2+rpi1 by Peter Michael Green]
 +  * Extend symbols file hack.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Sep 2021 17:05:56 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 14 Apr 2022 16:57:12 +0000
++
+ qbs (1.22.0-4) unstable; urgency=medium
+   * Disable api and blackbox tests also on mips64el.
+   * Update debian/libqbscore1.22.symbols for mipsel.
+  -- Dmitry Shachnev <mitya57@debian.org>  Thu, 07 Apr 2022 21:59:47 +0300
+ qbs (1.22.0-3) unstable; urgency=medium
+   * Disable api and blackbox tests on mipsel, blackbox on riscv64.
+   * Update debian/libqbscore1.22.symbols for more architectures.
+   * Upload to unstable.
+  -- Dmitry Shachnev <mitya57@debian.org>  Wed, 06 Apr 2022 19:46:08 +0300
+ qbs (1.22.0-2) experimental; urgency=medium
+   * Update debian/libqbscore1.22.symbols from buildds’ logs.
+   * Update disable_tests_qtscript.diff for CMake port.
+  -- Dmitry Shachnev <mitya57@debian.org>  Wed, 06 Apr 2022 00:19:07 +0300
+ qbs (1.22.0-1) experimental; urgency=medium
+   [ Marius Gripsgard ]
+   * New upstream release (version: 1.21.0)
+   * debian/*: Bump SONAME on libqbscore binary pkg to 1.21
+   * debian/patches: Refresh patches for 1.21
+   * debian/control: Bump standards version to 4.6.0
+   * debian/control: Set requires root to no
+   * debian/patch: Add tests-Make-sure-we-handle-prefix-cases-where-libPath patch
+   * debian/qbs-common: Add new files added in 1.20/1.21
+   * debian/libqbscore: Bump symbols ver to match pkg ver
+   * debian/copyright: Update copyright to match upstream release (1.21.0)
+   * debian/*: Port to use cmake as build system
+   * debian/rules: Workaround bug with parallel creation of docs
+   [ Dmitry Shachnev ]
+   * New upstream release (1.22.0).
+   * Drop tests_Make_sure_we_handle_prefix_cases_where_libPath.diff,
+     included in the new release.
+   * Rename libqbscore1.21 to libqbscore1.22 for upstream SONAME change.
+   * Update debian/qbs-common.install and add debian/not-installed.
+   * Update symbols files from the current build logs.
+   * Update debian/copyright.
+   * Remove patches that are not relevant since switch to CMake.
+   * Add a patch to fix documentation install with CMake.
+   * Remove override_dh_install target in favor of debian/not-installed.
+   * Simplify override_dh_auto_clean target.
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 02 Apr 2022 21:39:30 +0300
  
  qbs (1.19.2-1) unstable; urgency=medium
  
diff --cc debian/rules
index fc07036aca170bb305b64de929127f5ed401d95e,5080d2ebafd323fcbbdb327d70d3208ce23cda6b..22c8bdfa41be741d98f0751db1a5c4bd1687efcc
@@@ -14,41 -14,31 +14,40 @@@ export QT_SELECT := qt
  
  override_dh_auto_clean:
        dh_auto_clean
-       rm -rfv doc/html tests/auto/*/testWorkDir lib
-       rm -fv doc/qbs.qch bin/qbs* bin/tst*
        find . -type f -name .gitignore -delete -print
 +      sed -i 's/(optional=meh)/(arch=armel)/' debian/libqbscore1.*.symbols
 +      sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqbscore1.*.symbols
 +      sed -i 's/(optional=meh3)/(arch=armel riscv64)/' debian/libqbscore1.*.symbols
 +      sed -i 's/(optional=meh4)/(arch=!armel !riscv64)/' debian/libqbscore1.*.symbols
 +      rm -rf doc/qbs
  
  override_dh_auto_configure:
-       dh_auto_configure -- qbs.pro \
-               CONFIG+=debug \
-               CONFIG+=qbs_disable_rpath \
-               CONFIG+=qbs_enable_project_file_updates \
-               CONFIG+=qbs_enable_unit_tests \
-               QBS_INSTALL_PREFIX=/usr \
-               QBS_LIBRARY_DIRNAME=lib/${DEB_HOST_MULTIARCH}
 +      sed -i 's/(arch=armel)/(optional=meh)/' debian/libqbscore1.*.symbols
 +      sed -i 's/(arch=!armel)/(optional=meh2)/' debian/libqbscore1.*.symbols
 +      sed -i 's/(arch=armel riscv64)/(optional=meh3)/' debian/libqbscore1.*.symbols
 +      sed -i 's/(arch=!armel !riscv64)/(optional=meh4)/' debian/libqbscore1.*.symbols
+       dh_auto_configure -- \
+               -DQBS_ENABLE_RPATH=no \
+               -DWITH_TESTS=yes \
+               -DWITH_UNIT_TESTS=yes \
+               -DQBS_INSTALL_PREFIX=/usr \
+               -DQBS_LIB_INSTALL_DIR=lib/${DEB_HOST_MULTIARCH} \
+               -DQBS_PLUGINS_INSTALL_BASE=lib/${DEB_HOST_MULTIARCH} \
+               -DQBS_INSTALL_HTML_DOCS=yes \
+               -DQBS_INSTALL_QCH_DOCS=yes
  
  override_dh_auto_build-indep:
-       dh_auto_build -- docs
-       dh_auto_build -- sub-static-res-pro
+       dh_auto_build --no-parallel -- -C doc
+       dh_auto_build -- -C share
  
  override_dh_auto_install-indep:
-       dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_inst_html_docs
-       dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp sub-static-pro-install_subtargets
-       dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp sub-static-res-pro-install_subtargets
+       dh_auto_install --no-parallel -- -C doc
+       dh_auto_install -- -C share
  
  override_dh_auto_test-arch:
 -ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 +ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),testsuitedisabled)
        set -ex; \
-               export LD_LIBRARY_PATH=$(CURDIR)/lib/${DEB_HOST_MULTIARCH}:$$LD_LIBRARY_PATH; \
+               export LD_LIBRARY_PATH=$(BUILDPATH)/lib/${DEB_HOST_MULTIARCH}:$$LD_LIBRARY_PATH; \
                export HOME=$(CURDIR)/debian/.debhelper/generated/_source/home; \
                export QBS_AUTOTEST_PROFILE=qbs_autotests; \
                export QBS_AUTOTEST_ALWAYS_LOG_STDOUT=1; \