[SCM] Positional Astronomy Library branch, master, updated. 9dd932c7124c0f708fe5155a6aeafcb9faec440e

[Ole Streicher]

The following commit has been merged in the master branch:
commit 9dd932c7124c0f708fe5155a6aeafcb9faec440e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Feb 10 16:48:52 2012 +0100

    Merge fix_doc_gen to use_sdt_automake

diff --git a/debian/patches/fix_doc_generation.patch b/debian/patches/fix_doc_generation.patch
deleted file mode 100644
index 2041f45..0000000
--- a/debian/patches/fix_doc_generation.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Add rules for generating the documentation. This is needed since 
- the automated generation via starlink's automake rules does not work for us
- (since we dont use automake-starlink).
---- slalib-2.5.5.orig/Makefile.am
-+++ slalib-2.5.5/Makefile.am
-@@ -8,7 +8,9 @@ EXTRA_DIST = Notes
- 
- lib_LTLIBRARIES = libsla.la
- 
--stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
-+stardocs_DATA =  sun67.pdf
-+sun67.pdf: sun67.tex
-+	pdflatex $^
- 
- libsla_la_SOURCES = \
-         $(PRIVATE_INCLUDES) \
diff --git a/debian/patches/series b/debian/patches/series
index 3a009d6..e679a74 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 use_std_automake.patch
-fix_doc_generation.patch
 enable_locking.patch
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index 7b1e237..624cfb9 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -21,3 +21,16 @@ Description: Do not depend on the starlink's automake
  AC_PROG_LIBTOOL
  
  dnl    If --with-pic=no is set we should honour that.
+--- slalib-2.5.5.orig/Makefile.am
++++ slalib-2.5.5/Makefile.am
+@@ -8,7 +8,9 @@ EXTRA_DIST = Notes
+ 
+ lib_LTLIBRARIES = libsla.la
+ 
+-stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
++stardocs_DATA =  sun67.pdf
++sun67.pdf: sun67.tex
++	pdflatex $^
+ 
+ libsla_la_SOURCES = \
+         $(PRIVATE_INCLUDES) \

-- 
Positional Astronomy Library