[Pkg-privacy-commits] [nautilus-wipe] 04/20: Port away from gnome-doc-utils
Intrigeri
intrigeri at moszumanska.debian.org
Tue Jul 12 16:14:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
intrigeri pushed a commit to branch experimental
in repository nautilus-wipe.
commit c4b63d84586471a624030ca4e225c3fd3a73486f
Author: Colomban Wendling <ban at herbesfolles.org>
Date: Sat Jul 9 01:46:16 2016 +0200
Port away from gnome-doc-utils
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829909
https://wiki.gnome.org/Projects/GnomeCommon/Migration
https://wiki.gnome.org/Initiatives/GnomeGoals/NewDocumentationInfrastructure
---
.gitignore | 2 --
Makefile.am | 3 ---
README | 5 +----
autogen.sh | 1 -
configure.ac | 2 +-
help/C/{nautilus-wipe.xml => index.docbook} | 6 +++---
help/C/legal.xml | 2 +-
help/Makefile.am | 12 +++++-------
help/nautilus-wipe.omf.in | 9 ---------
nautilus-wipe/nw-operation-manager.c | 2 +-
10 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/.gitignore b/.gitignore
index 751715a..20d41db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,5 +16,3 @@ build/
po/Makefile.in.in
po/POTFILES
po/*.gmo
-
-help/*.omf
diff --git a/Makefile.am b/Makefile.am
index 15f1eb1..f76419d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,3 @@
SUBDIRS = nautilus-wipe po help
ACLOCAL_AMFLAGS = -I build/m4 -I m4
-
-# gnome-doc-utils: disable scrollkeeper on distclean
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
diff --git a/README b/README
index e6b0077..ddde904 100644
--- a/README
+++ b/README
@@ -22,10 +22,7 @@ Build dependencies
- make
- gcc
- intltool
-- gnome-doc-utils
-
-Some distributions might also require one of `rarian-compat` or
-`scrollkeeper` together with `gnome-doc-utils`.
+- yelp-tools
If you are building from Git rather than a tarball, you also need
`autoconf`, `automake` (>= 1.11.1) and `libtool` (>= 2.2).
diff --git a/autogen.sh b/autogen.sh
index efa6400..d1524b6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,6 @@ mkdir -p build/m4 || exit 1
#gtkdocize --flavour no-tmpl || exit 1
echo "no" | glib-gettextize -f -c || exit 1
intltoolize -c -f --automake || exit 1
-gnome-doc-prepare -c -f || exit 1
autoreconf -vfi || exit 1
#~ ./configure "$@"
diff --git a/configure.ac b/configure.ac
index 09c97e9..7d20dda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AM_PROG_CC_C_O
IT_PROG_INTLTOOL
PKG_PROG_PKG_CONFIG([0.9])
-GNOME_DOC_INIT
+YELP_HELP_INIT
# Checks for libraries.
# 2.6 for gtk_message_dialog_format_secondary_text()
diff --git a/help/C/nautilus-wipe.xml b/help/C/index.docbook
similarity index 98%
rename from help/C/nautilus-wipe.xml
rename to help/C/index.docbook
index 4e7b706..539fb87 100644
--- a/help/C/nautilus-wipe.xml
+++ b/help/C/index.docbook
@@ -145,7 +145,7 @@
<title>Feedback</title>
<!-- XXX: FIXME -->
<para>To report a bug or make a suggestion regarding the &app; application or
- this manual, follow the directions in the <ulink url="ghelp:gnome-feedback"
+ this manual, follow the directions in the <ulink url="help:gnome-feedback"
type="help">GNOME Feedback Page</ulink>.
</para>
<!-- Translators may also add here feedback address for translations -->
@@ -507,7 +507,7 @@
<para>
To report a bug or make a suggestion regarding this application or
this manual, follow the directions in this
- <ulink url="ghelp:gnome-feedback" type="help">document</ulink>.
+ <ulink url="help:gnome-feedback" type="help">document</ulink>.
</para>
-->
<para>
@@ -515,7 +515,7 @@
General Public license as published by the Free Software
Foundation; either version 3 of the License, or (at your option)
any later version. A copy of this license can be found at this
- <ulink url="ghelp:gpl" type="help">link</ulink>, or in the file
+ <ulink url="help:gpl" type="help">link</ulink>, or in the file
COPYING included with the source code of this program.
</para>
</sect1>
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 312c12e..5d73dc0 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -6,7 +6,7 @@
by the Free Software Foundation with no Invariant Sections,
no Front-Cover Texts, and no Back-Cover Texts. You can find
a copy of the GFDL at this <ulink type="help"
- url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+ url="help:fdl">link</ulink> or in the file COPYING-DOCS
distributed with this manual.
</para>
<para> This manual is part of a collection of GNOME manuals
diff --git a/help/Makefile.am b/help/Makefile.am
index e4687b0..8f09d7b 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,9 +1,7 @@
-include $(top_srcdir)/build/aux/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ at YELP_HELP_RULES@
-DOC_MODULE = nautilus-wipe
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES =
+HELP_ID = nautilus-wipe
+HELP_FILES = index.docbook
+HELP_EXTRA = legal.xml
-DOC_LINGUAS =
+HELP_LINGUAS =
diff --git a/help/nautilus-wipe.omf.in b/help/nautilus-wipe.omf.in
deleted file mode 100644
index 3230749..0000000
--- a/help/nautilus-wipe.omf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<omf>
- <resource>
- <subject category="Applications|Security|Other"/>
- <type>manual</type>
- <relation seriesid="0c46eaf2-c138-e4a7-7a95-5390a14b545190"/>
- <rights type="GNU FDL" license.version="1.1" holder="Colomban Wendling"/>
- </resource>
-</omf>
diff --git a/nautilus-wipe/nw-operation-manager.c b/nautilus-wipe/nw-operation-manager.c
index c4171e4..aa08e20 100644
--- a/nautilus-wipe/nw-operation-manager.c
+++ b/nautilus-wipe/nw-operation-manager.c
@@ -282,7 +282,7 @@ help_button_clicked_handler (GtkWidget *widget,
GError *err = NULL;
if (! gtk_show_uri (gtk_widget_get_screen (widget),
- "ghelp:nautilus-wipe?nautilus-wipe-config",
+ "help:nautilus-wipe/nautilus-wipe-config",
gtk_get_current_event_time (),
&err)) {
/* display the error.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/nautilus-wipe.git
More information about the Pkg-privacy-commits
mailing list