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

diff --git a/debian/control b/debian/control
index 17e845479..2391f73f7 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
@@ -102,6 +102,7 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,latex-xcolor,
  libgeo-streetaddress-us-perl, libbusiness-onlinepayment-perl,
  libnet-vitelity-perl (>= 0.05), libnet-sslglue-perl, libexpect-perl,
  libspreadsheet-parsexlsx-perl
+Conflicts: libparams-classify-perl (>= 0.013-6)
 Replaces: freeside (<<4)
 Breaks: freeside (<<4)
 Description: Libraries for Freeside billing and trouble ticketing
@@ -174,7 +175,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.