From c2ae28b7aa418bca6e6c54986867d99e5638acd0 Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Tue, 30 Jul 2013 17:17:10 -0400 Subject: [PATCH] #2916 Changes to debian packaging --- debian/control | 2 +- debian/rules | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 157240659..b952140aa 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Description: Billing and trouble ticketing for service providers Package: freeside-lib Architecture: all -Depends: ghostscript | gs-gpl, gsfonts, tetex-base, tetex-bin, libauthen-passphrase-perl, libbusiness-creditcard-perl, libcache-cache-perl, libcache-simple-timedexpiry-perl, libclass-returnvalue-perl, libcrypt-passwdmd5-perl, libdate-manip-perl, libdbd-pg-perl | libdbd-mysql-perl, libdbi-perl, libdbix-dbschema-perl (>= 0.35), libdbix-searchbuilder-perl, libdigest-sha1-perl, libfile-counterfile-perl, libfile-rsync-perl, libfrontier-rpc-perl, libhtml-format-perl, libhtml-tree-perl, libipc-run3-perl, libipc-sharelite-perl, liblingua-en-nameparse-perl, liblocale-maketext-fuzzy-perl, liblocale-maketext-lexicon-perl, liblocale-subcountry-perl, liblog-dispatch-perl, libmailtools-perl (>= 2), libmime-perl (>= 5.424) | libmime-perl (< 5.421), libnet-domain-tld-perl, libnet-scp-perl, libnet-ssh-perl, libnet-whois-raw-perl, libnetaddr-ip-perl, libnumber-format-perl, libregexp-common-perl, libstring-approx-perl, libstring-shellquote-perl, libterm-readkey-perl, libtest-inline-perl, libtext-autoformat-perl, libtext-csv-perl, libtext-template-perl, libtext-wrapper-perl, libtie-ixhash-perl, libtime-duration-perl, libtime-modules-perl, libtimedate-perl, libuniversal-require-perl, liburi-perl, libwant-perl, libwww-perl, libemail-sender-perl, libemail-sender-transport-smtp-tls-perl +Depends: ghostscript | gs-gpl, gsfonts, libauthen-passphrase-perl, libbusiness-creditcard-perl, libcache-cache-perl, libcache-simple-timedexpiry-perl, libclass-returnvalue-perl, libcrypt-passwdmd5-perl, libdate-manip-perl, libdbd-pg-perl | libdbd-mysql-perl, libdbi-perl, libdbix-dbschema-perl (>= 0.35), libdbix-searchbuilder-perl, libfile-counterfile-perl, libfile-rsync-perl, libfrontier-rpc-perl, libhtml-format-perl, libhtml-tree-perl, libipc-run3-perl, libipc-sharelite-perl, liblingua-en-nameparse-perl, liblocale-maketext-fuzzy-perl, liblocale-maketext-lexicon-perl, liblocale-subcountry-perl, liblog-dispatch-perl, libmailtools-perl (>= 2), libmime-perl (>= 5.424) | libmime-perl (< 5.421), libnet-domain-tld-perl, libnet-scp-perl, libnet-ssh-perl, libnet-whois-raw-perl, libnetaddr-ip-perl, libnumber-format-perl, libregexp-common-perl, libstring-approx-perl, libstring-shellquote-perl, libterm-readkey-perl, libtest-inline-perl, libtext-autoformat-perl, libtext-csv-perl, libtext-template-perl, libtext-wrapper-perl, libtie-ixhash-perl, libtime-duration-perl, libtime-modules-perl, libtimedate-perl, libuniversal-require-perl, liburi-perl, libwant-perl, libwww-perl, libemail-sender-perl, libemail-sender-transport-smtp-tls-perl Recommends: libdbd-pg-perl, libdbd-mysql-perl, rsync Suggests: libbusiness-onlinepayment-perl Description: Libraries for Freeside billing and trouble ticketing diff --git a/debian/rules b/debian/rules index a8835e5fe..3b5ff41af 100755 --- a/debian/rules +++ b/debian/rules @@ -133,10 +133,11 @@ install-stamp: build-stamp #hack the build dir out of Freeside too. oh yeah, sucky. perl -p -i -e "\ s'${TMP}(-webui)?''g;\ - " ${TMP}-webui/usr/share/freeside/handler.pl \ - ${TMP}/usr/share/perl5/FS/* \ - ${TMP}/usr/share/perl5/FS/*/* \ - ${TMP}/usr/bin/* + " ${TMP}-webui/usr/local/etc/freeside/handler.pl \ + ${TMP}-webui/etc/freeside/apache2/* \ + ${TMP}-lib/usr/share/perl5/FS/* \ + ${TMP}-lib/usr/share/perl5/FS/*/* \ + ${TMP}-lib/usr/bin/* #rm -r $(FREESIDE_DOCUMENT_ROOT).* -- 2.11.0