[Gnash-commit] [SCM] Gnash branch, master, updated. 8c3075908ed1b2cf7d02025350f463641ba76915

[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  8c3075908ed1b2cf7d02025350f463641ba76915 (commit)
       via  038e711f5d30bd4110fb6152a69378f9432cb610 (commit)
       via  71ac404e2fc9695daa0d2be85e81d045e8b9a88a (commit)
      from  d8dbdaf804b5f64f7452003d269f9099fd626440 (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=8c3075908ed1b2cf7d02025350f463641ba76915


commit 8c3075908ed1b2cf7d02025350f463641ba76915
Author: Rob Savoye <address@hidden>
Date:   Wed Dec 8 16:13:17 2010 -0700

    use PACKAGE_VERSION instead of hardcoded gnash-master when renaming the 
snapshot directory

diff --git a/packaging/rpm.am b/packaging/rpm.am
index f1b0e56..9e10cef 100644
--- a/packaging/rpm.am
+++ b/packaging/rpm.am
@@ -78,8 +78,8 @@ rpm-install:
 setup-rpm: 
        -snapshot_version="gnash-$(SNAPSHOT_VERSION)"; \
        snapshot_version=`echo $${snapshot_version}|tr "~" "_"`; \
-       if test -d gnash-master; then \
-         mv gnash-master $${snapshot_version}; \
+       if test -d gnash-$(PACKAGE_VERSION); then \
+         mv gnash-$(PACKAGE_VERSION) $${snapshot_version}; \
          if test ! -f $${snapshot_version}/configure.ac.orig; then \
            mv -f $${snapshot_version}/configure.ac 
$${snapshot_version}/configure.ac.orig; \
            sed -e "s/AC_INIT(gnash, master)/AC_INIT(gnash, 
$${snapshot_version})/" \

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


commit 038e711f5d30bd4110fb6152a69378f9432cb610
Merge: 71ac404 d8dbdaf
Author: Rob Savoye <address@hidden>
Date:   Wed Dec 8 15:56:21 2010 -0700

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


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


commit 71ac404e2fc9695daa0d2be85e81d045e8b9a88a
Author: Rob Savoye <address@hidden>
Date:   Wed Dec 8 15:53:35 2010 -0700

    make less verbose

diff --git a/Makefile.am b/Makefile.am
index 6b8fe7f..c67d57f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,7 +126,7 @@ BUILT_SOURCES = revno.h .configline
 # removed by maintainer-clean...)
 #
 revno.h: Makefile
-       git=`which git`; \
+       @git=`which git`; \
        if test -d $(top_srcdir)/.git -a x$${git} != x; then \
          revno="`(cd $(top_srcdir) ; $${git} rev-parse --short HEAD)`"; \
           nick="`(cd $(top_srcdir) ; $${git} branch | grep '^\*' | cut -d ' ' 
-f 2)`"; \

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

Summary of changes:
 Makefile.am      |    2 +-
 packaging/rpm.am |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash