brasero r819 - in trunk: . help src

[philippr svn gnome org]

Author: philippr
Date: Tue May 20 15:21:53 2008
New Revision: 819
URL: http://svn.gnome.org/viewvc/brasero?rev=819&view=rev

Log:
	Fixes for help system:
	- added entry in help menu
	- patch from Milo Casagrande

	* Makefile.am:
	* configure.in:
	* help/brasero.omf.in:
	* src/brasero-menu.h:

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/help/brasero.omf.in
   trunk/src/brasero-menu.h

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue May 20 15:21:53 2008
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in.
-SUBDIRS = src po data docs
+SUBDIRS = src po data docs help
 
 braserodocdir = ${prefix}/docs/brasero
 
@@ -10,14 +10,20 @@
 	MAINTAINERS		\
 	NEWS			\
 	README			\
-	acinclude.m4
+	acinclude.m4		\
+	gnome-doc-utils.make	\
+	m4
 
 noinst_PROGRAMS =
 
+DIST_CHECK_CONFIGRE_FLAGS =
+	--disable-scrollkeeper
+
 DISTCLEANFILES = \
 	intltool-extract \
 	intltool-merge \
-	intltool-update
+	intltool-update \
+	gnome-doc-utils.make
 
 # Copy all the spec files. Of cource, only one is actually used.
 dist-hook:

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue May 20 15:21:53 2008
@@ -26,6 +26,8 @@
 AC_DEFINE_UNQUOTED(BRASERO_SUB, $BRASERO_SUB, [sub version])
 AC_DEFINE_UNQUOTED(BRASERO_VERSION, $BRASERO_VERSION, [version])
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_INIT_AUTOMAKE(brasero, $BRASERO_VERSION)
 AM_CONFIG_HEADER(config.h)
 
@@ -97,6 +99,7 @@
 HAL_REQUIRED=0.5
 DBUS_REQUIRED=0.7.2
 
+GTK_DOC_CHECK([1.3])
 GNOME_DOC_INIT
 
 dnl ** used by brasero and one plugin

Modified: trunk/help/brasero.omf.in
==============================================================================
--- trunk/help/brasero.omf.in	(original)
+++ trunk/help/brasero.omf.in	Tue May 20 15:21:53 2008
@@ -4,6 +4,6 @@
     <subject category="GNOME|Applications|Sound and Video"/>
     <type>manual</type>
     <relation seriesid="e598da9a-cac2-11dc-9a51-a5e81ce6f0a9"/>
-    <rights type="Creative Commons by Attribution-ShareAlike" license.version="2.5" holder="Phil Bull"/>
+    <rights type="GNU FDL" license.version="1.1" holder="Phil Bull"/>
   </resource>
 </omf>

Modified: trunk/src/brasero-menu.h
==============================================================================
--- trunk/src/brasero-menu.h	(original)
+++ trunk/src/brasero-menu.h	Tue May 20 15:21:53 2008
@@ -110,6 +110,7 @@
 		"<menuitem action='Check'/>"
 	    "</menu>"
 	    "<menu action='HelpMenu'>"
+		"<menuitem action='Contents'/>"
 		"<menuitem action='About'/>"
 	    "</menu>"
 	    "</menubar>"