Your message dated Sun, 05 Jul 2020 06:33:36 +0000
with message-id <[email protected]>
and subject line Bug#962960: fixed in kdiff3 1.8.3-1
has caused the Debian Bug report #962960,
regarding kdiff3: Choose X Everywhere / For All Unsolved menu items missing
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 [email protected]
immediately.)
--
962960: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=962960
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: kdiff3
Version: 1.8.01-1+b1
Severity: normal
The Merge menu items to Choose A/B/C Everywhere or For All Unsolved
(Whitespace) Conflicts are not showing up in the kdiff3 build in bullseye.
Downgrading to the version in buster and they show up again.
I also tried 1.8.01-1 from snapshot.debian.org and it has the same issue.
The changelog shows this entry:
Don't enable "Choose C for Everthing" on two way merge
but this is also seeming to happen on 3 way merge (via git mergetool)
-- System Information:
Debian Release: bullseye/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'stable-updates'), (500, 'stable'), (490,
'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.6.0-2-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages kdiff3 depends on:
ii kio 5.70.1-1
ii libc6 2.30-8
ii libkf5configcore5 5.70.0-1
ii libkf5configwidgets5 5.70.0-1
ii libkf5coreaddons5 5.70.0-1
ii libkf5crash5 5.70.0-1
ii libkf5i18n5 5.70.0-1
ii libkf5iconthemes5 5.70.0-1
ii libkf5kiocore5 5.70.1-1
ii libkf5kiowidgets5 5.70.1-1
ii libkf5parts5 5.70.0-1
ii libkf5textwidgets5 5.70.0-1
ii libkf5widgetsaddons5 5.70.0-1
ii libkf5xmlgui5 5.70.0-1
ii libqt5core5a 5.12.5+dfsg-10+b1
ii libqt5gui5 5.12.5+dfsg-10+b1
ii libqt5printsupport5 5.12.5+dfsg-10+b1
ii libqt5widgets5 5.12.5+dfsg-10+b1
ii libstdc++6 10.1.0-3
Versions of packages kdiff3 recommends:
ii kdiff3-doc 1.8.01-1
kdiff3 suggests no packages.
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: kdiff3
Source-Version: 1.8.3-1
Done: Pino Toscano <[email protected]>
We believe that the bug you reported is fixed in the latest version of
kdiff3, 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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Pino Toscano <[email protected]> (supplier of updated kdiff3 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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 05 Jul 2020 08:17:21 +0200
Source: kdiff3
Architecture: source
Version: 1.8.3-1
Distribution: unstable
Urgency: medium
Maintainer: Debian KDE Extras Team <[email protected]>
Changed-By: Pino Toscano <[email protected]>
Closes: 939017 962960
Changes:
kdiff3 (1.8.3-1) unstable; urgency=medium
.
* New upstream release:
- fixes handling of the -L command line option (Closes: #939017)
- fixes missing menu items (Closes: #962960)
* Update the build dependencies according to the upstream build system:
- bump the KF packages to 5.27.0
* Update the patches:
- upstream_Don-t-try-to-set-value-unless-scrollbar-exists.patch: drop,
backported from upstream
- libatomic.diff: refresh
* Add the upstream signing key.
* Do not ship the diff_ext.mo translations, as they are for a component
specific for Windows.
Checksums-Sha1:
ef94d6375b6869ef77d2f992cf16e90125fd9fd6 2677 kdiff3_1.8.3-1.dsc
ee8af1d5bd357aecbe32952856b4e31db2cb355a 1038904 kdiff3_1.8.3.orig.tar.xz
9eecf012b30cd59925af931cc41ba55c5fd0c105 833 kdiff3_1.8.3.orig.tar.xz.asc
0d732aa96edac53bd3d39d357edc8d94078d8300 8532 kdiff3_1.8.3-1.debian.tar.xz
1a43e55298c4d530d5805ddf69e965a618abe4b5 19494 kdiff3_1.8.3-1_source.buildinfo
Checksums-Sha256:
c1c6629141f455afe9d4d7033ea7c40c943073ca429b462231e49e086cec71ad 2677
kdiff3_1.8.3-1.dsc
2f35e9357a303144e3dd5a033a1a8caa70d3eecdb355213e9473cd04bc308bab 1038904
kdiff3_1.8.3.orig.tar.xz
b20635f05a9d15e94216dcefd41018f7c7a900a284a26176307c95b299f64a8d 833
kdiff3_1.8.3.orig.tar.xz.asc
fd0f8985c23e150a5897fa5e7cfd6eecf82b1b5509d0655c1d4add99c3c72255 8532
kdiff3_1.8.3-1.debian.tar.xz
517502ff9688aa265ace0b9d42a782feecede081d88ee4fad3e1509edfff9bb1 19494
kdiff3_1.8.3-1_source.buildinfo
Files:
1ad4f1d00660e23b2357327db664b3f8 2677 kde optional kdiff3_1.8.3-1.dsc
1ed4861a68c308a20dac817d4eae2dbf 1038904 kde optional kdiff3_1.8.3.orig.tar.xz
9cbe29bb588712c72cd0f8fe638d6c94 833 kde optional kdiff3_1.8.3.orig.tar.xz.asc
e1ae68e199f61d3324f2f3704d5bd7c9 8532 kde optional kdiff3_1.8.3-1.debian.tar.xz
315edc326219164d5973f4e2d3615f2f 19494 kde optional
kdiff3_1.8.3-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEXyqfuC+mweEHcAcHLRkciEOxP00FAl8BcJoACgkQLRkciEOx
P00KsA//YfbvHfOd9w2CU3SNt8DkkwyrgB4RfzzWepPyZatQJ9oJTNbbayZ3cfza
RxFgwj8AzYKVBV3/YKzyssx6JDnAEuZYgfrcgAXvn5cXIPGtxD2jZllM3j/fp+N2
PPeQQpPIfPzyaolnCOM/2MZwVa5thsCsWyFdVWOkJ2y6DUeqZ24hbx2HAwMs0a2y
bGLTzVxO1n+W+tnVFcpBn+z6+rrhjA+7hESWnXRrE8SEYQ1JLTTK0AouEzqZK0Q/
Kc4rYwxPwD80oUSeddI9AgaYSmVZeOPmzYvqYp4j+7+rfLptCdgqh+fzBnIEJ9B2
Qi2NQKdt8xPoyn7/2bciGwYCtpSpTQ4fi9kaFxdynJFzjGCXhWe1RMkxZF3X29U6
yO8uaDiRZc7rRk7FicLMrlqjtRwWK62seY7cJe4/GFPmYlTOmoAheIJNDF/Q+iM8
GDGzXMsff1olLBBLsP9r0CXQu0ck87Lw5hqCjZ6Jj19coW0RynYJvXaT3JcJ8hYP
r0vuu+eaw+vMhCw2lRLpAAGzt35bpdxOVSMS1wcUCKQXWZo85yBSmBMkwy7LxDuu
kTYEUOz7wlytx3DMgfcbmvyvOx/H5NBDxGyzbmgPHuiy8DBxF1ncefT/rEj56Y1e
hW+33RAK8EEE/ZucZN0wJ4azqCqjwBA3mZFglg6oTiwHtUlEEEE=
=IubT
-----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________
pkg-kde-extras mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-kde-extras
