Control: reopen -1
On Sat, Feb 01, 2020 at 03:25:11PM +0200, Andriy Grytsenko wrote:
> Hello Andreas!
>
> Thank you very much for the patch. It appears you've done all the
> work and it worked like a charm. All porting guide steps are handled,
> I've rechecked that. Thank you very much.
Apparently you forgot to actually run the application, click the help
button and see what happens.
I've attached a patch which makes a few additional changes that avoids
completely breaking the help system.
To switch away from ghelp: URIs to help: URIs I've found out that it's
apparently needed to do a full docbook to mallard conversion. The URI
scheme is also different where ghelp: is followed by a full path to
an xml file while help: is followed by id, e.g.
help:users-admin or help:users-admin/chapter.
Regards,
Andreas Henriksson
PS. nitpick: The package also ships help for alot more applications than
it installs executables for.
diff -Nru gnome-system-tools-3.0.0/debian/changelog
gnome-system-tools-3.0.0/debian/changelog
--- gnome-system-tools-3.0.0/debian/changelog 2020-02-01 14:10:47.000000000
+0100
+++ gnome-system-tools-3.0.0/debian/changelog 2020-02-14 20:11:18.000000000
+0100
@@ -1,3 +1,13 @@
+gnome-system-tools (3.0.0-9.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix up debian/patches/70_gst-yelp.patch to not completely break help.
+ - revert to using ghelp: URIs.
+ - fix up help file available detection logic for new file location.
+ * Recommend yelp instead of xdg-utils (use gnome-help, not xdg-open).
+
+ -- Andreas Henriksson <andr...@fatal.se> Fri, 14 Feb 2020 20:11:18 +0100
+
gnome-system-tools (3.0.0-9) unstable; urgency=medium
* Bump Standards-Version to 4.5.0.
diff -Nru gnome-system-tools-3.0.0/debian/control
gnome-system-tools-3.0.0/debian/control
--- gnome-system-tools-3.0.0/debian/control 2020-02-01 14:02:37.000000000
+0100
+++ gnome-system-tools-3.0.0/debian/control 2020-02-14 20:11:18.000000000
+0100
@@ -14,7 +14,6 @@
gettext,
libxml-parser-perl,
gnome-pkg-tools,
- yelp,
yelp-tools,
pkg-config
Standards-Version: 4.5.0
@@ -27,7 +26,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
policykit-1-gnome | mate-polkit
-Recommends: xdg-utils
+Recommends: yelp
Suggests: ntp
Replaces: ximian-setup-tools, gnome-network-admin
Conflicts: gnome-network-admin
diff -Nru gnome-system-tools-3.0.0/debian/patches/70_gst-yelp.patch
gnome-system-tools-3.0.0/debian/patches/70_gst-yelp.patch
--- gnome-system-tools-3.0.0/debian/patches/70_gst-yelp.patch 2020-02-01
14:00:24.000000000 +0100
+++ gnome-system-tools-3.0.0/debian/patches/70_gst-yelp.patch 2020-02-14
20:11:18.000000000 +0100
@@ -43,7 +43,7 @@
-DOC_INCLUDES =
-DOC_FIGURES = figures/network-tool.png
+HELP_ID = network-admin
-+HELP_FILES = legal.xml
++HELP_FILES = network-admin.xml legal.xml
+HELP_MEDIA = figures/network-tool.png
-DOC_LINGUAS = ca cs de el en_GB es fr oc pt_BR sl sv it zh_CN
@@ -63,7 +63,7 @@
-DOC_INCLUDES =
-DOC_FIGURES = \
+HELP_ID = services-admin
-+HELP_FILES = legal.xml
++HELP_FILES = services-admin.xml legal.xml
+HELP_MEDIA = \
figures/services-tool.png
@@ -84,7 +84,7 @@
-DOC_FIGURES = figures/shares-tool.png
-DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR sl sv zh_CN
+HELP_ID = shares-admin
-+HELP_FILES = legal.xml
++HELP_FILES = shares-admin.xml legal.xml
+HELP_MEDIA = figures/shares-tool.png
+HELP_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR sl sv zh_CN
@@ -101,7 +101,7 @@
-DOC_INCLUDES =
-DOC_FIGURES = \
+HELP_ID = time-admin
-+HELP_FILES = legal.xml
++HELP_FILES = time-admin.xml legal.xml
+HELP_MEDIA = \
figures/time-map.png \
figures/time-servers.png \
@@ -124,7 +124,7 @@
-DOC_INCLUDES =
-DOC_FIGURES = figures/users-tool.png \
+HELP_ID = users-admin
-+HELP_FILES = legal.xml
++HELP_FILES = users-admin.xml legal.xml
+HELP_MEDIA = figures/users-tool.png \
figures/groups.png
@@ -792,15 +792,15 @@
- done
--- a/src/common/gst-tool.c
+++ b/src/common/gst-tool.c
-@@ -412,9 +412,9 @@
- }
-
- if (section) {
-- command = g_strconcat ("gnome-help ghelp://", uri, "?",
section, NULL);
-+ command = g_strconcat ("xdg-open help://", uri, "?", section,
NULL);
- } else {
-- command = g_strconcat ("gnome-help ghelp://", uri, NULL);
-+ command = g_strconcat ("xdg-open help://", uri, NULL);
- }
+@@ -400,9 +400,9 @@
+ }
+ uri = g_build_filename(DATADIR,
+- "/gnome/help/",
+- help_file,
++ "/help/",
+ lang,
++ help_file,
+ help_file_xml,
+ NULL);
