From: Peter Michael Green Date: Thu, 11 Sep 2025 20:32:18 +0000 (+0000) Subject: Manual merge of version 2.4.2-2+rpi1 and 2.6.1-1 to produce 2.6.1-1+rpi1 X-Git-Tag: archive/raspbian/2.6.1-1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d3058294dfa1fa5bd84e0fa5f4b9d0bd79a68226;p=qbs.git Manual merge of version 2.4.2-2+rpi1 and 2.6.1-1 to produce 2.6.1-1+rpi1 --- e6f02ed358544670e41d32131783c70aad25b9fb diff --cc debian/changelog index 87df4bf4,95d38c47..c9c50ab0 --- a/debian/changelog +++ b/debian/changelog @@@ -1,27 -1,95 +1,120 @@@ - qbs (2.4.2-2+rpi1) trixie-staging; urgency=medium ++qbs (2.6.1-1+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 1.10.0+dfsg-2+rpi1 by Peter Michael Green 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 Thu, 31 Oct 2024 17:39:21 +0000 ++ -- Peter Michael Green Thu, 11 Sep 2025 19:17:23 +0000 ++ + qbs (2.6.1-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + + -- Pino Toscano Mon, 21 Apr 2025 08:26:31 +0200 + + qbs (2.6.0-2) unstable; urgency=medium + + * Team upload. + * Upload to unstable. + + -- Pino Toscano 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 Sat, 29 Mar 2025 07:50:00 +0100 + + qbs (2.5.1-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + + -- Pino Toscano 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 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 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 + - copy the qt6-tools-dev build dependency to Build-Depends-Indep, as it is + needed for running the test suite + - enable the -DQBS_INSTALL_HTML_DOCS, and -DQBS_INSTALL_QCH_DOCS cmake + arguments only when their respective packages are to be built + * Mark the qt6-declarative-dev, and qt6-tools-dev build dependencies as + !nocheck, as they are needed only when running the test suite. + * Update symbols file from the logs of buildds. + * Stop passing -DQBS_INSTALL_PREFIX to cmake, as it has not been used for a + long time. + * Simplifying avoiding installing .gitignore files: + - backport upstream commit 862deed5ec60c36c603d5ac84546804ea67cc675 to not + install .gitignore files; patch + upstream_cmake-Do-not-install-.gitignore-files.patch + - stop removing them from the sources in dh_auto_clean, to not modify the + sources + - drop the entries from debian/not-installed + * Remove entries from debian/not-installed that do not exist anymore. + * Remove Uploaders who have not contributed anything in more than 5 years. + + -- Pino Toscano Fri, 01 Nov 2024 11:12:59 +0100 qbs (2.4.2-2) unstable; urgency=medium diff --cc debian/rules index a97a3669,baa571fe..7955c1c9 --- a/debian/rules +++ b/debian/rules @@@ -21,22 -21,7 +21,21 @@@ BUILDPATH ?= obj-$(DEB_HOST_GNU_TYPE %: dh $@ --with pkgkde_symbolshelper --buildsystem=cmake +override_dh_auto_clean: + dh_auto_clean - find . -type f -name .gitignore -delete -print + sed -i 's/(optional=meh)/(arch=armel)/' debian/libqbscore*.symbols + sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqbscore*.symbols + sed -i 's/(optional=meh3)/(arch=armel riscv64)/' debian/libqbscore*.symbols + sed -i 's/(optional=meh4)/(arch=!armel !riscv64)/' debian/libqbscore*.symbols + sed -i 's/(optional=meh5)/(arch=armhf i386 mips64el mipsel powerpc ppc64 riscv64 s390x)/' debian/libqbscore*.symbols + rm -rf doc/qbs + override_dh_auto_configure: + sed -i 's/(arch=armel)/(optional=meh)/' debian/libqbscore*.symbols + sed -i 's/(arch=!armel)/(optional=meh2)/' debian/libqbscore*.symbols + sed -i 's/(arch=armel riscv64)/(optional=meh3)/' debian/libqbscore*.symbols + sed -i 's/(arch=!armel !riscv64)/(optional=meh4)/' debian/libqbscore*.symbols + sed -i 's/(arch=armhf i386 mips64el mipsel powerpc ppc64 riscv64 s390x)/(optional=meh5)/' debian/libqbscore*.symbols dh_auto_configure -- \ -DQBS_ENABLE_RPATH=no \ -DWITH_TESTS=yes \