[Gnash-commit] [SCM] Gnash branch, release_0_8_8, updated. 73326660de2f8e6860e273adeb5d6632e8cc58f1

[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, release_0_8_8 has been updated
       via  73326660de2f8e6860e273adeb5d6632e8cc58f1 (commit)
       via  1aa0d28c35a1586e745113e8cf3c4bef4264723e (commit)
       via  35618de9eacb15eaabd631fb73a6fe29ff9eafc8 (commit)
      from  03eb25bbc48921e628ebe2944e9bc33b873c71ad (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=73326660de2f8e6860e273adeb5d6632e8cc58f1


commit 73326660de2f8e6860e273adeb5d6632e8cc58f1
Author: Rob Savoye <address@hidden>
Date:   Wed Aug 11 18:27:17 2010 -0600

    use git instead of bzr as the SCC

diff --git a/packaging/deb.am b/packaging/deb.am
index 70bf203..fb6cedc 100644
--- a/packaging/deb.am
+++ b/packaging/deb.am
@@ -87,7 +87,7 @@ BUILD_VERSION := $(shell \
 PACKAGES := $(shell grep Package $(srcdir)/packaging/debian/control | sed -e 
's/Package://')
 
 # SNAPSHOT_VERSION is the name that gets used for the packages. By default
-# it is "$(NEXT_RELEASE)~bzr.$(BRANCH_NICK)$(BRANCH_REVNO)", but when
+# it is "$(NEXT_RELEASE)~git.$(BRANCH_NICK)$(BRANCH_REVNO)", but when
 # building alternate packages, we want to rename them so there isn't a
 # name collision.
 
diff --git a/packaging/snapshot.am b/packaging/snapshot.am
index 4958ac4..b974a2d 100644
--- a/packaging/snapshot.am
+++ b/packaging/snapshot.am
@@ -19,7 +19,8 @@ NOW := $(shell date "+%Y%m%d")
 
 # this is used for Debian style naming conventions
 NEXT_RELEASE = 0.8.9
-SNAPSHOT_VERSION := $(NEXT_RELEASE)~bzr.$(BRANCH_NICK)$(BRANCH_REVNO)
+SNAPSHOT_VERSION := $(NEXT_RELEASE)~git.$(BRANCH_REVNO)
+# SNAPSHOT_VERSION := $(NEXT_RELEASE)~git.$(BRANCH_NICK)$(BRANCH_REVNO)
 
 # these is the directories where the snapshot gets built. Sources are
 # in the top level, the build goes in a _build subdirectory

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


commit 1aa0d28c35a1586e745113e8cf3c4bef4264723e
Author: Rob Savoye <address@hidden>
Date:   Wed Aug 11 18:26:40 2010 -0600

    cleanup dependencies

diff --git a/packaging/debian/control b/packaging/debian/control
index ba3f7ca..399115f 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,7 +1,38 @@
 Source: gnash
 Priority: optional
 Maintainer: Rob Savoye (Rollinsville, CO) <address@hidden>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 7.0.0), autoconf, 
automake, libtool, libltdl3-dev | libltdl-dev, libltdl3 | libltdl7, libxmu-dev, 
autotools-dev, libjpeg-dev, libpng12-dev | libpng-dev, libagg-dev, 
libpango1.0-dev | pango-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | 
libcurl4-openssl-dev | libcurl3-openssl-dev, libboost1.40-dev | 
libboost1.39-dev | libboost1.38.0-dev | libboost1.37-dev | libboost1.36-dev | 
libboost1.35-dev | libboost1.34.1-dev | libboost-dev, libboost-thread1.40-dev | 
libboost-thread1.39-dev | libboost-thread1.38.0-dev | libboost-thread1.37-dev | 
libboost-thread1.36-dev | libboost-thread1.35-dev | libboost-thread1.34.1-dev | 
libboost-thread-dev, libboost-date-time1.40-dev | libboost-date-time1.39-dev | 
libboost-date-time1.38.0-dev | libboost-date-time1.37-dev | 
libboost-date-time1.36-dev | libboost-date-time1.35-dev | 
libboost-date-time1.34.1-dev | libboost-date-time-dev, libgtk2.0-dev, 
libpango1.0-dev, libatk1.0-dev, python2.6-dev | python2.5-dev | python2.4-dev, 
kdelibs5-dev, python-gtk2-dev, qt4-qmake, docbook, docbook2x, libgif-dev, 
gstreamer-plugins-base-dev | libgstreamer-plugins-base0.10-dev, 
libgstreamer0.10-dev | gstreamer0.10-dev, libsdl1.2-dev, intltool, 
intltool-debian, x11proto-video-dev, libgl1-mesa-dev, libglu1-mesa-dev, 
libxv-dev, libgtkglext1-dev, libqt4-opengl-dev, libmysqlclient-dev | 
libmysqlclient14-dev
+Build-Depends: dpkg-dev (>= 1.13.19),
+              debhelper (>= 7.0.0), 
+              autoconf, automake, libtool,
+              libltdl3-dev | libltdl-dev, libltdl3 | libltdl7,
+              libxmu-dev,
+              autotools-dev,
+              libjpeg-dev,
+              libpng12-dev | libpng-dev,
+              libagg-dev,
+              libpango1.0-dev | pango-dev,
+              libcurl4-openssl-dev | libcurl4-gnutls-dev,
+              libboost-dev, 
+              libboost-thread-dev,
+              libboost-date-time-dev,
+              libgtk2.0-dev, 
+              libatk1.0-dev,
+              python2.6-dev | python2.5-dev,
+              kdelibs5-dev, python-gtk2-dev,
+              qt4-qmake,
+              docbook,
+              docbook2x,
+              libgif-dev,
+              libgstreamer-plugins-base0.10-dev,
+              libgstreamer0.10-dev | gstreamer0.10-dev,
+              libsdl1.2-dev,
+              intltool, 
+              intltool-debian,
+              x11proto-video-dev,
+              libxv-dev,
+              libmysqlclient-dev
+# OpenGL packages are disabled for now
+# libgl1-mesa-dev, libglu1-mesa-dev, libgtkglext1-dev, libqt4-opengl-dev, 
 Standards-Version: 3.8.4
 Section: utils
 Homepage: http://www.gnu.org/software/gnash/

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


commit 35618de9eacb15eaabd631fb73a6fe29ff9eafc8
Author: Rob Savoye <address@hidden>
Date:   Wed Aug 11 18:26:01 2010 -0600

    add quotes around sub shell execution

diff --git a/Makefile.am b/Makefile.am
index e1c81c5..ff234bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,8 +141,8 @@ revno.h: Makefile.in
             if test x"$${status}" = x"0"; then \
               echo "Generating revno.h"; \
               $(RM) -f revno.h; \
-              revno=`(cd $(srcdir) && git describe --tags | cut -d '-' -f 2-3 
| tr a- a_)`; \
-              nick=`basename $(top_srcdir)`; \
+              revno="`(cd $(srcdir) && git describe --tags | cut -d '-' -f 2-3 
| tr a- a.)`"; \
+              nick="`basename $(top_srcdir) | tr a_ a.`"; \
            fi; \
           else \
             revno="${NOW}"; \

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

Summary of changes:
 Makefile.am              |    4 ++--
 packaging/deb.am         |    2 +-
 packaging/debian/control |   33 ++++++++++++++++++++++++++++++++-
 packaging/snapshot.am    |    3 ++-
 4 files changed, 37 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash