[Pkg-sql-ledger-commit] r484 - in trunk/debian: . patches

[pkg-sql-ledger-commit-owner at lists.alioth.debian.org]

Author: hertzog
Date: 2012-04-03 19:50:41 +0000 (Tue, 03 Apr 2012)
New Revision: 484

Added:
   trunk/debian/patches/latex-cmdline-option
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
   trunk/debian/postinst
Log:
* New patch to allow changing pdflatex/latex command lines via
  $exec_latex and $exec_pdflatex config variables.
* Drop postinst code that resets ownership to www-data. The .deb has
  correct information now.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2012-04-03 19:29:40 UTC (rev 483)
+++ trunk/debian/changelog	2012-04-03 19:50:41 UTC (rev 484)
@@ -1,6 +1,10 @@
 sql-ledger (3.0.0-2) UNRELEASED; urgency=low
 
   * Fix typo in debian/NEWS.
+  * New patch to allow changing pdflatex/latex command lines via
+    $exec_latex and $exec_pdflatex config variables.
+  * Drop postinst code that resets ownership to www-data. The .deb has
+    correct information now.
 
  -- Raphaël Hertzog <hertzog at debian.org>  Tue, 03 Apr 2012 21:28:08 +0200
 

Added: trunk/debian/patches/latex-cmdline-option
===================================================================
--- trunk/debian/patches/latex-cmdline-option	                        (rev 0)
+++ trunk/debian/patches/latex-cmdline-option	2012-04-03 19:50:41 UTC (rev 484)
@@ -0,0 +1,43 @@
+Description: Allow changing latex & pdflatex command line options
+Author: Raphaël Hertzog <hertzog at debian.org>
+--- a/SL/Form.pm
++++ b/SL/Form.pm
+@@ -1152,10 +1152,11 @@ sub run_latex {
+ 
+   my $r = 1;
+ 
++  our $exec_latex //= "latex";
+   if ($self->{format} eq 'ps') {
+-    system("latex --interaction=nonstopmode $self->{tmpfile} > $self->{errfile}");
++    system("$exec_latex --interaction=nonstopmode $self->{tmpfile} > $self->{errfile}");
+     while ($self->rerun_latex) {
+-      system("latex --interaction=nonstopmode $self->{tmpfile} > $self->{errfile}");
++      system("$exec_latex --interaction=nonstopmode $self->{tmpfile} > $self->{errfile}");
+       last if ++$r > 4;
+     }
+     $self->{tmpfile} =~ s/tex$/dvi/;
+@@ -1171,9 +1172,9 @@ sub run_latex {
+   if ($self->{format} eq 'pdf') {
+ 
+     if ($dvipdf) {
+-      system("latex --interaction=nonstopmode $self->{tmpfile} > $self->{errfile}");
++      system("$exec_latex --interaction=nonstopmode $self->{tmpfile} > $self->{errfile}");
+       while ($self->rerun_latex) {
+-	system("latex --interaction=nonstopmode $self->{tmpfile} > $self->{errfile}");
++	system("$exec_latex --interaction=nonstopmode $self->{tmpfile} > $self->{errfile}");
+ 	last if ++$r > 4;
+       }
+       $self->{tmpfile} =~ s/tex$/dvi/;
+@@ -1184,9 +1185,10 @@ sub run_latex {
+       $self->{tmpfile} =~ s/dvi$/pdf/;
+       
+     } else {
+-      system("pdflatex --interaction=nonstopmode $self->{tmpfile} > $self->{errfile}");
++      our $exec_pdflatex //= "pdflatex";
++      system("$exec_pdflatex --interaction=nonstopmode $self->{tmpfile} > $self->{errfile}");
+       while ($self->rerun_latex) {
+-	system("pdflatex --interaction=nonstopmode $self->{tmpfile} > $self->{errfile}");
++	system("$exec_pdflatex --interaction=nonstopmode $self->{tmpfile} > $self->{errfile}");
+ 	last if ++$r > 4;
+       }
+ 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2012-04-03 19:29:40 UTC (rev 483)
+++ trunk/debian/patches/series	2012-04-03 19:50:41 UTC (rev 484)
@@ -1,2 +1,3 @@
 # List of patches to apply.
+latex-cmdline-option
 45crosslink

Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst	2012-04-03 19:29:40 UTC (rev 483)
+++ trunk/debian/postinst	2012-04-03 19:50:41 UTC (rev 484)
@@ -2,12 +2,6 @@
 
 set -e
 
-(
-  cd /var/lib/sql-ledger ; 
-  chown www-data:www-data users templates
-  chown -R www-data:www-data css
-)
-
 if ! test -L /usr/lib/sql-ledger; then
     # Work around dpkg bug (can't replace dir by symlink itself)
     (rmdir /usr/lib/sql-ledger && ln -sf /usr/share/sql-ledger /usr/lib/sql-ledger) || \