[freeside-commits] branch master updated. 9c021c0763dd09b8457d16389d693fdfe858ca82

[Ivan]

The branch, master has been updated
       via  9c021c0763dd09b8457d16389d693fdfe858ca82 (commit)
      from  2e3d2bfad1cea570978aec44441fd79ec75c28ec (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 -----------------------------------------------------------------
commit 9c021c0763dd09b8457d16389d693fdfe858ca82
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jun 2 16:46:04 2012 -0700

    keep version in FS.pm instead of Makefile

diff --git a/FS/FS.pm b/FS/FS.pm
index e169166..8bbff12 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -3,7 +3,7 @@ package FS;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '%%%VERSION%%%';
+$VERSION = '3.0git';
 
 #find missing entries in this file with:
 # for a in `ls *pm | cut -d. -f1`; do grep 'L<FS::'$a'>' ../FS.pm >/dev/null || echo "missing $a" ; done
diff --git a/Makefile b/Makefile
index b603b8c..dc86c60 100644
--- a/Makefile
+++ b/Makefile
@@ -115,8 +115,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.14.2/
 
-VERSION=3.0git
-TAG=freeside_3_0
+VERSION=`grep '^$VERSION' FS/FS.pm | cut -d\' -f2`
+TAG=freeside_`echo ${VERSION} | perl -pe 's/\./_/g'`
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -180,9 +180,6 @@ perl-modules:
 	[ -e Makefile ] || perl Makefile.PL; \
 	make; \
 	perl -p -i -e "\
-	  s/%%%VERSION%%%/${VERSION}/g;\
-	" blib/lib/FS.pm;\
-	perl -p -i -e "\
 	  s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
 	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
 	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \

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

Summary of changes:
 FS/FS.pm |    2 +-
 Makefile |    7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)