1.7.4rc2

4 files changed, 81 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 64ba46b36..3f2c16514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,80 @@
+2009-08-12 15:26  ivan
+
+	* Makefile, debian/changelog, debian/control, debian/copyright:
+	  1.7.4rc2
+
+2009-08-12 04:57  ivan
+
+	* httemplate/: docs/about.html, docs/credits.html,
+	  docs/license.html, elements/header-popup.html: slight
+	  about/credits UI tweak
+
+2009-08-11 19:36  ivan
+
+	* FS/FS/cust_pkg.pm, httemplate/misc/bulk_change_pkg.cgi,
+	  httemplate/search/cust_pkg.cgi: fix multiple pkgpart search,
+	  RT#5924
+
+2009-08-11 14:32  rsiddall
+
+	* install/rpm/freeside.spec: Back out kludge to show CVS snapshot
+	  date in version number in GUI.  You'll have to do an "rpm -q" to
+	  determine this.
+
+2009-08-11 14:29  rsiddall
+
+	* Makefile: Reset RPM release number back to 1 on a new version
+	  release.
+
+2009-08-05 16:32  ivan
+
+	* FS/FS/part_pkg/: flat.pm, flat_delayed.pm, prorate_delayed.pm:
+	  fix cancellation errors with updated flat_introrate, RT#5865
+
+2009-08-04 19:27  ivan
+
+	* FS/FS/: svc_acct.pm: export negative byte values to chillispot
+	  attributes as 0, RT#5815
+
+2009-08-04 16:49  ivan
+
+	* FS/: FS/svc_acct.pm, bin/freeside-sqlradius-reset: hopefully
+	  ignore errors about deleted accounts and properly finish
+	  freeside-sqlradius-reset, RT#5868
+
+2009-08-04 15:04  ivan
+
+	* FS/: FS/svc_Common.pm, bin/freeside-sqlradius-reset: ignore
+	  problams calling ->overlimit during sqlradius-reset, wtf?!
+	  RT#5868
+
+2009-07-26 11:39  ivan
+
+	* FS/FS/Conf.pm: some whitespace changes to make it easier to keep
+	  in sync with 1.9 Conf_compat17.pm, RT#2873
+
+2009-07-25 23:38  jeff
+
+	* FS/bin/freeside-apply_payments_and_credits: command line tool to
+	  apply payments and credits
+
+2009-07-25 15:00  ivan
+
+	* htetc/handler.pl: set a character encoding for all pages; this
+	  should fix problems with diamond question marks even when the
+	  server gets an UTF-8 default setting, RT#3094
+
+2009-07-24 02:38  ivan
+
+	* FS/FS/: Conf.pm, svc_acct.pm: add handling of ChilliSpot (and
+	  CoovaChilli) Max attributes, specifically
+	  ChilliSpot-Max-{Input,Output,Total}-{Octets,Gigawords}, RT#5815
+
+2009-07-23 14:00  ivan
+
+	* ChangeLog, install/rpm/freeside.spec, debian/changelog: Updated
+	  for 1.7.4rc1
+
 2009-07-23 13:49  ivan
 
 	* rt/: Makefile, bin/mason_handler.fcgi, bin/mason_handler.scgi,
diff --git a/debian/changelog b/debian/changelog
index 33c2f7a01..3b28b4441 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,15 @@
-<<<<<<< changelog
 freeside (1.7.4~rc2-1) unstable; urgency=low
 
   * New upstream (RC) release
 
  -- Ivan Kohler <ivan-debian@420.am>  Wed, 12 Aug 2009 14:18:29 -0700
 
-=======
 freeside (1.7.4~rc1-1) unstable; urgency=low
 
   * New upstream release
 
  -- Ivan Kohler <ivan-debian@420.am>  Thu, 23 Jul 2009 14:01:10 -0700
 
->>>>>>> 1.2.6.7
 freeside (1.7.3-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index a8552a285..0576d4174 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Description: Billing and trouble ticketing for service providers
 
 Package: freeside-lib
 Architecture: all
-Depends: ghostscript | gs-gpl, gsfonts, tetex-base, tetex-bin, 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-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
+Depends: ghostscript | gs-gpl, gsfonts, tetex-base, tetex-bin, 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, libfile-slurp-perl, libfrontier-rpc-perl, libhtml-format-perl, libhtml-tree-perl, libipc-run-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-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
 Recommends: libdbd-pg-perl, libdbd-mysql-perl, rsync
 Suggests: libbusiness-onlinepayment-perl
 Description: Libraries for Freeside billing and trouble ticketing
@@ -40,7 +40,7 @@ Description: Libraries for Freeside billing and trouble ticketing
 
 Package: freeside-webui
 Architecture: all
-Depends: freeside-lib, apache2, libapache2-mod-perl2, libapache2-request-perl, libapache-session-perl, libchart-perl, libcolor-scheme-perl, libdatetime-perl, libdatetime-format-strptime-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgd-graph-perl, libhtml-mason-perl, libhtml-scrubber-perl, libhtml-widgets-selectlayers-perl, libio-stringy-perl, libjson-perl, liblingua-en-inflect-perl, libmodule-versions-report-perl, libspreadsheet-writeexcel-perl, libtree-simple-perl, libyaml-perl
+Depends: freeside-lib, apache2, libapache2-mod-perl2, libapache2-request-perl, libapache-session-perl, libchart-perl, libcolor-scheme-perl, libcss-squish-perl, libdatetime-perl, libdatetime-format-strptime-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgd-graph-perl, libhtml-mason-perl (>= 1.40), libhtml-scrubber-perl, libhtml-widgets-selectlayers-perl, libio-stringy-perl, libjson-perl, liblingua-en-inflect-perl, libmodule-versions-report-perl, libspreadsheet-parseexcel-perl, libspreadsheet-writeexcel-perl, libtree-simple-perl, libyaml-perl
 Recommends: libapache-dbi-perl
 Description: Web interface for Freeside billing and trouble ticketing
  Freeside is a web-based billing and trouble ticketing application.
diff --git a/debian/copyright b/debian/copyright
index c409cb99e..612db9078 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ Upstream Author(s):
 
 Copyright: 
 
-Copyright (C) 2005-2008 Freeside Internet Services, Inc.
+Copyright (C) 2005-2009 Freeside Internet Services, Inc.
 Copyright (C) 2000-2005 Ivan Kohler
 Copyright (C) 1999 Silicon Interactive Software Design
 All rights reserved
@@ -36,7 +36,7 @@ On Debian systems, the complete text of the GNU Affero General
 Public License may someday be found in `/usr/share/common-licenses/AGPL'.
 Until then, you can find it in `/usr/share/doc/freeside/AGPL'.
 
-The Debian packaging is (C) 2008, Ivan Kohler <ivan-debian@420.am> and
+The Debian packaging is (C) 2009, Ivan Kohler <ivan-debian@420.am> and
 is licensed under the AGPL, see above.
 
 before uploading to debian proper, from httemplate/docs/license.html: