Bug#1033281: unblock: dictionaries-common/1.29.5
El mar, 21 mar 2023 a las 9:40, Agustin Martin (<agmartin@debian.org>) escribió:
>
> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> X-Debbugs-Cc: dictionaries-common@packages.debian.org
> Control: affects -1 + src:dictionaries-common
>
> Please unblock package dictionaries-common
...
> 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.
debdiff -w output really attached. Sorry for the noise.
diff -Nru -w 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 <agmartin@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 -w 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 <rafael@debian.org>
- 2001-2022 Agustín Martín Domingo <agmartin@debian.org>
+ 2001-2023 Agustín Martín Domingo <agmartin@debian.org>
2003-2016 René Engelhard <rene@debian.org>
- 2022 Soren Stoutner <soren@stoutner.com>
+ 2022-2023 Soren Stoutner <soren@stoutner.com>
License: GPL-2+
Files: support/emacsen/ispell.el
diff -Nru -w 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
@@ -781,14 +781,10 @@
</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.
+ 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>
@@ -1374,24 +1370,30 @@
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
+ 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>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.
+ <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>.
@@ -1400,7 +1402,7 @@
<filename>.aff</filename> files.
</para>
<para>
- There are two bugs in <command>qwebengine_convert_dict</command>
+ There are two bugs in <command>convert-bdic</command>
that cause it to fail to build a <filename>.bdic</filename>
under certain conditions.
</para>
@@ -1432,20 +1434,13 @@
<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>.
+ 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
diff -Nru -w 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,7 +42,8 @@
"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",
+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;
Reply to: