[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1458-ge9b08ca

[Rob Savoye]

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  e9b08caf8f6de997198a86b1d4763520ab388e7d (commit)
       via  f3c9551146e698dce3bfea499d7c651fe2933185 (commit)
      from  b3ed7e393c584ee9e1064cecfe7c715964dc6443 (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=e9b08caf8f6de997198a86b1d4763520ab388e7d


commit e9b08caf8f6de997198a86b1d4763520ab388e7d
Author: Rob Savoye <address@hidden>
Date:   Tue Mar 27 12:47:46 2012 -0600

    conditionally remove the manpage alias files if they are only copies.

diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index e160d73..20a5d51 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -398,7 +398,7 @@ install-man1: $(MANPAGES) $(EXTRAMANPAGES)
           $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$file; \
        done
 
-install-data-hook: $(MANPAGES) install-man1 install-info-hook 
install-html-hook 
+install-data-hook: install-man1 install-info-hook install-html-hook 
 uninstall-hook: uninstall-info-hook uninstall-html-hook
        -for file in $(MANPAGES) $(EXTRAMANPAGES); do \
           $(RM) $(DESTDIR)$(man1dir)/$$file; \
@@ -437,9 +437,18 @@ uninstall-omf-hook:
        -rmdir $(DESTDIR)$(omf_dest_dir)
        -$(SCROLLUPDATE) -v 
 
+# All but gnash.1 aren't generated, but are just copied from the source
+# tree. If building in thew source directory, we don't want to remove
+# these, but when building in a separate directory, we do want to remove them.
+MAN_ALIASES = \
+       `if test x"$(srcdir)" != x"."; then \
+          echo $(EXTRAMANPAGES); \
+       fi`
+
 CLEANFILES = \
         $(PDFS) \
        $(MANPAGES) \
+       $(MAN_ALIASES) \
        $(INFOS) \
         $(HTMLS) \
        $(TEXIS) \
@@ -453,8 +462,7 @@ CLEANFILES = \
        gnashref.txml \
        gnashref.mxml \
        omf_timestamp \
-       images \
-       gnash.1
+       images
 
 # This updates the copies of the manuals that are stored preformatted
 # so not everyone needs to get Docbook working well enough to produce

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


commit f3c9551146e698dce3bfea499d7c651fe2933185
Author: Rob Savoye <address@hidden>
Date:   Tue Mar 27 12:46:05 2012 -0600

    the next release will be 0.8.11

diff --git a/configure.ac b/configure.ac
index f29eed7..b3792ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, 
MA  02110-1301  USA
 dnl  
 
 AC_PREREQ(2.59c)
-AC_INIT(gnash, 0.8.10dev)
+AC_INIT(gnash, 0.8.11dev)
 AC_CONFIG_SRCDIR([libcore/as_object.h])
 AC_CONFIG_HEADERS([gnashconfig.h])
 AC_CONFIG_MACRO_DIR([macros])
diff --git a/packaging/snapshot.am b/packaging/snapshot.am
index 17ce6bd..460186d 100644
--- a/packaging/snapshot.am
+++ b/packaging/snapshot.am
@@ -25,8 +25,8 @@ BRANCH_REVNO  = "`if test -f revno.h; then grep "REVNO" 
revno.h | cut -d '"' -f
 BRANCH_NICK   = "`if test -f revno.h; then grep "NICK" revno.h | cut -d '"' -f 
2; fi`"
 
 # this is used for Debian style naming conventions
-NEXT_RELEASE = 0.8.10
-#SNAPSHOT_VERSION := 0.8.10
+NEXT_RELEASE = 0.8.11
+#SNAPSHOT_VERSION := 0.8.11
 SNAPSHOT_VERSION = $(NEXT_RELEASE)~git.$(BRANCH_NICK)$(BRANCH_REVNO)
 
 # these is the directories where the snapshot gets built. Sources are

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

Summary of changes:
 configure.ac          |    2 +-
 doc/C/Makefile.am     |   14 +++++++++++---
 packaging/snapshot.am |    4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash