[freeside-commits] branch FREESIDE_3_BRANCH updated. 4b619ddc65ac8c256de2d99f63be46380ca0e8e0

Jeremy Davis jeremyd at 420.am
Thu Jun 25 06:43:09 PDT 2015


The branch, FREESIDE_3_BRANCH has been updated
       via  4b619ddc65ac8c256de2d99f63be46380ca0e8e0 (commit)
      from  ef82bb7a0d44c3589a184d2a36cda3b011d043cd (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 4b619ddc65ac8c256de2d99f63be46380ca0e8e0
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Thu Jun 25 09:43:00 2015 -0400

    Ticket #36913 Fix regex for torrus config

diff --git a/debian/rules b/debian/rules
index 4728e30..45f2ce8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -233,11 +233,10 @@ install-stamp: build-stamp
 	( cd torrus; \
 	torrus_user=freeside var_user=freeside var_group=freeside ./configure; \
 	$(MAKE) -e DESTDIR=${TMP}-torrus/; \
-	$(MAKE) -e DESTDIR=${TMP}-torrus/ install )
-
-        perl -p -i -e "\
-        s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
-        " ${TMP}-torrus/usr/local/etc/torrus/conf/torrus-siteconfig.pl; \
+	$(MAKE) -e DESTDIR=${TMP}-torrus/ install; \
+	perl -p -i -e "\
+	    s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+	" ${TMP}-torrus/usr/local/etc/torrus/conf/torrus-siteconfig.pl )
 
 	#RT Config
 

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

Summary of changes:
 debian/rules |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)




More information about the freeside-commits mailing list