[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1000730: marked as done (Merge conflict marker left in Debian changelog)



Your message dated Sun, 28 Nov 2021 15:34:38 +0000
with message-id <E1mrMCM-0003R7-FE@fasolo.debian.org>
and subject line Bug#1000605: fixed in libreoffice 1:7.2.3-2
has caused the Debian Bug report #1000605,
regarding Merge conflict marker left in Debian changelog
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1000605: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1000605
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: libreoffice
Version: 1:7.2.3-1
Severity: normal
X-Debbugs-Cc: josh@joshtriplett.org

The Debian changelog for libreoffice contains what looks like a merge
conflict marker around the entry for 1:7.3.0~alpha1-2:

libreoffice (1:7.3.0~alpha1-2) experimental; urgency=medium

  * debian/rules:
    - use --without-cppunit in build-indep
    - use clang 12 on ppc64el (if building with LTO at least)
    - fix autopkgtest builds; explicitely set PACKAGE_SDK_DOCS=n

 -- Rene Engelhard <rene@debian.org>  Sun, 31 Oct 2021 09:25:30 +0100
>>>>>>> efaacb77 (actually only set TEST_TIMEOUT if we ignore the test results anyway...)

  * debian/control*.in: also apply 1:7.2.1-2/-3 changes for
    libreoffice-core-nogui...

 -- Rene Engelhard <rene@debian.org>  Thu, 18 Nov 2021 18:50:36 +0100

libreoffice (1:7.2.2-1) unstable; urgency=medium

--- End Message ---
--- Begin Message ---
Source: libreoffice
Source-Version: 1:7.2.3-2
Done: Rene Engelhard <rene@debian.org>

We believe that the bug you reported is fixed in the latest version of
libreoffice, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1000605@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Rene Engelhard <rene@debian.org> (supplier of updated libreoffice package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sun, 28 Nov 2021 15:05:29 +0000
Source: libreoffice
Architecture: source
Version: 1:7.2.3-2
Distribution: unstable
Urgency: medium
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Changed-By: Rene Engelhard <rene@debian.org>
Closes: 1000605
Changes:
 libreoffice (1:7.2.3-2) unstable; urgency=medium
 .
   * debian/changelog: fix (closes: #1000605)
Checksums-Sha1:
 f2cdd0ae17fa7c7994047a463c3f02fae69f8305 30308 libreoffice_7.2.3-2.dsc
 87424d42b7261d3b029b967157ee4a311162f0f4 21784500 libreoffice_7.2.3-2.debian.tar.xz
 647bbbd325cb25bbb67cc07328044bdf36cdc104 34669 libreoffice_7.2.3-2_source.buildinfo
Checksums-Sha256:
 0732e51667359427167173e65e262ec5d5868a851fe813218b14d51f60eb8944 30308 libreoffice_7.2.3-2.dsc
 97bdb8db77391fbdfc1456b4faefba66edc8dd6229dd785d7b523cacc96e0e25 21784500 libreoffice_7.2.3-2.debian.tar.xz
 72563988875f770dc6f6cdfdc67b329f859cfd55ff3991c4660447fb5025182e 34669 libreoffice_7.2.3-2_source.buildinfo
Files:
 64e62a3b733098dfd62b4aa500ff3148 30308 editors optional libreoffice_7.2.3-2.dsc
 6cee654e862d9c0a1c71dd59a4fd4805 21784500 editors optional libreoffice_7.2.3-2.debian.tar.xz
 4f83abfa3586af351529d70dfc58ae72 34669 editors optional libreoffice_7.2.3-2_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQJEBAEBCgAuFiEE4S3qRnUGcM+pYIAdCqBFcdA+PnAFAmGjntgQHHJlbmVAZGVi
aWFuLm9yZwAKCRAKoEVx0D4+cBySD/0TQ4VaiEnThAx3FjBRKYR5U3HiNLmwG1QP
3kR/xRWWzSqaJKWo+Vq2bc4XpkzL30uuk1cOqWb2XgrkNE7WC1nB7GbkeAn5yO02
INbQpL2w9rneOURAdNJVX0Z+b0prED1c2M4pn6XG0nKp7AAq8BX+OqvYknScQxqT
Nc5XLgK0L+jexOAgr1+LmVTUdZFXhywgbe3/ZRjQuD3i/0QYdy0GlfyX9A9vkYsO
MKLEtoUndHvfjeOZVuLZFaMvCANJJe4CAWdcr+1DayMiBQYK8LEAphxrY2BuB/sl
Q97bxxgiU2ThwCyqFHfpQ1kicIqSCyxKlcv21tKe05lEaxOPV9IFDdPsGi2vCGpQ
6MWh9CHECUAsf84sv7WXZLyuEccnqILnejQBj8jbSRJlQW9/9z0BO9Fp0wV11Nj4
bK/vef+dTuUqeFW1JD63GhkJVj1vPqifey64IG74RdiyreYDgjVHIWGuIo8uVo7x
HVOkFpWxdk18izsIDKRFEOPNGujHenYMpg14XJFEt7pgmyY/lIswA6AG9BLGXCfJ
L29d9a1C77iMkOE+SS8sPI7SUI7kOviT0zW2iFjs/8dd3uH3poo284bDbI9gp/sY
XYY6MT+Ec0AAw7X7BmVQhvRn3eFaJDaVwODRKbOIWeZ7yhM91Pdf4rttWQwE771r
O0rkVu3wwg==
=JeP7
-----END PGP SIGNATURE-----

--- End Message ---

Reply to: