[SCM] Position Astronomy Library branch, debian, updated. 878203aad96b755ee2192d014b3a30bf19707e64

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 878203aad96b755ee2192d014b3a30bf19707e64
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 27 14:37:18 2012 +0200

    Add install files, apply usual starlink patches

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..e71c73d
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,8 @@
+aclocal.m4
+config.guess
+config.h.in
+config.log
+config.sub
+configure
+install-sh
+ltmain.sh
diff --git a/debian/libstarlink-pal-dev.install b/debian/libstarlink-pal-dev.install
new file mode 100644
index 0000000..94dd187
--- /dev/null
+++ b/debian/libstarlink-pal-dev.install
@@ -0,0 +1,4 @@
+usr/include/star/*.h
+usr/lib/libstarlink_pal.a  
+usr/lib/libstarlink_pal.so
+
diff --git a/debian/libstarlink-pal0.install b/debian/libstarlink-pal0.install
new file mode 100644
index 0000000..59f5aca
--- /dev/null
+++ b/debian/libstarlink-pal0.install
@@ -0,0 +1 @@
+usr/lib/libstarlink_pal.so.*
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..1a4981c
--- /dev/null
+++ b/debian/patches/use_std_automake.patch
@@ -0,0 +1,84 @@
+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
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@ AC_INIT(pal, 0.1.0, stardev at jiscmail.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
+ 
+ dnl    Sanity-check: name a file in the source directory -- if this
+ dnl    isn't found then configure will complain
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libpal.la
+ libpal_la_SOURCES = $(PUBLIC_C_FILES)
+ 
+ # Force a link against SOFA
+-libpal_la_LIBADD = $(libdir)/libsofa_c.la $(libdir)/libstarutil.la
++libpal_la_LIBADD = -lsofa_c
+ 
+ # Make all library code position independent. This is handy for creating
+ # shareable libraries from the static ones (Java JNI libraries).
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -0,0 +1,56 @@
++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 65931be..fdd3456 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,19 +3,21 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CPPFLAGS+=-DNOSTARUTIL
+
 %:
 	dh $@ --with autoreconf
 
 override_dh_autoreconf:
-	cp sla.news NEWS
-	cp SLA_CONDITIONS COPYING
-	cp read.me README
+	sed s/libpal/libstarlink_pal/g -i Makefile.am
 	AUTOMAKE="automake --foreign" dh_autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --without-cnf --with-pthreads
 
-FFLAGS+=-frecursive -DUSE_LOCAL_AUTO
+override_dh_clean:
+	sed s/libstarlink_pal/libpal/g -i Makefile.am
+	dh_clean
 
 debiandir_SQ = $(subst ','\'',$(dir $(lastword $(MAKEFILE_LIST))))
 get-orig-source:

-- 
Position Astronomy Library