[freeside-commits] branch master updated. 1115692072f22567e4f4359920fff947eed5df4e

[Ivan]

The branch, master has been updated
       via  1115692072f22567e4f4359920fff947eed5df4e (commit)
       via  972e16204f5869134c5c5f447da87a39621e8c2a (commit)
       via  d61566d77590290c31efe846a47d7ea8842a8c57 (commit)
      from  341f9a85f592a7550fbd48e0b725d8d2fe32c6ac (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 1115692072f22567e4f4359920fff947eed5df4e
Merge: 972e162 341f9a8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Feb 2 20:57:38 2016 -0800

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 972e16204f5869134c5c5f447da87a39621e8c2a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Feb 2 20:57:31 2016 -0800

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

diff --git a/Makefile b/Makefile
index 5ddeda8..0647bed 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 a491dea..93b82cf 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 334b652..cbd26cf 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 "\

commit d61566d77590290c31efe846a47d7ea8842a8c57
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Feb 2 19:47:42 2016 -0800

    5.x

diff --git a/debian/changelog b/debian/changelog
index d5fd647..6fdd7e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-freeside (3.4~20140918-1) UNRELEASED; urgency=low
+freeside (5.0~20160202-1) UNRELEASED; urgency=low
 
-  * Complete packaging.
+  * 5.x test release
 
- -- Jeremy Davis <jeremyd-debian at freeside.biz>  Thu, 18 Feb 2014 15:50:36 -0500
+ -- Ivan Kohler <ivan-debian at 420.am>  Tue, 02 Feb 2016 19:46:56 -0800
 
 freeside (3.0~20130205-1) UNRELEASED; urgency=low
 

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

Summary of changes:
 Makefile         |    2 +-
 debian/changelog |    6 +++---
 debian/control   |   19 +++++++++++++++++--
 debian/rules     |   12 ++++++------
 4 files changed, 27 insertions(+), 12 deletions(-)