[SCM] Handle World Coordinate Systems in Astronomy branch, debian, updated. 3d802f08414750c27e9d562a96dab1d46ea025aa

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 3d802f08414750c27e9d562a96dab1d46ea025aa
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jun 6 17:39:06 2013 +0200

    Integrate pdflatex in use_std_automake

diff --git a/debian/patches/series b/debian/patches/series
index 4119d54..336b916 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 rename_library
 use_std_automake.patch
 use_external_pal.patch
-use_pdflatex.patch
diff --git a/debian/patches/use_pdflatex.patch b/debian/patches/use_pdflatex.patch
deleted file mode 100644
index ada67d0..0000000
--- a/debian/patches/use_pdflatex.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Use pdflatex instead of pslatex to directly create
- documentation binaries
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -559,8 +559,8 @@
-     libstarlink_ast_pgplot3d.la
- 
- dist_pkgdata_DATA =  @STARDOCS at .pdf @STARDOCS@/index.html
--.tex.dvi:
--	pslatex $^ && pslatex $^
-+.tex.pdf:
-+	pdflatex $^ && pdflatex $^
- 
- .dvi.ps:
- 	dvips $^
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index 9b38abf..1c0feae 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -35,7 +35,7 @@ Description: Do not depend on the starlink's automake, but use their macro
  STAR_CHECK_PROGS(prolat, sst)   # prolat is part of SST
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -560,9 +560,20 @@
+@@ -560,9 +560,14 @@
      libstarlink_ast_pgplot.la \
      libstarlink_ast_pgplot3d.la
  
@@ -44,13 +44,7 @@ Description: Do not depend on the starlink's automake, but use their macro
 -dist_pkgdata_DATA = LICENCE
 +dist_pkgdata_DATA =  @STARDOCS at .pdf @STARDOCS@/index.html
 +.tex.dvi:
-+	pslatex $^ && pslatex $^
-+
-+.dvi.ps:
-+	dvips $^
-+
-+.ps.pdf:
-+	ps2pdf $^
++	pdflatex $^ && pdflatex $^
 +
 + at STARDOCS@/index.html: @STARDOCS at .tex
 +	latex2html -noaddress $^
@@ -59,7 +53,7 @@ Description: Do not depend on the starlink's automake, but use their macro
  
  # Make all library code position independent by default. This is handy for
  # creating shareable libraries from the static ones (Java JNI libraries).
-@@ -713,6 +724,7 @@
+@@ -713,6 +718,7 @@
  #  Use target install-exec-hook rather than install-exec-local so that the
  #  soft links and files are created *after* the main library has been
  #  installed.

-- 
Handle World Coordinate Systems in Astronomy