[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 6656228b824a35b8f23b428b952c26bf16377bc9

[Mark Wells]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  6656228b824a35b8f23b428b952c26bf16377bc9 (commit)
      from  27d155eb475ed1c22ee565aa0e743468a1f6d36c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6656228b824a35b8f23b428b952c26bf16377bc9
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Sep 27 23:55:47 2012 -0700

    fix caption/longtable conflict with modern LaTeX installs, #13908

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index aabc4e7..400bacc 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -64,6 +64,15 @@ sub upgrade_config {
   upgrade_overlimit_groups($conf);
   map { upgrade_overlimit_groups($conf,$_->agentnum) } qsearch('agent', {});
   
+  # change 'fslongtable' to 'longtable'
+  foreach my $name (qw(invoice_latex)) {
+    my $value = join("\n",$conf->config($name));
+    if (length($value)) {
+      $value =~ s/fslongtable/longtable/g;
+      $conf->set($name, $value);
+    }
+  }
+
 }
 
 sub upgrade_overlimit_groups {
diff --git a/Makefile b/Makefile
index f61d0bc..cd31c04 100644
--- a/Makefile
+++ b/Makefile
@@ -245,9 +245,9 @@ dev-perl-modules: perl-modules
 	ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
 
 install-texmf:	
-	install -D -o freeside -m 444 etc/fslongtable.sty \
-          `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty
-	texhash `kpsewhich -expand-var \\\$$TEXMFLOCAL`
+	install -D -o freeside -m 444 etc/longtable.sty \
+	  ~freeside/texmf/tex/longtable.sty
+	texhash ~freeside
 
 install-init:
 	#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
diff --git a/conf/invoice_latex b/conf/invoice_latex
index 772c2eb..d56a7fb 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -19,7 +19,7 @@
 
 \documentclass[letterpaper]{article}
 
-\usepackage{fancyhdr,lastpage,ifthen,array,fslongtable,afterpage,caption,multirow,bigstrut}
+\usepackage{fancyhdr,lastpage,ifthen,array,longtable,afterpage,caption,multirow,bigstrut}
 \usepackage{graphicx}			% required for logo graphic
 \usepackage[utf8]{inputenc}             % multilanguage support
 \usepackage[T1]{fontenc}
diff --git a/etc/fslongtable.sty b/etc/longtable.sty
similarity index 99%
rename from etc/fslongtable.sty
rename to etc/longtable.sty
index e322b55..66e2bf9 100644
--- a/etc/fslongtable.sty
+++ b/etc/longtable.sty
@@ -1,5 +1,5 @@
 %%
-%% This is file `fslongtable.sty',
+%% This is file `longtable.sty',
 %%
 %% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
 %% The LaTeX3 Project and any individual authors listed elsewhere

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Upgrade.pm                       |    9 +++++++++
 Makefile                               |    6 +++---
 conf/invoice_latex                     |    2 +-
 etc/{fslongtable.sty => longtable.sty} |    2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)
 rename etc/{fslongtable.sty => longtable.sty} (99%)