mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-07-27 13:27:05 +00:00
remove conflict
This commit is contained in:
parent
04b887e299
commit
3088d23d31
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -1,11 +1,9 @@
|
|||||||
llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; urgency=medium
|
llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
<<<<<<<
|
|
||||||
[ Sylvestre Ledru ]
|
[ Sylvestre Ledru ]
|
||||||
* replace python3-recommonmark by myst-parser
|
* replace python3-recommonmark by myst-parser
|
||||||
to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3
|
to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3
|
||||||
And disable generation of the doc on old distro
|
And disable generation of the doc on old distro
|
||||||
* Also install readtapi => llvm-readtapi symlink
|
|
||||||
* Ship tblgen-to-irdl as part of mlir-tools
|
* Ship tblgen-to-irdl as part of mlir-tools
|
||||||
|
|
||||||
[ Matthias Klose ]
|
[ Matthias Klose ]
|
||||||
@ -17,12 +15,6 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED;
|
|||||||
* Use a stamps subdirectory for all build stamps.
|
* Use a stamps subdirectory for all build stamps.
|
||||||
* Factor-out the calls to dh_listpackages.
|
* Factor-out the calls to dh_listpackages.
|
||||||
* d/rules/preconfigure: Print info about build environment.
|
* d/rules/preconfigure: Print info about build environment.
|
||||||
=======
|
|
||||||
* replace python3-recommonmark by myst-parser
|
|
||||||
to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3
|
|
||||||
And disable generation of the doc on old distro
|
|
||||||
* Also install readtapi => llvm-readtapi symlink
|
|
||||||
>>>>>>>
|
|
||||||
|
|
||||||
-- Matthias Klose <doko@debian.org> Sun, 08 Oct 2023 08:10:51 +0200
|
-- Matthias Klose <doko@debian.org> Sun, 08 Oct 2023 08:10:51 +0200
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user