X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=debian%2Fcontrol;h=a8bb514b349a72f5746c02bb981a0659f8a172f5;hp=17e8454799a27c47fa9a6609bfc3535bc9b8c108;hb=9bdf269d8976f2a6c175075c034913dc7e201b04;hpb=8ba643ad59f87ca7acb4d0e9770288e02bcbaf8a

diff --git a/debian/control b/debian/control
index 17e845479..a8bb514b3 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ 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,
+ libdbix-sequence-perl, apache2, texlive-binaries,
  autotools-dev, liburi-perl, db-util, libtimedate-perl, libcgi-fast-perl
 
 Package: freeside
@@ -101,7 +101,10 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,latex-xcolor,
  libmap-splat-perl, libdatetime-format-ical-perl, librest-client-perl,
  libgeo-streetaddress-us-perl, libbusiness-onlinepayment-perl,
  libnet-vitelity-perl (>= 0.05), libnet-sslglue-perl, libexpect-perl,
- libspreadsheet-parsexlsx-perl
+ libspreadsheet-parsexlsx-perl, libunicode-truncate-perl (>= 0.303-1),
+ libspreadsheet-xlsx-perl, libpod-simple-perl, libwebservice-northern911-perl,
+ liblocale-codes-perl
+Conflicts: libparams-classify-perl (>= 0.013-6)
 Replaces: freeside (<<4)
 Breaks: freeside (<<4)
 Description: Libraries for Freeside billing and trouble ticketing
@@ -116,7 +119,7 @@ Depends: freeside-lib,apache2,apache2-utils,
  libapache-dbi-perl,libapache2-mod-perl2,libapache2-request-perl,
  libapache-session-perl,openssl, libcgi-emulate-psgi-perl,
  libplack-perl (>= 1.0002)
-Conflicts: apache2-mpm-worker, libev-perl
+Conflicts: libev-perl
 Replaces: freeside (<<4)
 Breaks: freeside (<<4)
 Description: Web interface for Freeside billing and trouble ticketing
@@ -174,7 +177,7 @@ Description: Self-service portal html/cgi filesfor Freeside billing and trouble
 
 Package: freeside-ng-selfservice
 Architecture: all
-Depends: libapache2-mod-php5,php5-xmlrpc,apache2
+Depends: libapache2-mod-php|libapache2-mod-php5,php5-xmlrpc,apache2
 Recommends:
 Description: Next Generation Self-service portal for Freeside billing and trouble ticketing
  Freeside is a web-based billing and trouble ticketing application.