fixup debian/changelog

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-11-12 13:09:38 +01:00
parent 73dc32bf01
commit 20234b3894

23
debian/changelog vendored
View File

@ -748,12 +748,6 @@ llvm-toolchain-snapshot (1:10~svn366440-1~exp1) experimental; urgency=medium
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 18 Jul 2019 18:58:32 +0200
<<<<<<< HEAD
llvm-toolchain-9 (1:9.0.1-13~bpo10+pve1) proxmox-rust; urgency=medium
[ Aurelien Jarno ]
* Add mips-force-nomadd4.diff to default to +nomadd4 on MIPS.
=======
llvm-toolchain-9 (1:9.0.1-15) unstable; urgency=low
* Replace use of deprecated $ADTTMP with $AUTOPKGTEST_TMP.
@ -775,26 +769,27 @@ llvm-toolchain-9 (1:9.0.1-14) unstable; urgency=medium
-- Gianfranco Costamagna <locutusofborg@debian.org> Sat, 15 Aug 2020 21:53:41 +0200
llvm-toolchain-9 (1:9.0.1-13~bpo10+pve1) proxmox-rust; urgency=medium
[ Aurelien Jarno ]
* Add mips-force-nomadd4.diff to default to +nomadd4 on MIPS.
[ Proxmox Support Team ]
* Rebuild for Debian Buster / Proxmox
-- Proxmox Support Team <support@proxmox.com> Tue, 28 Jul 2020 08:58:19 +0200
llvm-toolchain-9 (1:9.0.1-13) unstable; urgency=medium
[ Aurelien Jarno ]
* Add mips-force-nomadd4.diff to default to +nomadd4 on MIPS. (Closes:
#964988)
>>>>>>> debian/11.0.0-5
[ Ximin Luo ]
* Add 373184.patch to fix soundness issue affecting rustc. (Closes: #959877)
* Add f8e146f3430de3a6cd904f3f3f7aa1bfaefee14c.patch to fix big-endian
miscompilation affecting rustc.
<<<<<<< HEAD
[ Proxmox Support Team ]
* Rebuild for Debian Buster / Proxmox
-- Proxmox Support Team <support@proxmox.com> Tue, 28 Jul 2020 08:58:19 +0200
=======
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 07 Jul 2020 18:18:00 +0200
>>>>>>> debian/11.0.0-5
llvm-toolchain-9 (1:9.0.1-12) unstable; urgency=medium