[brasero] Port to new documentation infrastructure



commit a193b000a7f7b1a6c75ddd786559c84f5b81ffbb
Author: Javier JardÃn <jjardon gnome org>
Date:   Fri Aug 17 02:41:37 2012 +0900

    Port to new documentation infrastructure
    
    Use yelp-tools instead gnome-doc-utils

 Makefile.am       |    3 +--
 autogen.sh        |    2 +-
 configure.in      |    2 +-
 help/Makefile.am  |   11 +++++------
 src/brasero-app.c |    2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index eee1121..cdaa64b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,7 @@ EXTRA_DIST = 			\
 	README			\
 	intltool-extract.in	\
 	intltool-merge.in	\
-	intltool-update.in	\
-	gnome-doc-utils.make
+	intltool-update.in
 
 noinst_PROGRAMS =
 
diff --git a/autogen.sh b/autogen.sh
index 39966d4..46241e9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,4 +18,4 @@ which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME CVS"
     exit 1
 }
-REQUIRED_AUTOMAKE_VERSION=1.7 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh --enable-gtk-doc "$@"
+REQUIRED_AUTOMAKE_VERSION=1.7 USE_GNOME2_MACROS=1 . gnome-autogen.sh --enable-gtk-doc "$@"
diff --git a/configure.in b/configure.in
index e1110a5..8864991 100644
--- a/configure.in
+++ b/configure.in
@@ -54,7 +54,7 @@ dnl **************** Support GSettings *************************
 GLIB_GSETTINGS
 
 dnl **************** documentation *****************************
-GNOME_DOC_INIT
+YELP_HELP_INIT
 GTK_DOC_CHECK([1.12])
 
 dnl ***************** GNOME MACROS *****************************
diff --git a/help/Makefile.am b/help/Makefile.am
index ed22026..9d98574 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,14 +1,13 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
 # Module name
-DOC_ID = brasero
+HELP_ID = brasero
 
 # List of figures to be included
-DOC_FIGURES = figures/brasero-main-window.png
+HELP_MEDIA = figures/brasero-main-window.png
 
 # List of pages
-DOC_PAGES = \
+HELP_FILES = \
 	create-cover.page \
 	index.page \
 	introduction.page \
@@ -25,6 +24,6 @@ DOC_PAGES = \
 	tools-check-integrity.page
 
 # List of translations
-DOC_LINGUAS = bg ca cs de el en_GB es eu fi fr gl hu it ko lv pl ro ru sl te sv zh_CN zh_HK zh_TW
+HELP_LINGUAS = bg ca cs de el en_GB es eu fi fr gl hu it ko lv pl ro ru sl te sv zh_CN zh_HK zh_TW
 
 -include $(top_srcdir)/git.mk
diff --git a/src/brasero-app.c b/src/brasero-app.c
index 4d8a9d1..d345941 100644
--- a/src/brasero-app.c
+++ b/src/brasero-app.c
@@ -1237,7 +1237,7 @@ on_help_cb (GtkAction *action, BraseroApp *app)
 
 	priv = BRASERO_APP_PRIVATE (app);
 
- 	gtk_show_uri (NULL, "ghelp:brasero", gtk_get_current_event_time (), &error);
+	gtk_show_uri (NULL, "help:brasero", gtk_get_current_event_time (), &error);
    	if (error) {
 		GtkWidget *d;
         



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]