[SCM] Positional Astronomy Library branch, master, updated. 0a30b689258c0e8024d4822d3540e66136aaca53

[Ole Streicher]

The following commit has been merged in the master branch:
commit 0a30b689258c0e8024d4822d3540e66136aaca53
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Feb 16 17:30:21 2012 +0100

    Revert to local configuration without a "starconf" package.

diff --git a/debian/control b/debian/control
index e20d9f0..027b1ff 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
 Build-Depends: debhelper (>= 7.5.0), autotools-dev, dh-autoreconf, gfortran,
- texlive, starconf
+ texlive
 Standards-Version: 3.9.2
 Homepage: http://starlink.jach.hawaii.edu/starlink
 Vcs-Git: git://git.debian.org/git/debian-science/packages/slalib.git
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index 624cfb9..1274101 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -1,7 +1,9 @@
 Author: Ole Streicher <debian at liska.ath.cx>
-Description: Do not depend on the starlink's automake
---- slalib-2.5.5.orig/configure.ac
-+++ slalib-2.5.5/configure.ac
+Description: Starlink uses a special build system with patched versions of 
+ autoake and autoconf as well as local macros. For Debian, we need a very 
+ simple version of this, provided by this patch.
+--- a/configure.ac
++++ b/configure.ac
 @@ -21,7 +21,7 @@ AC_SUBST(libsla_la_version_info, 7:0:0)
  dnl    Require autoconf-2.50 at least
  AC_PREREQ(2.50)
@@ -11,11 +13,10 @@ Description: Do not depend on the starlink's automake
  
  dnl    Sanity-check: name a file in the source directory -- if this
  dnl    isn't found then configure will complain
-@@ -31,8 +32,7 @@ dnl    Include defaults for Starlink con
- STAR_DEFAULTS
+@@ -32,7 +32,7 @@ STAR_DEFAULTS
  
  dnl    Find required versions of the programs we need for configuration
--AC_PROG_FC
+ AC_PROG_FC
 -AC_PROG_FPP
 +AC_PROG_F77
  AC_PROG_LIBTOOL
@@ -28,9 +29,79 @@ Description: Do not depend on the starlink's automake
  lib_LTLIBRARIES = libsla.la
  
 -stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
-+stardocs_DATA =  sun67.pdf
-+sun67.pdf: sun67.tex
-+	pdflatex $^
++dist_pkgdata_DATA +=  sun67.pdf
++.tex.pdf:
++	pdflatex $<
  
  libsla_la_SOURCES = \
          $(PRIVATE_INCLUDES) \
+@@ -72,5 +74,5 @@ sla_test_LDADD = libsla.la
+ slaTest_SOURCES = slaTest.c
+ slaTest_LDADD   = libsla.la @FCLIBS@
+ 
+-dist_starnews_DATA = sla.news
++dist_pkgdata_DATA += sla.news
+ DISTCLEANFILES = gresid.F random.F wait.f
+--- /dev/null
++++ slalib-2.5.6/acinclude.m4
+@@ -0,0 +1,60 @@
++m4_define([OVERRIDE_PREFIX],[/usr/])
++
++# Comment out predistribution sources in Makefile.am
++PREDIST='#'  # safe default
++AC_SUBST(PREDIST)
++
++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], [])
++
++

-- 
Positional Astronomy Library