From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 22 May 2026 19:56:31 +0000 (+0100)
Subject: Merge version 3.1.2-2+rpi1 and 3.2.0-2 to produce 3.2.0-2+rpi1
X-Git-Tag: archive/raspbian/3.2.0-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5e9b2b830c23362878263b73424dbb26562ef108;p=qbs.git

Merge version 3.1.2-2+rpi1 and 3.2.0-2 to produce 3.2.0-2+rpi1
---

5e9b2b830c23362878263b73424dbb26562ef108
diff --cc debian/changelog
index 10cf54a0,84bfca76..eb9df510
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,37 +1,62 @@@
- qbs (3.1.2-2+rpi1) forky-staging; urgency=medium
++qbs (3.2.0-2+rpi1) forky-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.
 +
 +  [changes introduced in 1.22.0-4+rpi1 by Peter Michael Green]
 +  * Further extend symbols file hack.
 +
 +  [changes introduced in 2.3.1-4+rpi1 by Peter Michael Green]
 +  * Update symbols file changes for qbs 2.x
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 27 Feb 2026 04:36:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 22 May 2026 19:56:31 +0000
++
+ qbs (3.2.0-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Upload to unstable.
+   * Few more updates to copyright, following the review in the NEW queue.
+   * Bump Standards-Version to 4.7.4, no changes required.
+   * Enable the patch test_sanitizers_only_on_amd64.diff again, as the upstream
+     code still needs more logic.
+   * Add a basic debian/upstream/metadata file.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 10 May 2026 10:57:35 +0200
+ 
+ qbs (3.2.0-1) experimental; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Rename libqbscore3.1 to libqbscore3.2 according to the upstream SONAME
+     bump.
+   * Update the patches:
+     - upstream_Fix-build-with-Qt-6.10.patch: drop, backported from upstream
+     - skip_test_concurrent.diff: temporarily disable to test whether it is
+       still needed
+     - test_sanitizers_only_on_amd64.diff: temporarily disable to test whether
+       it is still needed
+     - asan_atomic.diff: temporarily disable to test whether it is still needed
+   * Update install files.
+   * Backport upstream commit a88a68210ef4b9ad9188d2c7897f6216439a4254 to help
+     debugging skipped blackbox tests; patch
+     upstream_Better-report-target-vs-host-differences.patch.
+   * Massively update copyright, and add lrc.config.
+   * Add lintian overrides.
+   * Convert watch file to v5.
+ 
+  -- Pino Toscano <pino@debian.org>  Fri, 08 May 2026 20:02:53 +0200
  
  qbs (3.1.2-2) unstable; urgency=medium