remove conflicts on libparams-classify-perl so we can install the version from our...

[freeside.git] / debian / control

diff --git a/debian/control b/debian/control
index bdcce2d..6807aad 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,8 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,latex-xcolor,
  libipc-run-perl,libipc-run3-perl,libipc-sharelite-perl,libjavascript-rpc-perl,
  libjson-perl,liblingua-en-inflect-perl,liblingua-en-nameparse-perl,
  liblocale-gettext-perl,liblocale-maketext-fuzzy-perl,
- liblocale-maketext-lexicon-perl,liblocale-subcountry-perl,liblog-dispatch-perl,
+ liblocale-maketext-lexicon-perl,liblocale-subcountry-perl (<< 2),
+ liblog-dispatch-perl,
  libmailtools-perl (>=2.12), libmime-tools-perl (>= 5.504),
  libmodule-versions-report-perl,
  libnet-daemon-perl,libnet-ping-external-perl,libnet-scp-perl,libnet-ssh-perl,
@@ -100,8 +101,8 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,latex-xcolor,
  libxml-writer-perl, libio-socket-ssl-perl,
  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
-Conflicts: libparams-classify-perl (>= 0.013-6)
+ libnet-vitelity-perl (>= 0.05), libnet-sslglue-perl, libexpect-perl,
+ libspreadsheet-parsexlsx-perl
 Replaces: freeside (<<4)
 Breaks: freeside (<<4)
 Description: Libraries for Freeside billing and trouble ticketing