[SCM] Positional Astronomy Library branch, debian, updated. 9021c9ddd5178263644864156edf755bdee57869
Ole Streicher
debian at liska.ath.cx
Tue Feb 7 20:31:35 UTC 2012
The following commit has been merged in the debian branch:
commit 18fb769c95a46e383706f7d1bddd9a974c98380b
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Feb 7 21:27:24 2012 +0100
Make autoreconf work
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..36ef297
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,12 @@
+COPYING
+INSTALL
+Makefile.in
+aclocal.m4
+config.guess
+config.h.in
+config.sub
+configure
+depcomp
+install-sh
+ltmain.sh
+missing
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7480f1e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_std_automake.patch
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
new file mode 100644
index 0000000..ce627a1
--- /dev/null
+++ b/debian/patches/use_std_automake.patch
@@ -0,0 +1,37 @@
+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
+--- 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)
+ 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])
+
+ 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
+ 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
diff --git a/debian/rules b/debian/rules
index 1c2c1dd..f7c1b9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,13 @@
#export DH_VERBOSE=1
%:
- dh $@
+ dh $@ --with autoreconf
+
+override_dh_autoreconf:
+ cp sla.news NEWS
+ cp SLA_CONDITIONS COPYING
+ cp read.me README
+ AUTOMAKE="automake --foreign" dh_autoreconf
debiandir_SQ = $(subst ','\'',$(dir $(lastword $(MAKEFILE_LIST))))
get-orig-source:
--
Positional Astronomy Library
More information about the debian-science-commits
mailing list