Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: dictionaries-com...@packages.debian.org
Control: affects -1 + src:dictionaries-common
Please unblock package dictionaries-common
Sorry I forgot about hard freeze starting 2023-03-12. Did not it
notice until 2023-03-16 message from the release team (Bits from the
Release Team: bookworm in hard freeze), but uploaded this version on
2023-03-14.
Changes are documentation changes in hunspell dictionaries policy to
adjust it to last changes in qt6-webengine-dev that reached testing on
2023-03-09 and a minor change in installdeb-myspell to look for bdic
conversion tool first in new location.
While changes are not at all critical (things will keep working with
old info, new location for bdic conversion tool is just a symlink tp
old one) I would appreciate if last version reaches testing to avoid
having different info in new_stable and sid (and to have my git
history as clean as possible and avoid branches in case something
really important deserves an upload).
I am attaching a full debdiff with all changes from previous version
and a "debdiff -w" file skipping whitespace changes.
Thanks for all and sorry for having missed this.
unblock dictionaries-common/1.29.5
diff -Nru dictionaries-common-1.29.4/debian/changelog dictionaries-common-1.29.5/debian/changelog
--- dictionaries-common-1.29.4/debian/changelog 2023-01-25 23:07:33.000000000 +0100
+++ dictionaries-common-1.29.5/debian/changelog 2023-03-14 22:17:31.000000000 +0100
@@ -1,3 +1,15 @@
+dictionaries-common (1.29.5) unstable; urgency=medium
+
+ [ Soren Stoutner ]
+ * debian/copyright: Update copyright dates to include 2023.
+ * policy/dsdt-policy.xml.in: Update to reflect changes in the Qt
+ packaging.
+
+ [ Agustin Martin Domingo ]
+ * installdeb-myspell: Add /usr/bin/convert-bdic as first option.
+
+ -- Agustin Martin Domingo <agmar...@debian.org> Tue, 14 Mar 2023 22:17:31 +0100
+
dictionaries-common (1.29.4) unstable; urgency=medium
* debian/po/ro.po: Romanian debconf templates translation-revision,
diff -Nru dictionaries-common-1.29.4/debian/copyright dictionaries-common-1.29.5/debian/copyright
--- dictionaries-common-1.29.4/debian/copyright 2022-12-06 22:57:10.000000000 +0100
+++ dictionaries-common-1.29.5/debian/copyright 2023-03-14 22:12:41.000000000 +0100
@@ -5,9 +5,9 @@
Files: *
Copyright: 1999-2008 Rafael Laboissiere <raf...@debian.org>
- 2001-2022 Agustín Martín Domingo <agmar...@debian.org>
- 2003-2016 René Engelhard <r...@debian.org>
- 2022 Soren Stoutner <so...@stoutner.com>
+ 2001-2023 Agustín Martín Domingo <agmar...@debian.org>
+ 2003-2016 René Engelhard <r...@debian.org>
+ 2022-2023 Soren Stoutner <so...@stoutner.com>
License: GPL-2+
Files: support/emacsen/ispell.el
diff -Nru dictionaries-common-1.29.4/policy/dsdt-policy.xml.in dictionaries-common-1.29.5/policy/dsdt-policy.xml.in
--- dictionaries-common-1.29.4/policy/dsdt-policy.xml.in 2022-12-13 18:24:52.000000000 +0100
+++ dictionaries-common-1.29.5/policy/dsdt-policy.xml.in 2023-03-14 22:12:41.000000000 +0100
@@ -139,7 +139,7 @@
</releaseinfo>
<copyright>
<year>
- 1999-2014,2022
+ 1999-2014,2022-2023
</year>
<holder>
Rafael Laboissière, David Coe, Agustín
@@ -779,19 +779,15 @@
myspell dictionary package.
</para>
</listitem>
- <listitem>
- <para>
- Hunspell dictionary packages should build-depend on
- <literal>qt6-webengine-dev-tools</literal> or a superseding package
- so that they can use <command>qwebengine_convert_dict</command> to
- generate the binary <filename>.bdic</filename> dictionary files.
- Although <command>qwebengine_convert_dict</command> is also
- available in <literal>qtwebengine5-dev-tools</literal> (in a
- different path) its use is discouraged as it will disappear
- sooner.
- For more information see <xref linkend="hunspell-bdic"/>.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Hunspell dictionary packages should build-depend on the
+ <literal>convert-bdic</literal> package so that they can use the
+ <command>convert-bdic</command> command to generate the binary
+ <filename>.bdic</filename> dictionary files.
+ For more information see <xref linkend="hunspell-bdic"/>.
+ </para>
+ </listitem>
</itemizedlist>
</sect2>
<!-- * -->
@@ -1357,106 +1353,105 @@
<title>Hunspell Binary Dictionaries</title>
<!-- ********************************************************************* -->
<para>
- Google's Chromium project developed a binary Hunspell file
- format used for spell checking by their web engine.
- The binary format combines the
- text-based <filename>.dic</filename>
- and <filename>.aff</filename> files into
- one <filename>.bdic</filename> binary file.
- Other web engines that are based on Chromium's code, like Qt
- WebEngine included in KDE, can also use
- these <filename>.bdic</filename> dictionaries.
- </para>
- <para>
- Google created a tool called <command>convert_dict</command>
- that takes the input from a pair of <filename>.dic</filename>
- and <filename>.aff</filename> files and compiles them into a
- binary <filename>.bdic</filename> file.
- Qt distributes a renamed version of this tool
- called <command>qwebengine_convert_dict</command> that is
- shipped in Debian as part of
- the <literal>qt6-webengine-dev-tools</literal> package.
- </para>
- <para>
- Hunspell dictionaries should build-depend on
- <literal>qt6-webengine-dev-tools</literal> or a newer package
- that supersedes it.
- During binary package creation they should compile the binary
- dictionary by calling a command similar to the following
- where <filename>xx_XX</filename> corresponds to the language of
- the Hunspell dictionary.
- The <filename>.dic</filename> needs to reside in the same
- directory as the <filename>.aff</filename> during binary
- compilation so that <command>qwebengine_convert_dict</command>
- can locate it.
+ Google's Chromium project developed a binary Hunspell file
+ format used for spell checking by their web engine.
+ The binary format combines the
+ text-based <filename>.dic</filename>
+ and <filename>.aff</filename> files into
+ one <filename>.bdic</filename> binary file.
+ Other web engines that are based on Chromium's code, like Qt
+ WebEngine included in KDE, can also use
+ these <filename>.bdic</filename> dictionaries.
+ </para>
+ <para>
+ Google created a tool called <command>convert_dict</command>
+ that takes the input from a pair of <filename>.dic</filename>
+ and <filename>.aff</filename> files and compiles them into a
+ binary <filename>.bdic</filename> file.
+ Qt distributes a renamed version of this tool
+ called <command>qwebengine_convert_dict</command> that is
+ currently shipped in Debian as part of
+ the <literal>qt6-webengine-dev-tools</literal> package.
+ </para>
+ <para>
+ Because the versions of Qt available in Debian change over time,
+ the latest version of Qt that ships
+ <command>qwebengine_convert_dict</command> will always provide a
+ virtual package named <literal>convert-bdic</literal> which will
+ install a symlink from <filename>/usr/bin/convert-bdic</filename>
+ to the current versioned location of
+ <filename>qwebengine_convert_dict</filename>.
+ </para>
+ <para>
+ Hunspell dictionaries should build-depend on
+ <literal>convert-bdic</literal>. During binary package creation
+ they should compile the binary dictionary by calling a command
+ similar to the following where <filename>xx_XX</filename>
+ corresponds to the language of the Hunspell dictionary.
+ The <filename>.aff</filename> needs to reside in the same
+ directory as the <filename>.dic</filename> during binary compilation so
+ that <command>convert-bdic</command> can locate it.
</para>
<programlisting>
-/usr/lib/qt6/libexec/qwebengine_convert_dict path/to/xx_XX.dic path/to/xx_XX.bdic</programlisting>
+convert-bdic path/to/xx_XX.dic path/to/xx_XX.bdic</programlisting>
<para>
- Compiled <filename>.bdic</filename> files should be installed in
- <filename>/usr/share/hunspell-bdic</filename>.
- They should be shipped in the same binary package as the
- corresponding <filename>.dic</filename> and
- <filename>.aff</filename> files.
+ Compiled <filename>.bdic</filename> files should be installed in
+ <filename>/usr/share/hunspell-bdic</filename>.
+ They should be shipped in the same binary package as the
+ corresponding <filename>.dic</filename> and
+ <filename>.aff</filename> files.
</para>
<para>
- There are two bugs in <command>qwebengine_convert_dict</command>
- that cause it to fail to build a <filename>.bdic</filename>
- under certain conditions.
+ There are two bugs in <command>convert-bdic</command>
+ that cause it to fail to build a <filename>.bdic</filename>
+ under certain conditions.
</para>
<itemizedlist>
- <listitem>
- <para>
- <ulink url="https://bugreports.qt.io/browse/QTBUG-107601";>Really
- long words are not supported</ulink>.
- </para>
- </listitem>
- <listitem>
- <para>
- <ulink url="https://bugreports.qt.io/browse/QTBUG-107600";>The
- IGNORE command is not supported</ulink>.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <ulink url="https://bugreports.qt.io/browse/QTBUG-107601";>Really
+ long words are not supported</ulink>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="https://bugreports.qt.io/browse/QTBUG-107600";>The
+ IGNORE command is not supported</ulink>.
+ </para>
+ </listitem>
</itemizedlist>
<para>
- As a workaround while waiting for an upstream solution to these
- bugs, the <filename>.bdic</filename> files should be created in
- these scenarios by removing the really longs words from the
- <filename>.dic</filename> or the <literal>IGNORE</literal>
- entries from the <filename>.aff</filename> files before
- compiling the <filename>.bdic</filename> files.
- Because these entries are of value to the general Hunspell
- system, the modifications should be made to temporary copies of
- the <filename>.dic</filename> and <filename>.aff</filename>
- files that are only used to generate the
- <filename>.bdic</filename> files and are then discarded.
- </para>
- <para>
- In Debian, programs that include Qt WebEngine will load
- dictionaries in the <filename>.bdic</filename> format from
- <filename>/usr/share/qt6/qtwebengine_dictionaries</filename> or
- a similar directory that corresponds to the version of Qt they
- are built from.
- Beyond the loading of the dictionaries, upstream programs must
- include their own code that enumerates the available
- dictionaries in order to create a GUI for selecting available
- languages.
- To facilitate this, the Qt/KDE maintainers should make sure that
- <filename>$QT_INSTALL_DATA/qtwebengine_dictionaries</filename>
- as determined by <command>qmake -query | grep QT_INSTALL_DATA</command> is
- always a symlink to <filename>/usr/share/hunspell-bdic</filename>.
- </para>
- <para>
- Further information about the <filename>.bdic</filename> file
- format can be found in the upstream documentation maintained
- by <ulink
-url="https://sites.google.com/a/chromium.org/dev/developers/how-tos/editing-the-spell-checking-dictionaries";>Google</ulink>
- and <ulink
-url="https://doc.qt.io/qt-6/qtwebengine-features.html#spellchecker";>Qt</ulink>.
- The discussion about the inclusion of Hunspell binary
- dictionaries in Debian can be found in the <ulink
-url="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1020387";>dictionaries-common
- bug report</ulink>.
+ As a workaround while waiting for an upstream solution to these
+ bugs, the <filename>.bdic</filename> files should be created in
+ these scenarios by removing the really longs words from the
+ <filename>.dic</filename> or the <literal>IGNORE</literal>
+ entries from the <filename>.aff</filename> files before
+ compiling the <filename>.bdic</filename> files.
+ Because these entries are of value to the general Hunspell
+ system, the modifications should be made to temporary copies of
+ the <filename>.dic</filename> and <filename>.aff</filename>
+ files that are only used to generate the
+ <filename>.bdic</filename> files and are then discarded.
+ </para>
+ <para>
+ The Qt packages will install the following system-wide environment
+ variable in <filename>/etc/environment.d/</filename> so that
+ programs that use Qt WebEngine will be able to find the
+ <filename>.bdic</filename> dictionaries:
+ </para>
+ <programlisting>
+QTWEBENGINE_DICTIONARIES_PATH=/usr/share/hunspell-bdic/</programlisting>
+ <para>
+ Further information about the <filename>.bdic</filename> file
+ format can be found in the upstream documentation maintained
+ by <ulink
+ url="https://sites.google.com/a/chromium.org/dev/developers/how-tos/editing-the-spell-checking-dictionaries";>Google</ulink>
+ and <ulink
+ url="https://doc.qt.io/qt-6/qtwebengine-features.html#spellchecker";>Qt</ulink>.
+ The discussion about the inclusion of Hunspell binary
+ dictionaries in Debian can be found in the <ulink
+ url="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1020387";>dictionaries-common
+ bug report</ulink>.
</para>
</sect2>
<!-- * -->
diff -Nru dictionaries-common-1.29.4/scripts/debhelper/installdeb-myspell dictionaries-common-1.29.5/scripts/debhelper/installdeb-myspell
--- dictionaries-common-1.29.4/scripts/debhelper/installdeb-myspell 2022-12-16 09:33:49.000000000 +0100
+++ dictionaries-common-1.29.5/scripts/debhelper/installdeb-myspell 2023-03-14 22:15:20.000000000 +0100
@@ -42,8 +42,9 @@
"hunspell-bdic" => "/usr/share/hunspell-bdic",
"hyphenation" => "/usr/share/hyphen",
"thesauri" => "/usr/share/mythes");
-my @bdic_convert_tools = ("/usr/lib/qt6/libexec/qwebengine_convert_dict",
- "/usr/lib/qt5/bin/qwebengine_convert_dict");
+my @bdic_convert_tools = ( "/usr/bin/convert-bdic",
+ "/usr/lib/qt6/libexec/qwebengine_convert_dict",
+ "/usr/lib/qt5/bin/qwebengine_convert_dict");
my $bdic_convert_tool;
if ( $bdic_only ){
