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=e60f1fbab9f894dfd73dde421859b9d933ce736c

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

diff --git a/debian/control b/debian/control
index 751608461..dad4df7f3 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,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 (>= 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
@@ -127,16 +127,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.
+#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