[SCM] Handle World Coordinate Systems in Astronomy branch, debian, updated. 06c323adb35fa8d55e8797384d61edde80b5b643

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 502e26679078c127393adfb0f7ca11cc1bdcbfca
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Feb 17 11:36:21 2012 +0100

    Add locall starconf macros, and build documentation from .tex

diff --git a/debian/clean b/debian/clean
index edc0071..95afc4a 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,7 @@
 NEWS
+sun211.aux
+sun211.dvi
+sun211.log
+sun211.pdf
+sun211.toc
+sun211/*
diff --git a/debian/control b/debian/control
index 233bdda..a62e05f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libstarlink-ast
 Priority: extra
 Maintainer: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, dh-autoreconf, starconf, libsla-dev
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, dh-autoreconf, libsla-dev,
+ texlive, latex2html, ghostscript
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://www.starlink.ac.uk/ast
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index 871f230..8d6a2b0 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -3,12 +3,114 @@ Description: Do not depend on the starlink's automake, but use their macro
  file together with the standard automake
 --- a/configure.ac
 +++ b/configure.ac
-@@ -12,7 +12,7 @@ AC_INIT(ast, 6.0.1, ussc at star.rl.ac.uk)
+@@ -12,7 +12,11 @@ AC_INIT(ast, 6.0.1, ussc at star.rl.ac.uk)
  dnl   Require autoconf-2.50 at least
  AC_PREREQ(2.50)
  dnl   Require Starlink automake
 -AM_INIT_AUTOMAKE(1.8.2-starlink)
 +AM_INIT_AUTOMAKE
++
++# Comment out predistribution sources in Makefile.am
++PREDIST='#'  # safe default
++AC_SUBST(PREDIST)
  
  dnl   Sanity-check: name a file in the source directory
  AC_CONFIG_SRCDIR([ast_link.in])
+@@ -78,6 +78,7 @@ AC_CHECK_TYPES([long double])
+ 
+ #   ast_link needs to be able to link against the Fortran runtime if
+ #   necessary
++AC_PROG_FC
+ AC_FC_LIBRARY_LDFLAGS
+ 
+ #   Find an absolute path to the Perl binary, augmenting the path with the
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -328,9 +328,24 @@ lib_LTLIBRARIES = \
+     libast_levmar.la
+ 
+ 
+-stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
+-dist_starnews_DATA = ast.news
+-dist_pkgdata_DATA = LICENCE
++dist_pkgdata_DATA =  sun211.pdf sun211/index.html
++.tex.dvi:
++	pslatex $^ && pslatex $^
++
++.dvi.ps:
++	dvips $^
++
++.ps.pdf:
++	ps2pdf $^
++
++sun211/index.html: sun211.tex
++	latex2html -noaddress $^
++
++dist_pkgdata_DATA += ast.news
++dist_pkgdata_DATA += LICENCE
++
++test: ast_test
++	ast_test
+ 
+ # Make all library code position independent by default. This is handy for
+ # creating shareable libraries from the static ones (Java JNI libraries).
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1 +1,56 @@
+-m4_define([OVERRIDE_PREFIX],[/usr/local])
++m4_define([OVERRIDE_PREFIX],[/usr/])
++
++AC_DEFUN([STAR_DEFAULTS],[
++
++# Create a PACKAGE_VERSION_INTEGER variable, which contains the
++# package's version number as an integer major*1e6+minor*1e3+release.
++eval [`echo $VERSION | sed -e 's/\([0-9]*\)[^0-9]*\([0-9]*\)[^0-9]*\([0-9]*\).*/PACKAGE_VERSION_MAJOR=\1; PACKAGE_VERSION_MINOR=\2; PACKAGE_VERSION_RELEASE=\3;/'`]
++test -n "$PACKAGE_VERSION_MAJOR"   || PACKAGE_VERSION_MAJOR=0
++test -n "$PACKAGE_VERSION_MINOR"   || PACKAGE_VERSION_MINOR=0
++test -n "$PACKAGE_VERSION_RELEASE" || PACKAGE_VERSION_RELEASE=0
++PACKAGE_VERSION_INTEGER=`expr $PACKAGE_VERSION_MAJOR \* 1000000 + $PACKAGE_VERSION_MINOR \* 1000 + $PACKAGE_VERSION_RELEASE`
++AC_SUBST(PACKAGE_VERSION_MAJOR)
++AC_SUBST(PACKAGE_VERSION_MINOR)
++AC_SUBST(PACKAGE_VERSION_RELEASE)
++AC_SUBST(PACKAGE_VERSION_INTEGER)
++])
++
++# Dummy declaration of starlink intedependencies
++AC_DEFUN([STAR_DECLARE_DEPENDENCIES], [])
++
++#  Perform the check that configures f77.h.in for the return type of REAL
++#  Fortran functions. On 64-bit g77 with f2c compatibility this is double
++#  not float.
++AC_DEFUN([STAR_CNF_F2C_COMPATIBLE], [
++    AC_SUBST([REAL_FUNCTION_TYPE], double)
++])
++
++# Determine the type of Fortran character string lengths.
++AC_DEFUN([STAR_CNF_TRAIL_TYPE], [
++    AC_SUBST([TRAIL_TYPE], int)
++])
++
++#   Declare the message file.
++AC_DEFUN([STAR_MESSGEN], [])
++
++#   Declare the documentation.  
++# For Debian, this must be explicitely set in the patched Makefile.am
++# since we don't use Starlink's automake here.
++AC_DEFUN([STAR_LATEX_DOCUMENTATION], [
++    AC_SUBST([STAR_LATEX_DOCUMENTATION], [])
++])
++
++
++AC_DEFUN([STAR_PREDIST_SOURCES], [])
++
++AC_DEFUN([STAR_PLATFORM_SOURCES], [
++for _t in $1; do
++    (cd ${srcdir}; rm -f ${_t}; cp -p ${_t}default ${_t})
++done
++])
++
++# We ignor]e any starlinks programs here since we don' install the whole 
++# Starlink bootstrap chain.
++AC_DEFUN([STAR_CHECK_PROGS], [])
++
++
diff --git a/debian/rules b/debian/rules
index 56d4b91..75d5eab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,6 @@ export MANIFEST=/bin/true
 
 override_dh_autoreconf:
 	cp ast.news NEWS
+	rm -f sun211.ps
 	AUTOMAKE="automake --foreign" dh_autoreconf
 
-

-- 
Handle World Coordinate Systems in Astronomy