[Gnash-commit] /srv/bzr/gnash/trunk r9612: Use trunk instead of cvs in the version string.

[rob]

------------------------------------------------------------
revno: 9612
committer: address@hidden
branch nick: trunk
timestamp: Sun 2008-08-17 12:18:16 -0600
message:
  Use trunk instead of cvs in the version string.
modified:
  packaging/deb.am
  packaging/install-gnash.sh
  packaging/snapshot.am

=== modified file 'packaging/deb.am'
--- a/packaging/deb.am  2008-03-04 01:42:03 +0000
+++ b/packaging/deb.am  2008-08-17 18:18:16 +0000
@@ -28,13 +28,13 @@
 # file. Configure.ac is edited by the snapshot target.
 snapshot-deb: # snapshot
        now=`date "+%Y%m%d"`; \
-       snapshot_dir="gnash-$${now}cvs"; \
+       snapshot_dir="gnash-$${now}trunk"; \
        if test ! -d $${snapshot_dir}/debian; then \
          cp -rp $(srcdir)/packaging/debian $${snapshot_dir}/; \
        fi; \
        if test -e $${snapshot_dir}/debian/changelog; then \
          mv -f $${snapshot_dir}/debian/changelog 
$${snapshot_dir}/debian/changelog.orig; \
-         sed -e "s:(.*):($${now}cvs):" $${snapshot_dir}/debian/changelog.orig 
> $${snapshot_dir}/debian/changelog; \
+         sed -e "s:(.*):($${now}trunk):" 
$${snapshot_dir}/debian/changelog.orig > $${snapshot_dir}/debian/changelog; \
        fi; \
        (cd $${snapshot_dir}; dpkg-buildpackage -rfakeroot)
 

=== modified file 'packaging/install-gnash.sh'
--- a/packaging/install-gnash.sh        2008-02-16 23:12:58 +0000
+++ b/packaging/install-gnash.sh        2008-08-17 18:18:16 +0000
@@ -334,7 +334,7 @@
 
   # install the libraries
   if [ -e lib/gnash/libgnashbase.so -o x$yes = xyes ]; then
-    for i in lib/gnash/libgnash*cvs.so; do
+    for i in lib/gnash/libgnash*trunk.so; do
       ${COPY} $i /usr/lib/
       linkname=`echo $i | sed -e 's:\-.*.so:.so:' -e 's:\.3.*::'`
       linkname=`basename ${linkname}`

=== modified file 'packaging/snapshot.am'
--- a/packaging/snapshot.am     2008-03-22 03:35:29 +0000
+++ b/packaging/snapshot.am     2008-08-17 18:18:16 +0000
@@ -29,31 +29,32 @@
 #
 
 # start by creating the initial tarball using the dist-bzip2 target.
-# This uses the default version for Gnash. which is 'cvs'. So we
+# This uses the default version for Gnash. which is 'trunk'. So we
 # rename it to the dir we want to stay clear. Then we change the default
-# version from 'cvs' to a date stamped version of cvs, like '20080202cvs'
+# version from 'trunk' to a date stamped version of trunk, like
+# '20080202trunk'
 snapshot: distdir
        address@hidden "+%Y%m%d"`; \
-       pkgname="gnash-$${now}cvs"; \
+       pkgname="gnash-$${now}trunk"; \
        snapshot_dir="$${pkgname}"; \
        snapshot_tar="$${pkgname}.tar.gz"; \
        if test -d $${snapshot_dir}; then \
          rm -fr $${snapshot_dir}; \
        fi; \
-       mv -f gnash-cvs $${snapshot_dir}; \
+       mv -f gnash-trunk $${snapshot_dir}; \
        if test ! -f $${snapshot_dir}/configure.ac.orig; then \
          mv -f $${snapshot_dir}/configure.ac 
$${snapshot_dir}/configure.ac.orig; \
-         sed -e "s/AC_INIT(gnash, cvs)/AC_INIT(gnash, $${now}cvs)/" \
+         sed -e "s/AC_INIT(gnash, trunk)/AC_INIT(gnash, $${now}trunk)/" \
            $${snapshot_dir}/configure.ac.orig > $${snapshot_dir}/configure.ac; 
\
          cd $${snapshot_dir} ; ./autogen.sh; cd .. ;\
        fi; \
-       tar zcvf $${snapshot_tar} --exclude="*CVS" 
--exclude=$${snapshot_dir}/autom4te.cache \
+       tar zcvf $${snapshot_tar} --exclude=$${snapshot_dir}/autom4te.cache \
          --exclude=$${snapshot_dir}/configure.ac.orig $${snapshot_dir}
 #      $(RM) -fr $${snapshot_dir}
 
 snapshot-configure: snapshot
        address@hidden "+%Y%m%d"`; \
-       pkgname="gnash-$${now}cvs"; \
+       pkgname="gnash-$${now}trunk"; \
        snapshot_dir="$${pkgname}"; \
        snapshot_build="$${snapshot_dir}/_build"; \
        if test ! -d $${snapshot_build}; then \
@@ -79,7 +80,7 @@
 
 snapshot-build: snapshot-configure
        address@hidden "+%Y%m%d"`; \
-       pkgname="gnash-$${now}cvs"; \
+       pkgname="gnash-$${now}trunk"; \
        snapshot_dir="$${pkgname}"; \
        snapshot_build="$${snapshot_dir}/_build"; \
        $(LN_S) -f $${snapshot_build}/packaging/doc 
$${snapshot_build}/packaging/; \
@@ -90,16 +91,16 @@
 # DocBook and DocBook2X aren't installed on this machine.
 snapshot-install: #snapshot-build
        now=`date "+%Y%m%d"`; \
-       snapshot_dir="gnash-$${now}cvs"; \
+       snapshot_dir="gnash-$${now}trunk"; \
        snapshot_build="$${snapshot_dir}/_build"; \
-       snapshot_dest="/tmp/gnash-$${now}cvs-tmp"; \
+       snapshot_dest="/tmp/gnash-$${now}trunk-tmp"; \
        $(MAKE) $(AM_MAKEFLAGS) -C $${snapshot_build} install install-plugins 
DESTDIR=$${snapshot_dest}
 
 # We only want to bundle an installed gnash, so all the linker paths are
 # correct
 snapshot-bundle: #snapshot-install
        address@hidden "+%Y%m%d"`; \
-       pkgname="gnash-$${now}cvs"; \
+       pkgname="gnash-$${now}trunk"; \
        snapshot_dest="/tmp/$${pkgname}-tmp"; \
        snapshot_tmp="/tmp/$${pkgname}"; \
        snapshot_tar="$${snapshot_tmp}-$(host_cpu)-$(host_os).tar.gz"; \
@@ -124,7 +125,7 @@
 snapshot-rpm: snapshot $(srcdir)/packaging/redhat/gnash.spec
        address@hidden -f /usr/src/redhat/SPECS/gnash.spec
        now=`date "+%Y%m%d"`; \
-       pkgname="gnash-$${now}cvs"; \
+       pkgname="gnash-$${now}trunk"; \
        snapshot_tar="$${pkgname}.tar.gz"; \
        sed -e "s:%define version .*:%define version $${now}:" 
$(srcdir)/packaging/redhat/gnash.spec > /usr/src/redhat/SPECS/gnash.spec; \
        cp $${snapshot_tar} /usr/src/redhat/SOURCES/