[neon/qt6/qbs/Neon/release] debian: rebase on salsa
Carlos De Maine
null at kde.org
Sat Aug 30 06:05:04 BST 2025
Git commit 5cf81334c372dda430e61c28d595078c91278aec by Carlos De Maine.
Committed on 30/08/2025 at 05:04.
Pushed by carlosdem into branch 'Neon/release'.
rebase on salsa
M +92 -13 debian/changelog
M +15 -10 debian/control
M +2 -1 debian/patches/series
M +216 -4 debian/qbs-common.install
M +1 -4 debian/rules
https://invent.kde.org/neon/qt6/qbs/-/commit/5cf81334c372dda430e61c28d595078c91278aec
diff --cc debian/changelog
index 78e195f,e36011a..065f156
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,99 +1,99 @@@
- qbs (2.6.1-0neon) noble; urgency=medium
+ qbs (3.0.1-2) experimental; urgency=medium
-
+ * Team upload.
+
- * New release
+ * Backport the upstream https://codereview.qt-project.org/c/qbs/qbs/+/671159
+ to fix the build on 32bit architectures; patch
+ Fix-check-for-uninitialized-JSValue.diff.
+ * Move the test-only qt6-declarative-dev, and qt6-tools-dev build dependencies
+ as Build-Depends-Arch, as they are needed only when running the tests which
+ are run during arch builds.
+ * Add few more arch-only test-only build dependencies for additional bits in
+ the test suite: 7zip, bison, flex, icoutils, qt6-shadertools-dev, and zip.
- -- Carlos De Maine <carlosd.kde at gmail.com> Sun, 13 Apr 2025 07:20:44 +1000
+ -- Pino Toscano <pino at debian.org> Sat, 30 Aug 2025 06:02:11 +0200
- qbs (2.6.0-0neon) noble; urgency=medium
+ qbs (3.0.1-1) experimental; urgency=medium
- * New release
+ * Team upload.
+ * New upstream release.
+ * Rename libqbscore2.6 to libqbscore3.0 according to the upstream SONAME
+ bump.
+ * Update the patches:
+ - quickjs_hurd.diff: drop, as it refers to quickjs and not to the actually
+ used quickjs-ng
+ * Update install files.
- -- Carlos De Maine <carlosdemaine at gmail.com> Tue, 18 Mar 2025 10:41:26 +1000
+ -- Pino Toscano <pino at debian.org> Wed, 20 Aug 2025 04:28:56 +0200
- qbs (2.5.1-0neon) noble; urgency=medium
+ qbs (2.6.1-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+
+ -- Pino Toscano <pino at debian.org> Mon, 21 Apr 2025 08:26:31 +0200
+
+ qbs (2.6.0-2) unstable; urgency=medium
+
+ * Team upload.
+ * Upload to unstable.
+
+ -- Pino Toscano <pino at debian.org> Sun, 30 Mar 2025 08:23:58 +0200
+
+ qbs (2.6.0-1) experimental; urgency=medium
+
+ * Team upload.
+
+ [ Simon Quigley ]
+ * Extend the -O2 hack for Ubuntu to also apply to amd64.
[ Pino Toscano ]
+ * Bump Standards-Version to 4.7.2, no changes required.
+ * New upstream release.
+ * Rename libqbscore2.5 to libqbscore2.6 according to the upstream SONAME
+ bump.
+ * Update install files.
+
+ -- Pino Toscano <pino at debian.org> Sat, 29 Mar 2025 07:50:00 +0100
+
+ qbs (2.5.1-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+
+ -- Pino Toscano <pino at debian.org> Sun, 02 Feb 2025 12:49:04 +0100
+
+ qbs (2.5.0-2) unstable; urgency=medium
+
+ * Team upload.
+ * Upload to unstable.
+ * Backport/adapt fixes from the upstream quickjs for GNU/Hurd to the embedded
+ copy in qbs; patch quickjs_hurd.diff.
+
+ -- Pino Toscano <pino at debian.org> Tue, 10 Dec 2024 06:26:52 +0100
+
+ qbs (2.5.0-1) experimental; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * Update the patches:
+ - upstream_cmake-Do-not-install-.gitignore-files.patch: drop, backported
+ from upstream
+ - test_sanitizers_only_on_amd64.diff: refresh
+ * Rename libqbscore2.4 to libqbscore2.5 according to the upstream SONAME
+ bump.
+ * Update install files.
+ * Update copyright.
+ * Remove symbols file: the shared libqbscore library bumps SONAME at every
+ minor series, making the benefit of symbols files to lower the library
+ requirements less useful; furthermore, the current library exposes a lot
+ of internal symbols because of the enabled tests, making the symbols file
+ hard to maintain.
+
+ -- Pino Toscano <pino at debian.org> Sun, 08 Dec 2024 20:37:44 +0100
+
+ qbs (2.4.2-3) unstable; urgency=medium
+
+ * Team upload.
* Build the documentation only during arch-indep builds:
- move the python3-bs4, and python3-lxml build dependencies to
Build-Depends-Indep
diff --cc debian/control
index 419c3eb,b8cf0f2..2a7e312
--- a/debian/control
+++ b/debian/control
@@@ -104,4 -106,4 +109,4 @@@ Description: Qbs HTML documentatio
correct incremental builds. It features a project description language that
is similar to QML.
.
-- This package contains the HTML documentation for Qbs.
++ This package contains the HTML documentation for Qbs.
diff --cc debian/patches/series
index 3e04274,4824aae..f5eb44c
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,4 -2,5 +2,5 @@@ skip_test_concurrent.dif
test_sanitizers_only_on_amd64.diff
no_nosys_specs.diff
disable_bad_assembly.diff
- asan_atomic.diff
+ asan_atomic.diff
-Fix-check-for-uninitialized-JSValue.diff
++Fix-check-for-uninitialized-JSValue.diff
diff --cc debian/qbs-common.install
index 9e5269d,b314822..c3b87ea
--- a/debian/qbs-common.install
+++ b/debian/qbs-common.install
@@@ -1,4 -1,216 +1,216 @@@
- usr/share/qbs/imports/qbs/
- usr/share/qbs/module-providers/
- usr/share/qbs/modules/Android/
- usr/share/qbs/qml-type-descriptions/
+ usr/share/qbs/imports/qbs/BundleTools/bundle-tools.js
+ usr/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
+ usr/share/qbs/imports/qbs/ModUtils/utils.js
+ usr/share/qbs/imports/qbs/PathTools/path-tools.js
+ usr/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/BinaryProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/ClBinaryProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/ClangClBinaryProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/ClangClProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/ConanfileProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/CosmicProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/DmcProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/GccProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/GccVersionProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/IarProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/IcoUtilsVersionProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/IncludeProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/InnoSetupProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/JdkProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/JdkVersionProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/KeilProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/LibraryProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/MsvcProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/NpmProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/PathProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/QbsPkgConfigProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/QmakeProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/SdccProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/TypeScriptProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/WatcomProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/WiXProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/XcodeLocationProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/XcodeProbe.qbs
+ usr/share/qbs/imports/qbs/Probes/path-probe.js
+ usr/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js
+ usr/share/qbs/imports/qbs/Probes/qmake-probe.js
+ usr/share/qbs/imports/qbs/ProviderUtils/provider-utils.js
+ usr/share/qbs/imports/qbs/UnixUtils/unix-utils.js
+ usr/share/qbs/imports/qbs/WindowsUtils/windows-utils.js
+ usr/share/qbs/imports/qbs/base/AndroidApk.qbs
+ usr/share/qbs/imports/qbs/base/AppleApplicationDiskImage.qbs
+ usr/share/qbs/imports/qbs/base/AppleDiskImage.qbs
+ usr/share/qbs/imports/qbs/base/Application.qbs
+ usr/share/qbs/imports/qbs/base/ApplicationExtension.qbs
+ usr/share/qbs/imports/qbs/base/AutotestRunner.qbs
+ usr/share/qbs/imports/qbs/base/CppApplication.qbs
+ usr/share/qbs/imports/qbs/base/DynamicLibrary.qbs
+ usr/share/qbs/imports/qbs/base/InnoSetup.qbs
+ usr/share/qbs/imports/qbs/base/InstallPackage.qbs
+ usr/share/qbs/imports/qbs/base/JavaClassCollection.qbs
+ usr/share/qbs/imports/qbs/base/JavaJarFile.qbs
+ usr/share/qbs/imports/qbs/base/Library.qbs
+ usr/share/qbs/imports/qbs/base/LoadableModule.qbs
+ usr/share/qbs/imports/qbs/base/NSISSetup.qbs
+ usr/share/qbs/imports/qbs/base/NativeBinary.qbs
+ usr/share/qbs/imports/qbs/base/NetModule.qbs
+ usr/share/qbs/imports/qbs/base/NodeJSApplication.qbs
+ usr/share/qbs/imports/qbs/base/QtApplication.qbs
+ usr/share/qbs/imports/qbs/base/QtGuiApplication.qbs
+ usr/share/qbs/imports/qbs/base/QtLupdateRunner.qbs
+ usr/share/qbs/imports/qbs/base/QtModule.qbs
+ usr/share/qbs/imports/qbs/base/QtPlugin.qbs
+ usr/share/qbs/imports/qbs/base/StaticLibrary.qbs
+ usr/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs
+ usr/share/qbs/imports/qbs/base/WindowsSetupPackage.qbs
+ usr/share/qbs/imports/qbs/base/XPCService.qbs
+ usr/share/qbs/module-providers/Qt/provider.qbs
+ usr/share/qbs/module-providers/Qt/setup-qt.js
+ usr/share/qbs/module-providers/Qt/templates/android_support.js
+ usr/share/qbs/module-providers/Qt/templates/android_support.qbs
+ usr/share/qbs/module-providers/Qt/templates/core.js
+ usr/share/qbs/module-providers/Qt/templates/core.qbs
+ usr/share/qbs/module-providers/Qt/templates/dbus.js
+ usr/share/qbs/module-providers/Qt/templates/dbus.qbs
+ usr/share/qbs/module-providers/Qt/templates/gui.qbs
+ usr/share/qbs/module-providers/Qt/templates/moc.js
+ usr/share/qbs/module-providers/Qt/templates/module.qbs
+ usr/share/qbs/module-providers/Qt/templates/plugin.qbs
+ usr/share/qbs/module-providers/Qt/templates/plugin_support.qbs
+ usr/share/qbs/module-providers/Qt/templates/qdoc.js
+ usr/share/qbs/module-providers/Qt/templates/qml.js
+ usr/share/qbs/module-providers/Qt/templates/qml.qbs
+ usr/share/qbs/module-providers/Qt/templates/qmlcache.qbs
+ usr/share/qbs/module-providers/Qt/templates/quick.js
+ usr/share/qbs/module-providers/Qt/templates/quick.qbs
+ usr/share/qbs/module-providers/Qt/templates/rcc.js
+ usr/share/qbs/module-providers/Qt/templates/scxml.qbs
+ usr/share/qbs/module-providers/Qt/templates/shadertools.js
+ usr/share/qbs/module-providers/Qt/templates/shadertools.qbs
+ usr/share/qbs/module-providers/__fallback/fallback.qbs
+ usr/share/qbs/module-providers/__fallback/provider.qbs
+ usr/share/qbs/module-providers/conan.js
+ usr/share/qbs/module-providers/conan.qbs
+ usr/share/qbs/module-providers/qbspkgconfig.qbs
+ usr/share/qbs/modules/Android/android-utils.js
+ usr/share/qbs/modules/Android/ndk/ndk.qbs
+ usr/share/qbs/modules/Android/ndk/utils.js
+ usr/share/qbs/modules/Android/sdk/sdk.qbs
+ usr/share/qbs/modules/Android/sdk/utils.js
+ usr/share/qbs/modules/Exporter/cmake/cmakeexporter.js
+ usr/share/qbs/modules/Exporter/cmake/cmakeexporter.qbs
+ usr/share/qbs/modules/Exporter/exporter.js
+ usr/share/qbs/modules/Exporter/pkgconfig/pkgconfig.js
+ usr/share/qbs/modules/Exporter/pkgconfig/pkgconfig.qbs
+ usr/share/qbs/modules/Exporter/qbs/qbsexporter.js
+ usr/share/qbs/modules/Exporter/qbs/qbsexporter.qbs
+ usr/share/qbs/modules/Sanitizers/address/asan.qbs
+ usr/share/qbs/modules/archiver/archiver.qbs
+ usr/share/qbs/modules/autotest/autotest.qbs
+ usr/share/qbs/modules/bundle/BundleModule.qbs
+ usr/share/qbs/modules/bundle/MacOSX-Package-Types.xcspec
+ usr/share/qbs/modules/bundle/MacOSX-Product-Types.xcspec
+ usr/share/qbs/modules/bundle/bundle.js
+ usr/share/qbs/modules/capnproto/capnproto.js
+ usr/share/qbs/modules/capnproto/capnprotobase.qbs
+ usr/share/qbs/modules/capnproto/cpp/capnprotocpp.qbs
+ usr/share/qbs/modules/cli/CLIModule.qbs
+ usr/share/qbs/modules/cli/cli.js
+ usr/share/qbs/modules/cli/mono.qbs
+ usr/share/qbs/modules/cli/windows-dotnet.qbs
+ usr/share/qbs/modules/codesign/CodeSignModule.qbs
+ usr/share/qbs/modules/codesign/android.qbs
+ usr/share/qbs/modules/codesign/apple.qbs
+ usr/share/qbs/modules/codesign/codesign.js
+ usr/share/qbs/modules/codesign/noop.qbs
+ usr/share/qbs/modules/codesign/signtool.qbs
+ usr/share/qbs/modules/cpp/CppModule.qbs
+ usr/share/qbs/modules/cpp/DarwinGCC.qbs
+ usr/share/qbs/modules/cpp/GenericGCC.qbs
+ usr/share/qbs/modules/cpp/LinuxGCC.qbs
+ usr/share/qbs/modules/cpp/MingwBaseModule.qbs
+ usr/share/qbs/modules/cpp/UnixGCC.qbs
+ usr/share/qbs/modules/cpp/android-gcc.qbs
+ usr/share/qbs/modules/cpp/cosmic.js
+ usr/share/qbs/modules/cpp/cosmic.qbs
+ usr/share/qbs/modules/cpp/cpp.js
+ usr/share/qbs/modules/cpp/darwin.js
+ usr/share/qbs/modules/cpp/dmc.js
+ usr/share/qbs/modules/cpp/dmc.qbs
+ usr/share/qbs/modules/cpp/emcc.qbs
+ usr/share/qbs/modules/cpp/freebsd-gcc.qbs
+ usr/share/qbs/modules/cpp/freebsd.js
+ usr/share/qbs/modules/cpp/gcc.js
+ usr/share/qbs/modules/cpp/iar.js
+ usr/share/qbs/modules/cpp/iar.qbs
+ usr/share/qbs/modules/cpp/ios-gcc.qbs
+ usr/share/qbs/modules/cpp/keil.js
+ usr/share/qbs/modules/cpp/keil.qbs
+ usr/share/qbs/modules/cpp/macos-gcc.qbs
+ usr/share/qbs/modules/cpp/msvc.js
+ usr/share/qbs/modules/cpp/qnx-qcc.qbs
+ usr/share/qbs/modules/cpp/sdcc.js
+ usr/share/qbs/modules/cpp/sdcc.qbs
+ usr/share/qbs/modules/cpp/setuprunenv.js
+ usr/share/qbs/modules/cpp/tvos-gcc.qbs
+ usr/share/qbs/modules/cpp/watchos-gcc.qbs
+ usr/share/qbs/modules/cpp/watcom.js
+ usr/share/qbs/modules/cpp/watcom.qbs
+ usr/share/qbs/modules/cpp/windows-clang-cl.qbs
+ usr/share/qbs/modules/cpp/windows-clang-mingw.qbs
+ usr/share/qbs/modules/cpp/windows-mingw.qbs
+ usr/share/qbs/modules/cpp/windows-msvc-base.qbs
+ usr/share/qbs/modules/cpp/windows-msvc.qbs
+ usr/share/qbs/modules/cpufeatures/cpufeatures.qbs
+ usr/share/qbs/modules/dmg/DMGModule.qbs
+ usr/share/qbs/modules/dmg/dmg.js
+ usr/share/qbs/modules/emsdk/emsdk.js
+ usr/share/qbs/modules/emsdk/emsdk.qbs
+ usr/share/qbs/modules/flatbuf/c/flatbuffers-c.qbs
+ usr/share/qbs/modules/flatbuf/cpp/flatbuffers-cpp.qbs
+ usr/share/qbs/modules/flatbuf/flatbuffers.js
+ usr/share/qbs/modules/flatbuf/flatbuffersbase.qbs
+ usr/share/qbs/modules/freedesktop/FreeDesktop.qbs
+ usr/share/qbs/modules/freedesktop/freedesktop.js
+ usr/share/qbs/modules/ib/IBModule.qbs
+ usr/share/qbs/modules/ib/ib.js
+ usr/share/qbs/modules/ico/IcoModule.qbs
+ usr/share/qbs/modules/ico/ico.js
+ usr/share/qbs/modules/innosetup/InnoSetupModule.qbs
+ usr/share/qbs/modules/java/JavaModule.qbs
+ usr/share/qbs/modules/java/io/qt/qbs/Artifact.java
+ usr/share/qbs/modules/java/io/qt/qbs/ArtifactListJsonWriter.java
+ usr/share/qbs/modules/java/io/qt/qbs/ArtifactListWriter.java
+ usr/share/qbs/modules/java/io/qt/qbs/tools/JavaCompilerScannerTool.java
+ usr/share/qbs/modules/java/io/qt/qbs/tools/utils/JavaCompilerOptions.java
+ usr/share/qbs/modules/java/io/qt/qbs/tools/utils/JavaCompilerScanner.java
+ usr/share/qbs/modules/java/io/qt/qbs/tools/utils/NullFileObject.java
+ usr/share/qbs/modules/java/utils.js
+ usr/share/qbs/modules/lex_yacc/lexyacc.js
+ usr/share/qbs/modules/lex_yacc/lexyacc.qbs
+ usr/share/qbs/modules/nodejs/NodeJS.qbs
+ usr/share/qbs/modules/nodejs/nodejs.js
+ usr/share/qbs/modules/nsis/NSISModule.qbs
+ usr/share/qbs/modules/pkgconfig/pkgconfig.qbs
+ usr/share/qbs/modules/protobuf/cpp/protobufcpp.qbs
+ usr/share/qbs/modules/protobuf/nanopb/nanopb.qbs
+ usr/share/qbs/modules/protobuf/objc/protobufobjc.qbs
+ usr/share/qbs/modules/protobuf/protobuf.js
+ usr/share/qbs/modules/protobuf/protobufbase.qbs
+ usr/share/qbs/modules/qbs/common.qbs
+ usr/share/qbs/modules/qnx/qnx.qbs
+ usr/share/qbs/modules/texttemplate/texttemplate.qbs
+ usr/share/qbs/modules/typescript/TypeScriptModule.qbs
+ usr/share/qbs/modules/typescript/qbs-tsc-scan/qbs-tsc-scan.ts
+ usr/share/qbs/modules/typescript/typescript.js
+ usr/share/qbs/modules/vcs/vcs-module.qbs
+ usr/share/qbs/modules/wix/WiXModule.qbs
+ usr/share/qbs/modules/xcode/xcode.js
+ usr/share/qbs/modules/xcode/xcode.qbs
+ usr/share/qbs/qml-type-descriptions/qbs-bundle.json
-usr/share/qbs/qml-type-descriptions/qbs.qmltypes
++usr/share/qbs/qml-type-descriptions/qbs.qmltypes
More information about the Neon-commits
mailing list