balsa r7985 - in trunk: . doc doc/C doc/de sounds src

From: pawels svn gnome org
To: svn-commits-list gnome org
Subject: balsa r7985 - in trunk: . doc doc/C doc/de sounds src
Date: Tue, 14 Oct 2008 20:49:43 +0000 (UTC)
Author: pawels
Date: Tue Oct 14 20:49:42 2008
New Revision: 7985
URL: http://svn.gnome.org/viewvc/balsa?rev=7985&view=rev

Log:
* bootstrap.sh: run gnome-doc-prepare.
* src/Makefile.am: clean generated IDL files.
* doc/C/balsa.xml: follow DTD.
* doc/Makefile.am: use new gnome-doc format.
* sounds/Makefile.am: clean up generated files.
* configure.in: detect gnome-doc
* Makefile.am: adapt to gnome-doc.


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/balsa.spec.in
   trunk/bootstrap.sh
   trunk/configure.in
   trunk/doc/C/balsa.xml
   trunk/doc/Makefile.am
   trunk/doc/de/balsa.xml
   trunk/sounds/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Oct 14 20:49:42 2008
@@ -13,6 +13,27 @@
 desktop_DATA = balsa.desktop
 @INTLTOOL_DESKTOP_RULE@
 
+if BUILD_WITH_G_D_U
+EXTRA_DIST = \
+	balsa.1.in \
+	balsa.spec.in \
+	balsa.desktop.in \
+	intltool-extract.in	\
+	intltool-merge.in	\
+	intltool-update.in	\
+	gnome-balsa2.png \
+	bootstrap.sh	\
+	mkinstalldirs	\
+	HACKING			\
+	docs/mh-mail-HOWTO	\
+	docs/vconvert.awk	\
+	docs/pine2vcard		\
+	GNOME_Balsa.server.in	\
+	balsa-mail.lang		\
+	balsa-mail-style.xml	\
+	gnome-doc-utils.make
+
+else
 EXTRA_DIST = \
 	balsa.1.in \
 	balsa.spec.in \
@@ -30,6 +51,10 @@
 	GNOME_Balsa.server.in	\
 	balsa-mail.lang		\
 	balsa-mail-style.xml
+endif
+DISTCLEANFILES = $(desktop_DATA) $(server_DATA) \
+	intltool-extract intltool-merge intltool-update	\
+	gnome-doc-utils.make
 
 serverdir       = $(libdir)/bonobo/servers
 server_in_files = GNOME_Balsa.server

Modified: trunk/balsa.spec.in
==============================================================================
--- trunk/balsa.spec.in	(original)
+++ trunk/balsa.spec.in	Tue Oct 14 20:49:42 2008
@@ -42,6 +42,7 @@
 BuildRequires: libnotify-devel
 BuildRequires: openssl-devel
 BuildRequires: scrollkeeper
+BuildRequires: gnome-doc-utils
 %endif
 %if %mdk
 BuildRequires:  libgnome-vfs2_0-devel

Modified: trunk/bootstrap.sh
==============================================================================
--- trunk/bootstrap.sh	(original)
+++ trunk/bootstrap.sh	Tue Oct 14 20:49:42 2008
@@ -4,6 +4,13 @@
 glib-gettextize --force --copy || exit 1
 echo "running intltoolize..."
 intltoolize --copy --force --automake || exit 1
+echo "Running gnome-doc-prepare --force - ignore errors."
+if gnome-doc-prepare --force > /dev/null 2>&1; then
+   :
+else
+    test -L gnome-doc-utils.make && rm gnome-doc-utils.make
+    touch gnome-doc-utils.make
+fi
 echo "Running libtoolize..."
 libtoolize --force || exit 1
 echo "Running aclocal..."

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Oct 14 20:49:42 2008
@@ -9,7 +9,6 @@
 dnl Boilerplace and versioning
 dnl ###########################################################################
 
-SCROLLKEEPER_REQUIRED=0.1.4
 BALSA_MAJOR=2
 BALSA_REVISION=3
 BALSA_PATCHLEVEL=26
