[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1729-gf4083de

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  f4083de7b4f71af9b7fc21b152d0911ced7e4a9b (commit)
       via  ad2e5123c6c859c85c307680359a3c04843193b9 (commit)
       via  f6950d102279752df91d9bce7f95304bd91343a7 (commit)
      from  abd87b5eedc02ceed480c6fb656439174878ad4a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=f4083de7b4f71af9b7fc21b152d0911ced7e4a9b


commit f4083de7b4f71af9b7fc21b152d0911ced7e4a9b
Author: Gabriele Giacone <address@hidden>
Date:   Sat Aug 10 17:17:21 2013 +0200

    doc/C: remove multiple makeinfo execution.

diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index 04dc073..0afd553 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -230,8 +230,8 @@ endif
 if ENABLE_TEXI
        -if test x$(DB2X_TEXI) != x; then \
          out=`echo $* | sed -e 's:gnash:gnash_:'`; \
-         $(DB2X_TEXI) --encoding=us-ascii//TRANSLIT --string-param 
directory-description="Gnash" --string-param output-file=$${out} $<; \
-         $(MAKEINFO) --force $${out}.texi; \
+         $(DB2X_TEXI) --info --encoding=us-ascii//TRANSLIT --string-param
+directory-description="Gnash" --string-param output-file=$${out} $<; \
        else \
          basefile="$*"; \
           $(DB2X_XSLTPROC) -s texi $< --output $${basefile}.txml; \
@@ -241,11 +241,7 @@ if ENABLE_TEXI
 endif
 
 .texi.info:
-if ENABLE_TEXI
-       -$(MAKEINFO) --force $<
-else   
-       touch $@;
-endif
+       touch $@
 
 .man-xml.1:
 if ENABLE_MAN

http://git.savannah.gnu.org/cgit//commit/?id=ad2e5123c6c859c85c307680359a3c04843193b9


commit ad2e5123c6c859c85c307680359a3c04843193b9
Author: Gabriele Giacone <address@hidden>
Date:   Sat Aug 10 16:56:03 2013 +0200

    doc/C: fix info doc generation.

diff --git a/doc/C/refmanual/feature_configuration.xml 
b/doc/C/refmanual/feature_configuration.xml
index a65e2e2..5acefbd 100644
--- a/doc/C/refmanual/feature_configuration.xml
+++ b/doc/C/refmanual/feature_configuration.xml
@@ -80,8 +80,7 @@
 
        <row>
          <entry>
-           <option>
-             <programlisting>
+           <programlisting>
 --enable-gui=&lt;gui&gt;[,&lt;gui&gt;]...
 
       gui can be: aos4
@@ -94,8 +93,7 @@
                  qt3
                  qt4
                  sdl
-             </programlisting>
-           </option>
+           </programlisting>
          </entry>
          <entry><para>Select the Graphic User Interface to build.</para>
          <variablelist>
@@ -154,15 +152,13 @@
        </row>
        <row>
          <entry>
-           <option>
-             <programlisting>
+           <programlisting>
 --enable-media=&lt;handler&gt;[,&lt;handler&gt;]...
 
       handler can be: ffmpeg
                      gst
                      none
-             </programlisting>
-           </option>
+           </programlisting>
          </entry>
          <entry>
          <para>
@@ -211,15 +207,13 @@
        </row>
        <row>
          <entry>
-           <option>
-             <programlisting>
+           <programlisting>
 --enable-renderer=&lt;renderer&gt;[,&lt;renderer&gt;]...
 
       renderer can be: agg
                       cairo
                       opengl
-             </programlisting>
-           </option>
+           </programlisting>
          </entry>
          <entry>Enable support for a graphics backend. Currently
          only <option>opengl</option> and

http://git.savannah.gnu.org/cgit//commit/?id=f6950d102279752df91d9bce7f95304bd91343a7


commit f6950d102279752df91d9bce7f95304bd91343a7
Author: Gabriele Giacone <address@hidden>
Date:   Thu Aug 8 16:47:04 2013 +0200

    Fix check for install deps script.

diff --git a/configure.ac b/configure.ac
index d3eb14f..33a136c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4224,7 +4224,7 @@ yast_err="`cat $yast_err`"
 yast_war="`cat $yast_war`"
 yast_rec="`cat $yast_rec`"
 
-if test x"${linux}" -a x"${android}" = xno; then
+if test x"${android}" != xyes; then
   # Pipe stderr to /dev/null since Fedora complains when target isn't there.
   if test x`which apt-get 2>/dev/null` != x; then
     if test x"$deb_err" != x -o x"$deb_war" != x -o x"$deb_rec" != x; then

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                              |    2 +-
 doc/C/Makefile.am                         |   10 +++-------
 doc/C/refmanual/feature_configuration.xml |   18 ++++++------------
 3 files changed, 10 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
Gnash