Small patch



Hi,

I'm not opening a bug, but if it's necessary I'll do it.

I was looking at brasero doc and found that the omf file in help/ was
still reporting the old documentation license that was CC by SA, but we
updated it to the GFDL.

The small patch also add a couple more variables to Makefile.am and
configure.in in the top directory. I've added those based on this
document [1] (apart the GTK_DOC_CHECK).

The only thing that need to be done is to add the m4/ directory in the
top directory for storing all aclocal macro created during autogen.sh.

Two more things that I noticed:
- while running autogen.sh, automake complains about the
gnome-doc-utils.make file and gives quite a lot of errors. I've run this
on Ubuntu 8.04 with automake 1.10, using 1.9 doesn't complain at all
- the Help entry in the menubar doesn't have the voice Contents for
accessing the documentation.

Hope this can help. :)

Bye!

[1] http://library.gnome.org/devel/gnome-doc-make/0.12/migrating.html.en


-- 
Milo Casagrande <milo_casagrande yahoo it>
Index: configure.in
===================================================================
--- configure.in	(revisione 818)
+++ configure.in	(copia locale)
@@ -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
Index: help/brasero.omf.in
===================================================================
--- help/brasero.omf.in	(revisione 818)
+++ help/brasero.omf.in	(copia locale)
@@ -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>
Index: Makefile.am
===================================================================
--- Makefile.am	(revisione 818)
+++ Makefile.am	(copia locale)
@@ -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,13 +10,19 @@
 	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:

Attachment: signature.asc
Description: Questa =?ISO-8859-1?Q?=E8?= una parte del messaggio firmata digitalmente



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