[freeside-commits] branch FREESIDE_4_BRANCH updated. 85094055d6a722edc9ecf36e963d17b4b413f505

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  85094055d6a722edc9ecf36e963d17b4b413f505 (commit)
      from  9ca11aae9a6aa90c75b703f40038b7fe443847db (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 85094055d6a722edc9ecf36e963d17b4b413f505
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Jan 29 01:33:12 2016 -0800

    more accurate split of files into -webui and -lib packages

diff --git a/debian/rules b/debian/rules
index 38b6b0a..4a2bf6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ export FREESIDE_URL           = http://$(HOSTNAME)/freeside/
 # a kludge to hack it out afterwords.  look into using fakeroot (didn't
 # realize it would need to be explicit argh)
 # (but leaving it for now, otherwise can't get RT to put files where we need em)
-export RT_PATH                = $(TMP)/opt/rt3
+export RT_PATH                = $(TMP)-lib/opt/rt3
 
 export TEXMF_PATH             = $(TMP)-lib/usr/local/share/texmf/tex/latex
 
@@ -134,7 +134,7 @@ install-stamp: build-stamp
 	install -d $(TMP)-webui/usr/local/etc/freeside/
 	install -d $(TMP)-webui/etc/insserv/overrides/
 	install -d $(TMP)/usr/local/etc/freeside/
-	install -d $(FREESIDE_CACHE)/masondata #MASONDATA
+	install -d $(TMP)-webui/masondata #MASONDATA
 #	install -d $(TMP)-lib/usr/bin
 
 	( cd FS/ && $(MAKE) -e DESTDIR=${TMP}-lib install)
@@ -271,7 +271,7 @@ install-stamp: build-stamp
 	##hack the build dir out of RT.  yeah, sucky.
 
 	perl -p -i -e "\
-	s'${TMP}(-webui)''g;\
+	s'${TMP}(-webui|-lib)''g;\
 	s'${TMP}''g;\
 	" ${TMP}/opt/rt3/etc/*.pm \
 		${TMP}/opt/rt3/lib/*.pm \
@@ -299,7 +299,7 @@ binary-indep: build install
 	dh_testroot
 	dh_installdeb install
 	dh_installdocs #freeside.docs README AGPL
-	dh_installexamples eg/*
+	dh_installexamples eg/* bin
 #	dh_installmenu
 	dh_installdebconf	
 #	dh_installlogrotate	

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

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