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

3 files changed, 24 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 5ddeda826..0647bed9d 100644
--- a/Makefile
+++ b/Makefile
@@ -194,7 +194,7 @@ install-docs: docs
 	" ${MASON_HANDLER} || true
 	mkdir -p ${FREESIDE_EXPORT}/profile
 	chown freeside ${FREESIDE_EXPORT}/profile
-	rm -r ${MASONDATA}
+	rm -rf ${MASONDATA}
 	mkdir ${MASONDATA}
 	chown -R freeside ${MASONDATA}
 
diff --git a/debian/control b/debian/control
index a491dead0..93b82cff2 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Architecture: all
 Pre-Depends: freeside-lib
 # dbconfig-common
 Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, freeside-webui,
- debconf, cron, openbsd-inetd, tcpd, undersmtpd, ssmtp, freeside-lib (>= 3.8git~20151123)
+ debconf, cron, openbsd-inetd, tcpd, undersmtpd, ssmtp, freeside-lib (>= 4.0git~20151123), freeside-rt
 Description: Billing and trouble ticketing for service providers
  Freeside is a web-based billing, trouble ticketing and network monitoring
  application.  It includes features for ISPs and WISPs, hosting providers and
@@ -122,6 +122,17 @@ Description: Self-service portal for Freeside billing and trouble ticketing
  .
  This package provides the libraries needed for the self-service portal.
 
+Package: freeside-rt
+Architecture: all
+Depends: freeside-webui,freeside-lib
+Recommends:
+Description: Integrated trouble ticketing and billing
+ Request Tracker (RT) is a ticketing system which enables a group of people to
+ intelligently and efficiently manage tasks, issues and requests.
+ .
+ This package is the integrated RT component of Freeside, a customer tracking,
+ billing and trouble ticketing application.
+
 Package: freeside-torrus
 Architecture: all
 Depends: freeside-webui,freeside-lib,rrdtool,librrds-perl,libxml-libxml-perl,
@@ -129,7 +140,11 @@ Depends: freeside-webui,freeside-lib,rrdtool,librrds-perl,libxml-libxml-perl,
  libapache-session-perl,libjson-perl,libdbix-abstract-perl,libdbix-sequence-perl
 Recommends:
 Description: Integrated network monitoring and billing
- Torrus is a network monitoring system (NMS) for discovering and monitoring routers, switches and other network equipment with SNMP.
+ Torrus is a network monitoring system (NMS) for discovering and monitoring
+ routers, switches and other network equipment with SNMP.
+ .
+ This package is the integrated Torrus component of Freeside, a customer
+ tracking, billing and trouble ticketing application.
 
 Package: freeside-selfservice-ui
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 334b6528f..cbd26cf3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -273,12 +273,12 @@ install-stamp: build-stamp
 	perl -p -i -e "\
 	s'${TMP}(-webui|-lib)''g;\
 	s'${TMP}''g;\
-	" ${TMP}(-lib)?/opt/rt3/etc/*.pm \
-		${TMP}(-lib)?/opt/rt3/lib/*.pm \
-		${TMP}(-lib)?/opt/rt3/lib/RT/*.pm \
-		${TMP}(-lib)?/opt/rt3/etc/upgrade/* \
-		${TMP}(-lib)?/opt/rt3/sbin/* \
-		${TMP}(-lib)?/opt/rt3/bin/* \
+	" ${TMP}-lib/opt/rt3/etc/*.pm \
+		${TMP}-lib/opt/rt3/lib/*.pm \
+		${TMP}-lib/opt/rt3/lib/RT/*.pm \
+		${TMP}-lib/opt/rt3/etc/upgrade/* \
+		${TMP}-lib/opt/rt3/sbin/* \
+		${TMP}-lib/opt/rt3/bin/* \
 
 	# Default RT Settings
 	perl -p -i -e "\