[SCM] Positional Astronomy Library branch, master, updated. 1f6effc23261e2e9c2320ca77862fecdebe7c384

[Ole Streicher]

The following commit has been merged in the master branch:
commit adfcd043f4fa7f55911d483ed0d32586685b0798
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Feb 10 12:22:12 2012 +0100

    Depend on external starconf instead of including it in the source

diff --git a/debian/control b/debian/control
index 027b1ff..e20d9f0 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
+ texlive, starconf
 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/get-orig-source.sh b/debian/get-orig-source.sh
index 0d2cb22..e8e42e8 100644
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -14,13 +14,6 @@ wget -O ${TMPDIR}/${PACKAGE_NAME}-git.tar.gz "${SLA_URL}"
 tar xf ${TMPDIR}/${PACKAGE_NAME}-git.tar.gz -C ${TMPDIR}
 
 #
-# Download the starconf.m4 file needed for automake/autoconf
-# The original location is buildsupport/starconf/starcond.m4.in
-#
-STARCONF_URL="http://starlink.jach.hawaii.edu/git/?p=starlink.git;a=blob_plain;f=buildsupport/starconf/starconf.m4.in;h=c888aee37a39d2ea28b10138b97c34c324e519b8;hb=d6a0e974c8e2744e79450cf002c65d27d1336586"
-wget -O ${TMPDIR}/starlink/starconf.m4 "${STARCONF_URL}"
-
-#
 # Retrieve package version from the AC_INIT(sla, 2.5-5, ussc at star.rl.ac.uk)
 # line of configure.ac
 #
@@ -45,7 +38,7 @@ gzip -n -9 -f ${PACKAGE_NAME}_${VERSION}.orig.tar
 #
 case ${VERSION} in
     2.5.5)
-	echo "213b1ef21b623e8044d50bc122eb0a9f  ${PACKAGE_NAME}_${VERSION}.orig.tar.gz" | \
+	echo "27566975b074b4a46a93aa10bfe749fc  ${PACKAGE_NAME}_${VERSION}.orig.tar.gz" | \
 	md5sum -c -
 	;;
     *)
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index a478f85..7b1e237 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -1,46 +1,23 @@
 Author: Ole Streicher <debian at liska.ath.cx>
-Description: Do not depend on the starlink's automake, but use their macro
- file together with the standard automake
+Description: Do not depend on the starlink's automake
 --- slalib-2.5.5.orig/configure.ac
 +++ slalib-2.5.5/configure.ac
-@@ -21,7 +21,8 @@ AC_SUBST(libsla_la_version_info, 7:0:0)
+@@ -21,7 +21,7 @@ AC_SUBST(libsla_la_version_info, 7:0:0)
  dnl    Require autoconf-2.50 at least
  AC_PREREQ(2.50)
  dnl    Require automake-1.8.2-starlink at least
 -AM_INIT_AUTOMAKE(1.8.2-starlink)
-+AM_INIT_AUTOMAKE(1.8.2)
-+m4_include([starconf.m4])
++AM_INIT_AUTOMAKE
  
  dnl    Sanity-check: name a file in the source directory -- if this
  dnl    isn't found then configure will complain
-@@ -31,8 +32,8 @@ dnl    Include defaults for Starlink con
+@@ -31,8 +32,7 @@ dnl    Include defaults for Starlink con
  STAR_DEFAULTS
  
  dnl    Find required versions of the programs we need for configuration
 -AC_PROG_FC
 -AC_PROG_FPP
-+#AC_PROG_FC
 +AC_PROG_F77
  AC_PROG_LIBTOOL
  
  dnl    If --with-pic=no is set we should honour that.
---- slalib-2.5.5.orig/starconf.m4
-+++ slalib-2.5.5/starconf.m4
-@@ -714,7 +714,7 @@ AC_DEFUN([STAR_PRM_COMPATIBLE_SYMBOLS],
- #
- AC_DEFUN([STAR_CNF_TRAIL_TYPE],
-    [AC_CHECK_SIZEOF(void*)dnl
--    AC_FC_HAVE_PERCENTLOC dnl
-+#    AC_FC_HAVE_PERCENTLOC dnl
-     AC_CACHE_CHECK([type used for Fortran string lengths],
-        [star_cv_cnf_trail_type],
-        [if test "$ac_cv_sizeof_voidp" = 8 -a "$ac_cv_fc_compiler_gnu" = no; then
-@@ -1790,7 +1790,7 @@ dnl The problem only affects g77/gcc, so
-                 AC_LANG_PUSH(C)
-                 rm -f conftest*
-                 star_cv_restfp_fixup=unknown
--                AC_LANG_CONFTEST(AC_LANG_PROGRAM([], restFP()))
-+                AC_LANG_CONFTEST([AC_LANG_PROGRAM([], restFP())])
-                 { AC_TRY_COMMAND($CC -o conftest.x -S conftest.c)
-                   test $ac_status = 0
-                 } &&

-- 
Positional Astronomy Library