[freeside-commits] branch master updated. a80507837e7edee6e06206fdda466a9cf7391566

Jeremy Davis jeremyd at 420.am
Thu Jun 25 06:41:40 PDT 2015


The branch, master has been updated
       via  a80507837e7edee6e06206fdda466a9cf7391566 (commit)
      from  8da65c116507f5a7b76faecb0699225f6fc96906 (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 a80507837e7edee6e06206fdda466a9cf7391566
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Thu Jun 25 09:41:04 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