Package: release.debian.org Severity: normal Tags: bookworm User: release.debian....@packages.debian.org Usertags: pu X-Debbugs-Cc: Sylvestre Ledru <sylves...@debian.org> Control: affects -1 + src:llvm-defaults
[ Reason ] Since some of the libraries build from the llvm suites are not co-installable (this is expressed by Conflicts/Replaces/Provides of a virtual package), this is sometimes tricky for apt to figure out since it involves removing an installed package in order to install another one with the same score ... Adding more Breaks against the default versions from oldstable moves the scores in favor of installing the new packages and removing the obsolete ones. There was also a bad symlink in the liblld-dev package, which as pointing to lldb headers ... [ Impact ] Upgrades may have kept some packages at the version from oldstable even though there is a newer version in stable. [ Tests ] I've performed local piuparts bullseye->bookworm upgrade tests with the patched packages as upgrade targets and it has resolved all incomplete upgrade issues. [ Risks ] Low. All the new Breaks are against packages not in bookworm, so should not affect new installations. [ Checklist ] [*] *all* changes are documented in the d/changelog [*] I reviewed all changes and I approve them [*] attach debdiff against the package in (old)stable [*] the issue is verified as fixed in unstable [ Changes ] * Add Breaks against not co-installable packages for smoother upgrades from bullseye. (Closes: #1036580) * Fix /usr/include/lld symlink. (Closes: #1036577) * Silent the breaks-without-version lintian warnings [ Other info ] n/a Andreas
diff --git a/debian/changelog b/debian/changelog index ac0c76b..9873b51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +llvm-defaults (0.55.7~deb12u1) bookworm; urgency=medium + + * Rebuild for bookworm. + + -- Andreas Beckmann <a...@debian.org> Tue, 11 Jul 2023 22:52:44 +0200 + +llvm-defaults (0.55.7) unstable; urgency=medium + + [ Andreas Beckmann ] + * Add Breaks against not co-installable packages for smoother upgrades from + bullseye. (Closes: #1036580) + * Fix /usr/include/lld symlink. (Closes: #1036577) + + [ Sylvestre Ledru ] + * Silent the breaks-without-version lintian warnings + + -- Sylvestre Ledru <sylves...@debian.org> Tue, 11 Jul 2023 13:00:54 +0200 + llvm-defaults (0.55.6) unstable; urgency=medium * Add s390x in the lld supported archs diff --git a/debian/control b/debian/control index 051a071..44e1959 100644 --- a/debian/control +++ b/debian/control @@ -254,6 +254,7 @@ Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-${pv:llvm}-dev ${reqv:llvm} +Breaks: lldb-11, python3-lldb-11 Multi-Arch: same Description: Next generation, high-performance debugger, header files LLDB is a next generation, high-performance debugger. It is built as a set of @@ -266,6 +267,7 @@ Package: lldb Architecture: any Depends: lldb-${pv:llvm} ${reqv:llvm}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} +Breaks: lldb-11, python3-lldb-11 Multi-Arch: same Description: Next generation, high-performance debugger LLDB is a next generation, high-performance debugger. It is built as a set of @@ -308,7 +310,7 @@ Section: python Architecture: any Depends: python3-lldb-${pv:llvm} ${reqv:llvm}, ${misc:Depends} Replaces: python-lldb (<< 0.49~exp2) -Breaks: python-lldb (<< 0.49~exp2) +Breaks: python-lldb (<< 0.49~exp2), python3-lldb-11 Description: Next generation, high-performance debugger, python lib LLDB is a next generation, high-performance debugger. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM @@ -348,6 +350,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libc++1-${pv:llvm} ${reqv:llvm}, ${shlibs:Depends}, ${misc:Depends} +Breaks: libc++1-11, libc++abi1-11 Description: LLVM C++ Standard library libc++ is another implementation of the C++ standard library. . @@ -368,6 +371,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: libc++-${pv:llvm}-dev ${reqv:llvm}, ${misc:Depends} +Breaks: libc++1-11, libc++abi1-11 Description: LLVM C++ Standard library (development files) libc++ is another implementation of the C++ standard library . @@ -390,6 +394,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libc++abi1-${pv:llvm} ${reqv:llvm}, ${shlibs:Depends}, ${misc:Depends} +Breaks: libc++abi1-11 Description: LLVM low level support for a standard C++ library libc++abi is another implementation of low level support for a standard C++ library. @@ -407,6 +412,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: libc++abi-${pv:llvm}-dev ${reqv:llvm}, ${misc:Depends} +Breaks: libc++abi1-11 Description: LLVM low level support for a standard C++ library (development files) libc++abi is another implementation of low level support for a standard C++ library. diff --git a/debian/libc++-dev.lintian-overrides b/debian/libc++-dev.lintian-overrides new file mode 100644 index 0000000..8db09fa --- /dev/null +++ b/debian/libc++-dev.lintian-overrides @@ -0,0 +1,2 @@ +libc++-dev: breaks-without-version libc++1-11 +libc++-dev: breaks-without-version libc++abi1-11 diff --git a/debian/libc++1.lintian-overrides b/debian/libc++1.lintian-overrides new file mode 100644 index 0000000..e32b9da --- /dev/null +++ b/debian/libc++1.lintian-overrides @@ -0,0 +1,2 @@ +libc++1: breaks-without-version libc++1-11 +libc++1: breaks-without-version libc++abi1-11 diff --git a/debian/libc++abi-dev.lintian-overrides b/debian/libc++abi-dev.lintian-overrides index b130810..18cec56 100644 --- a/debian/libc++abi-dev.lintian-overrides +++ b/debian/libc++abi-dev.lintian-overrides @@ -1,2 +1,3 @@ # This is just a metapackage, forcing installation of the current libc++abi-X.Y-dev package libc++abi-dev: empty-binary-package +libc++abi-dev: breaks-without-version libc++abi1-11 diff --git a/debian/libc++abi1.lintian-overrides b/debian/libc++abi1.lintian-overrides new file mode 100644 index 0000000..1d43d99 --- /dev/null +++ b/debian/libc++abi1.lintian-overrides @@ -0,0 +1 @@ +libc++abi1: breaks-without-version libc++abi1-11 diff --git a/debian/liblldb-dev.lintian-overrides b/debian/liblldb-dev.lintian-overrides new file mode 100644 index 0000000..ebcf70e --- /dev/null +++ b/debian/liblldb-dev.lintian-overrides @@ -0,0 +1,2 @@ +liblldb-dev: breaks-without-version lldb-11 +liblldb-dev: breaks-without-version python3-lldb-11 diff --git a/debian/lldb.lintian-overrides b/debian/lldb.lintian-overrides new file mode 100644 index 0000000..8ad1851 --- /dev/null +++ b/debian/lldb.lintian-overrides @@ -0,0 +1,2 @@ +lldb: breaks-without-version lldb-11 +lldb: breaks-without-version python3-lldb-11 diff --git a/debian/python3-lldb.lintian-overrides b/debian/python3-lldb.lintian-overrides index f846278..61b2b3a 100644 --- a/debian/python3-lldb.lintian-overrides +++ b/debian/python3-lldb.lintian-overrides @@ -1,2 +1,3 @@ # This is just a metapackage, forcing installation of the current python-lldb-X.Y package python3-lldb: empty-binary-package +python3-lldb: breaks-without-version python3-lldb-11 diff --git a/debian/rules b/debian/rules index 04ad52e..d9fe872 100755 --- a/debian/rules +++ b/debian/rules @@ -308,7 +308,7 @@ install: build README substvars dh_installdirs -pliblld-dev \ /usr/include dh_link -pliblld-dev \ - /usr/lib/llvm-$(PV_LLVM)/include/lldb /usr/include/lld \ + /usr/lib/llvm-$(PV_LLVM)/include/lld /usr/include/lld \ : libllvm-ocaml-dev dh_installdirs -plibllvm-ocaml-dev \