[freeside-commits] freeside/debian changelog, 1.2.6.7, 1.2.6.8 control, 1.3.4.1, 1.3.4.2 copyright, 1.1.14.1, 1.1.14.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/debian
In directory wavetail.420.am:/tmp/cvs-serv10311/debian

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	changelog control copyright 
Log Message:
1.7.4rc2

Index: control
===================================================================
RCS file: /home/cvs/cvsroot/freeside/debian/control,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -d -r1.3.4.1 -r1.3.4.2
--- control	8 Apr 2008 05:49:20 -0000	1.3.4.1
+++ control	12 Aug 2009 22:26:03 -0000	1.3.4.2
@@ -22,7 +22,7 @@
 
 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-temp
 late-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 @@
 
 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.

Index: copyright
===================================================================
RCS file: /home/cvs/cvsroot/freeside/debian/copyright,v
retrieving revision 1.1.14.1
retrieving revision 1.1.14.2
diff -u -d -r1.1.14.1 -r1.1.14.2
--- copyright	8 Apr 2008 05:49:20 -0000	1.1.14.1
+++ copyright	12 Aug 2009 22:26:03 -0000	1.1.14.2
@@ -9,7 +9,7 @@
 
 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 @@
 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 at 420.am> and
+The Debian packaging is (C) 2009, Ivan Kohler <ivan-debian at 420.am> and
 is licensed under the AGPL, see above.
 
 before uploading to debian proper, from httemplate/docs/license.html:

Index: changelog
===================================================================
RCS file: /home/cvs/cvsroot/freeside/debian/changelog,v
retrieving revision 1.2.6.7
retrieving revision 1.2.6.8
diff -u -d -r1.2.6.7 -r1.2.6.8
--- changelog	23 Jul 2009 21:01:11 -0000	1.2.6.7
+++ changelog	12 Aug 2009 22:26:03 -0000	1.2.6.8
@@ -1,9 +1,18 @@
+<<<<<<< changelog
+freeside (1.7.4~rc2-1) unstable; urgency=low
+
+  * New upstream (RC) release
+
+ -- Ivan Kohler <ivan-debian at 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 at 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