@@ -22,6 +21,7 @@
 
 AM_INIT_AUTOMAKE(balsa, "$BALSA_MAJOR.$BALSA_REVISION.${BALSA_PATCHLEVEL}")
 AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER([config.h])
 
 AC_DEFINE_UNQUOTED(BALSA_MAJOR, $BALSA_MAJOR,
@@ -224,18 +224,37 @@
 dnl 3. Programs: compilers and their options.
 dnl #####################################################################
 AC_PROG_CC
-dnl AM_PROG_LIBTOOL
-AC_PROG_RANLIB
+AM_PROG_LIBTOOL
+dnl AC_PROG_RANLIB
 AC_PROG_LN_S
 
+# pkg-config
+#
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
 # scrollkeeper.
 #
-if test x$with_gnome != xno; then
-AC_SUBST(SCROLLKEEPER_REQUIRED)
-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
-if test x$SCROLLKEEPER_CONFIG = xno; then
-      AC_MSG_ERROR([Couldn't find scrollkeeper-config, please install the scrollkeeper package])
+
+AC_MSG_CHECKING([whether we have gnome-doc-utils])
+if $PKG_CONFIG --exists gnome-doc-utils; then
+    AC_PATH_PROG(gdtool, gnome-doc-tool, no)
+    if test "$gdtool" = no; then
+    with_g_d_u=no
+    else
+    with_g_d_u=yes
+    fi
+else
+    with_g_d_u=no
 fi
+
+AC_MSG_RESULT($with_g_d_u)
+AM_CONDITIONAL([BUILD_WITH_G_D_U], [test $with_g_d_u = "yes"])
+
+if test $with_g_d_u = yes ; then
+GNOME_DOC_INIT
+else
+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[false])
+AM_CONDITIONAL([ENABLE_SK],[false])
 fi
 
 # glib-genmarshal
@@ -269,7 +288,6 @@
 dnl GtkPrint
 dnl #####################################################################
 
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test x"$with_gtkprint" = xtestme ; then
   AC_MSG_CHECKING([for gtk+ >= 2.10])
   if $PKG_CONFIG --atleast-version=2.10.0 gtk+-2.0 ; then
@@ -478,6 +496,8 @@
 		AC_MSG_WARN([cannot find a suitable gpg application])
 		AC_MSG_WARN([please consider using --with-gpg-app to specify it])
 	fi
+else
+	AC_MSG_RESULT([no])
 fi
 
 # s/mime is mature for gpg >= 2.0.4
@@ -888,7 +908,6 @@
 images/16x16/Makefile
 images/24x24/Makefile
 doc/Makefile
-doc/C/Makefile
 libbalsa/Makefile
 libbalsa/imap/Makefile
 libinit_balsa/Makefile

Modified: trunk/doc/C/balsa.xml
==============================================================================
--- trunk/doc/C/balsa.xml	(original)
+++ trunk/doc/C/balsa.xml	Tue Oct 14 20:49:42 2008
@@ -55,7 +55,12 @@
 
 <articleinfo>
 
-<title>Balsa User's Guide</title>
+<title><application>&Balsa;</application> Balsa User's Guide</title>
+
+<author role="maintainer">
+<firstname>Pawel</firstname>
+<surname>Salek</surname>
+</author>
 
 <copyright>
   <year>1997-2006</year>
@@ -93,10 +98,25 @@
 </legalnotice>
 
 <releaseinfo> 
-This is version 2.721 of the &Balsa; manual.
+This is version 2.721 of the Balsa manual.
 </releaseinfo>
 
-<revhistory><revision><date>26 February 2006</date></revision></revhistory>
+<revhistory>
+    <revision>
+        <revnumber>
+            2.721
+        </revnumber>
+        <date>
+            26 February 2006
+        </date>
+    </revision>
+</revhistory>
+
+<abstract role="description">
+    <para>
+        This document is the extensive balsa manual.
+    </para>
+</abstract>
 
 </articleinfo>
 
@@ -251,7 +271,8 @@
   here.
 </para>
 
-  <sect2 id="menubar">
+
+<sect2 id="menu-toolbar">
   <title>Menu &amp; Toolbar</title>
 
   <figure>
@@ -806,8 +827,13 @@
 
   </listitem>
 </varlistentry>
+</variablelist>
+</sect2>
 
 <sect2 id="subwin-messagemenu">
+<title>Message Menu</title>
+
+<variablelist>
 <varlistentry>
   <term><guimenu>Message</guimenu></term>
   
@@ -964,16 +990,13 @@
 	</para>
       </listitem>
 
-    <listitem>
-      <itemizedlist>
 
-	<variablelist>
-	  <varlistentry>
-    <term>
+    <listitem>
+      <para>
       <menuchoice>
         <guimenu>Message</guimenu><guisubmenu>Toggle flag</guisubmenu>
       </menuchoice>
-    </term>
+      <itemizedlist>
 
 	<listitem>
 	  <para>
@@ -1036,11 +1059,8 @@
        Toggles the reply icon for a message.
 	  </para>
 	</listitem>
-
-	  </varlistentry>
-	</variablelist>
-
       </itemizedlist>
+      </para>
     </listitem>
 
       <listitem>
@@ -1059,8 +1079,10 @@
     </itemizedlist>
   </listitem>
 </varlistentry>
-</sect2>
+</variablelist>
 
+
+<variablelist>
 <varlistentry>
 <term><guimenu>Settings</guimenu></term>
 
@@ -1137,8 +1159,7 @@
 <para>
   The message index displays the messages in the current folder, and
   lets you choose which messages to view. Click on the notebook tabs,
-  or click on a folder in the <link linkend="subwin-mblist">mailbox list</link>
-  to bring it to the front.
+  or click on a folder in the mailbox list to bring it to the front.
 </para>
       
 <para>
@@ -2605,7 +2626,7 @@
 <!--             SUBSECTION: PREFERENCES/MAIL OPTIONS/OUTGOING         -->
 <!-- ################################################################# -->
 <sect2 id="preferences-outgoing">
-<title>Outgoing</title>"mail-options-outgoing
+<title>Outgoing</title>
 
 <variablelist>
   <varlistentry>
@@ -4742,8 +4763,6 @@
     <listitem><para><link linkend="inw-frozen">&Balsa;'s frozen!
     </link></para></listitem>
 
-    <listitem><para><link linkend="inw-didnt-delete">I thought I
-    deleted that message!</link></para></listitem>
 
     <listitem><para><link linkend="inw-spooky-win">What's that window
     that flashed on the screen?  </link></para></listitem>
@@ -4806,6 +4825,7 @@
 
 <!-- ################################################################# -->
 <!--  SECTION: AUTHORS -->
+
 <sect1 id="authors">
   <title>Authors</title>
     

Modified: trunk/doc/Makefile.am
==============================================================================
--- trunk/doc/Makefile.am	(original)
+++ trunk/doc/Makefile.am	Tue Oct 14 20:49:42 2008
@@ -1,5 +1,34 @@
+if BUILD_WITH_G_D_U
+include $(top_srcdir)/gnome-doc-utils.make
+dist-hook: doc-dist-hook
+DOC_MODULE = balsa
+DOC_ENTITIES =
+DOC_INCLUDES =
+DOC_FIGURES = figures/address-book-ldap.png			\
+	      figures/address-book-modify.png			\
+	      figures/address-book.png				\
+	      figures/address-book-start.png			\
+	      figures/address-book-vcard.png			\
+	      figures/balsa_logo.png				\
+	      figures/druid-start.png				\
+	      figures/example-alias.png				\
+	      figures/figuresdobaaddress-book-modify.png	\
+	      figures/main-window.png				\
+	      figures/main-window-toolbar.png			\
+	      figures/message-window.png			\
+	      figures/msg-part-select.png			\
+	      figures/newmsg-window-attachments.png		\
+	      figures/newmsg-window.png				\
+	      figures/newmsg-window-toolbar.png			\
+	      figures/preferences-window.png			\
+	      figures/spell-check.png
+DOC_LINGUAS = de
+else
+# gnome-doc-utils is not obligatory but the old documentation style
+# is not supported any more.
+# SUBDIRS = C de
+# EXTRA_DIST = omf.make xmldocs.make
 
-# if you translate the help files for gnorpm, place them in a directory
-# matching your language code, and add the directory to this list.
-SUBDIRS = C de
-EXTRA_DIST = omf.make xmldocs.make
+doc-dist-hook:
+
+endif

Modified: trunk/doc/de/balsa.xml
==============================================================================
--- trunk/doc/de/balsa.xml	(original)
+++ trunk/doc/de/balsa.xml	Tue Oct 14 20:49:42 2008
@@ -48,7 +48,12 @@
 
 <articleinfo>
 
-<title>Balsa-Benutzerhandbuch</title>
+<title><application><application>Balsa</application></application> Balsa User's Guide</title>
+
+<author role="maintainer">
+<firstname>Pawel</firstname>
+<surname>Salek</surname>
+</author>
 
 <copyright>
   <year>1997-2006</year>
@@ -84,9 +89,24 @@
   <para> All other trademarks are property of their respective owners.</para>
 </legalnotice>
 
-<releaseinfo>Dies ist Version 2.721 des <application>Balsa</application>-Handbuchs.</releaseinfo>
+<releaseinfo> 
+This is version 2.721 of the Balsa manual.
+</releaseinfo>
+
+<revhistory>
+    <revision>
+        <revnumber>
+            2.721
+        </revnumber>
+        <date>26. Februar 2006</date>
+    </revision>
+</revhistory>
 
-<revhistory><revision><date>26. Februar 2006</date></revision></revhistory>
+<abstract role="description">
+    <para>
+        This document is the extensive balsa manual.
+    </para>
+</abstract>
 
 </articleinfo>
 
@@ -235,7 +255,8 @@
   here.
 </para>
 
-  <sect2 id="menubar">
+
+<sect2 id="menu-toolbar">
   <title>MenÃs &amp; Werkzeugleisten</title>
 
   <figure>
@@ -778,8 +799,13 @@
 
   </listitem>
 </varlistentry>
+</variablelist>
+</sect2>
 
 <sect2 id="subwin-messagemenu">
+<title>Message Menu</title>
+
+<variablelist>
 <varlistentry>
   <term><guimenu>Nachricht</guimenu></term>
   
@@ -936,16 +962,13 @@
 	</para>
       </listitem>
 
-    <listitem>
-      <itemizedlist>
 
-	<variablelist>
-	  <varlistentry>
-    <term>
+    <listitem>
+      <para>
       <menuchoice>
         <guimenu>Nachricht</guimenu><guisubmenu>Toggle flag</guisubmenu>
       </menuchoice>
-    </term>
+      <itemizedlist>
 
 	<listitem>
 	  <para>
@@ -1008,11 +1031,8 @@
        Toggles the reply icon for a message.
 	  </para>
 	</listitem>
-
-	  </varlistentry>
-	</variablelist>
-
       </itemizedlist>
+      </para>
     </listitem>
 
       <listitem>
@@ -1031,8 +1051,10 @@
     </itemizedlist>
   </listitem>
 </varlistentry>
-</sect2>
+</variablelist>
+
 
+<variablelist>
 <varlistentry>
 <term><guimenu>Einstellungen</guimenu></term>
 
@@ -1109,8 +1131,7 @@
 <para>
   The message index displays the messages in the current folder, and
   lets you choose which messages to view. Click on the notebook tabs,
-  or click on a folder in the <link linkend="subwin-mblist">mailbox list</link>
-  to bring it to the front.
+  or click on a folder in the mailbox list to bring it to the front.
 </para>
       
 <para>
@@ -1665,11 +1686,11 @@
       <listitem>
 	<para>
 	  <menuchoice>
-	    <guimenu>Optionen</guimenu>
+	    <guimenu>Options</guimenu>
 	    <guimenuitem>Format = Flowed</guimenuitem>
 	  </menuchoice>
 
-	  &mdash;
+	  --
 	</para>
       </listitem>
 
@@ -2553,7 +2574,7 @@
 <!--             SUBSECTION: PREFERENCES/MAIL OPTIONS/OUTGOING         -->
 <!-- ################################################################# -->
 <sect2 id="preferences-outgoing">
-<title>Ausgehend</title>"mail-options-outgoing
+<title>Ausgehend</title>
 
 <variablelist>
   <varlistentry>
@@ -4672,10 +4693,9 @@
     <listitem><para><link linkend="inw-main-to-imap">I want one of the
     main folders to be IMAP </link></para></listitem>
 
-    <listitem><para><link linkend="inw-frozen"><application>Balsa</application> ist eingefroren!</link></para></listitem>
+    <listitem><para><link linkend="inw-frozen"><application>Balsa</application>'s frozen!
+    </link></para></listitem>
 
-    <listitem><para><link linkend="inw-didnt-delete">I thought I
-    deleted that message!</link></para></listitem>
 
     <listitem><para><link linkend="inw-spooky-win">What's that window
     that flashed on the screen?  </link></para></listitem>
@@ -4737,6 +4757,7 @@
 
 <!-- ################################################################# -->
 <!--  SECTION: AUTHORS -->
+
 <sect1 id="authors">
   <title>Autoren</title>
     

Modified: trunk/sounds/Makefile.am
==============================================================================
--- trunk/sounds/Makefile.am	(original)
+++ trunk/sounds/Makefile.am	Tue Oct 14 20:49:42 2008
@@ -9,3 +9,5 @@
 @INTLTOOL_SOUNDLIST_RULE@
 
 EXTRA_DIST = $(balsa_SOUNDS) $(soundlist_in_files)
+
+DISTCLEANFILES = $(soundlist_DATA)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Oct 14 20:49:42 2008
@@ -127,6 +127,7 @@
 # see http://sources.redhat.com/automake/dependencies.html
 BUILT_SOURCES = Balsa.h
 
+DISTCLEANFILES = $(balsa_IDL_SRCLIST)
 
 EXTRA_DIST =			\
 	Balsa.idl		\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]