From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 3 Feb 2016 23:30:21 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=edd6d86985198ff5b04611e5bb4b5633cda6f81a;hp=-c

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

edd6d86985198ff5b04611e5bb4b5633cda6f81a
diff --combined debian/control
index 729135d83,751608461..dad4df7f3
--- a/debian/control
+++ b/debian/control
@@@ -3,16 -3,21 +3,21 @@@ Section: mis
  Priority: extra
  Maintainer: Ivan Kohler <ivan-debian@420.am>
  Uploaders: Jeremy Davis <jeremyd@freeside.biz>
- Build-Depends: debhelper (>= 5), perl (>= 5.8), torrus-common
  Standards-Version: 3.7.2
  Homepage: http://www.freeside.biz/freeside
+ Build-Depends: debhelper (>=5), perl (>=5.8),
+  rrdtool,librrds-perl, libxml-libxml-perl, libberkeleydb-perl,
+  libtemplate-perl, libproc-daemon-perl, libnet-snmp-perl,
+  libapache-session-perl, libjson-perl, libdbix-abstract-perl,
+  libdbix-sequence-perl, librrds-perl, apache2, texlive-binaries,
+  autotools-dev, liburi-perl, db-util, libtimedate-perl, libcgi-fast-perl
  
  Package: freeside
  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 (>= 4.0git~20151123), freeside-rt
 + debconf, cron, openbsd-inetd, tcpd, undersmtpd, ssmtp, freeside-lib (>= 4.0git~20151123)
  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,23 -127,23 +127,24 @@@ Description: Self-service portal for Fr
   .
   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.
 +#not yet a separate package
 +#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,
-  libberkeleydb-perl,libtemplate-perl,libproc-daemon-perl,libnet-snmp-perl,
-  libapache-session-perl,libjson-perl,libdbix-abstract-perl,libdbix-sequence-perl
+ Depends: freeside-webui,freeside-lib,rrdtool,librrds-perl,
+  libxml-libxml-perl, libberkeleydb-perl, libtemplate-perl, 
+  libproc-daemon-perl,libnet-snmp-perl, libapache-session-perl, libjson-perl,
+  libdbix-abstract-perl, libdbix-sequence-perl, librrds-perl
  Recommends:
  Description: Integrated network monitoring and billing
   Torrus is a network monitoring system (NMS) for discovering and monitoring