[Gnash-commit] /srv/bzr/gnash/trunk r11806: rename packaging snapshots so it's Debian proper style, branch then revno, not the other way around.

[Rob Savoye]

------------------------------------------------------------
revno: 11806
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Mon 2010-01-25 13:44:46 -0700
message:
  rename packaging snapshots so it's Debian proper style, branch then revno, 
not the other way around.
modified:
  packaging/deb.am
  packaging/rpm.am
  packaging/snapshot.am

=== modified file 'packaging/deb.am'
--- a/packaging/deb.am  2010-01-01 17:48:26 +0000
+++ b/packaging/deb.am  2010-01-25 20:44:46 +0000
@@ -29,7 +29,7 @@
        cp -rfp $(srcdir)/packaging/debian/* $${snapshot_dir}/debian/; \
        if test -e $${snapshot_dir}/debian/changelog; then \
          mv -f $${snapshot_dir}/debian/changelog 
$${snapshot_dir}/debian/changelog.orig; \
-         sed -e "s:trunk:$(BRANCH_REVNO)$(BRANCH_NICK):" 
$${snapshot_dir}/debian/changelog.orig > $${snapshot_dir}/debian/changelog; \
+         sed -e "s:trunk:$(BRANCH_NICK)$(BRANCH_REVNO):" 
$${snapshot_dir}/debian/changelog.orig > $${snapshot_dir}/debian/changelog; \
        fi; \
        (cd $${snapshot_dir}; dpkg-buildpackage -rfakeroot -nc -j4)
 

=== modified file 'packaging/rpm.am'
--- a/packaging/rpm.am  2010-01-01 17:48:26 +0000
+++ b/packaging/rpm.am  2010-01-25 20:44:46 +0000
@@ -26,7 +26,7 @@
 
 gnash.spec spec: $(srcdir)/packaging/redhat/gnash.spec
        @echo "Editing the version in the spec file ..."
-       sed -e "s/Version.*/Version:    $(BRANCH_REVNO)_$(BRANCH_NICK)/" 
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec;
+       sed -e "s/Version.*/Version:    $(BRANCH_NICK)$(BRANCH_REVNO)/" 
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec;
 
 # Build an Redhat/Fedora .rpm package
 # We do this by using the source snapshot that we know is 'distclean'.

=== modified file 'packaging/snapshot.am'
--- a/packaging/snapshot.am     2010-01-01 17:48:26 +0000
+++ b/packaging/snapshot.am     2010-01-25 20:44:46 +0000
@@ -24,12 +24,12 @@
 
 # these is the directories where the snapshot gets built. Sources are
 # in the top level, the build goes in a _build subdirectory
-SNAPSHOT_DIR = gnash-${BRANCH_REVNO}_$(BRANCH_NICK)
+SNAPSHOT_DIR = gnash-$(BRANCH_NICK)${BRANCH_REVNO}
 SNAPSHOT_BUILD = $(SNAPSHOT_DIR)/_build
 SNAPSHOT_NAME = $(SNAPSHOT_DIR)
 
 # this is the name of the actual tarball
-SNAPSHOT_TAR = gnash-$(BRANCH_REVNO)_$(BRANCH_NICK).tar.gz
+SNAPSHOT_TAR = gnash-$(BRANCH_NICK)$(BRANCH_REVNO).tar.gz
 # this is the temporary directory used for DESTDIR
 SNAPSHOT_TMP = /tmp/$(SNAPSHOT_DIR)
 
@@ -48,7 +48,7 @@
 # rename it to the dir we want to stay clear. Then we change the default
 # version from 'trunk' to a date stamped version of trunk.
 snapshot-src: distdir  force
-       snapshot_tar="$(SNAPSHOT_NAME).tar.gz"; \
+       snapshot_tar="$(SNAPSHOT_TAR)"; \
        snapshot_dir=$(SNAPSHOT_DIR); \
        if test -d $${snapshot_dir}; then \
          rm -fr $${snapshot_dir}; \
@@ -56,7 +56,7 @@
        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, trunk)/AC_INIT(gnash, 
$(BRANCH_REVNO)-$(BRANCH_NICK))/" \
+         sed -e "s/AC_INIT(gnash, trunk)/AC_INIT(gnash, 
$(BRANCH_NICK)$(BRANCH_REVNO))/" \
            $${snapshot_dir}/configure.ac.orig > $${snapshot_dir}/configure.ac; 
\
          cd $${snapshot_dir} ; ./autogen.sh; cd .. ;\
        fi; \
@@ -66,7 +66,7 @@
 
 snapshot-configure: force
        address@hidden "+%Y%m%d"`; \
-       pkgname="gnash-${BRANCH_REVNO}-$(BRANCH_NICK)"; \
+       pkgname="gnash-$(BRANCH_NICK)-${BRANCH_REVNO}"; \
        snapshot_dir=$(SNAPSHOT_DIR); \
        snapshot_build="$(SNAPSHOT_BUILD)"; \
        if test ! -d $(snapshot_build); then \