[SCM] Positional Astronomy Library branch, debian, updated. 55fb36f046aef9e9c7edc396c0b45dc13f4549ab

Tue Feb 7 22:07:09 UTC 2012

The following commit has been merged in the debian branch:
commit 55fb36f046aef9e9c7edc396c0b45dc13f4549ab
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Feb 7 22:58:25 2012 +0100

    Fix compilation problems

diff --git a/debian/changelog b/debian/changelog
index 6d39ff6..9bb64eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 slalib (2.5.5-1) unstable; urgency=low
 
-  * Initial release. Closes #659003
+  * Initial release. Closes: #659003
 
  -- Ole Streicher <debian at liska.ath.cx>  Tue, 07 Feb 2012 19:35:00 +0100
diff --git a/debian/clean b/debian/clean
index 5ba98df..1ac8242 100644
--- a/debian/clean
+++ b/debian/clean
@@ -12,4 +12,7 @@ ltmain.sh
 missing
 NEWS
 README
-
+sun67.aux
+sun67.log
+sun67.pdf
+sun67.toc
diff --git a/debian/control b/debian/control
index 501a33d..f8ade7e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/slalib.git
 Package: libsla-dev
 Section: libdevel
 Architecture: any
-Depends: libsla (= ${binary:Version}), ${misc:Depends}
-Description: Positional Astronomy Library
+Depends: libsla7 (= ${binary:Version}), ${misc:Depends}
+Description: Positional Astronomy Library (development files)
  SLALIB1is a library of routines intended to make accurate and
  reliable positional-astronomy applications easier to write. Most
  SLALIB routines are concerned with astronomical position and time, but
@@ -22,11 +22,11 @@ Description: Positional Astronomy Library
  .
  This package contains the development files.
 
-Package: libsla0
+Package: libsla7
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Positional Astronomy Library
+Description: Positional Astronomy Library (shared library)
  SLALIB1is a library of routines intended to make accurate and
  reliable positional-astronomy applications easier to write. Most
  SLALIB routines are concerned with astronomical position and time, but
@@ -34,17 +34,3 @@ Description: Positional Astronomy Library
  applications.
  .
  This library contains the shared library.
-
-Package: libsla-doc
-Section: libdevel
-Architecture: any
-Depends: libsla (= ${binary:Version}), ${misc:Depends}
-Description: Positional Astronomy Library
- SLALIB1is a library of routines intended to make accurate and
- reliable positional-astronomy applications easier to write. Most
- SLALIB routines are concerned with astronomical position and time, but
- a number have wider trigonometrical, numerical or general
- applications.
- .
- This package contains the documentation files.
-
diff --git a/debian/libsla-dev.doc-base b/debian/libsla-dev.doc-base
new file mode 100644
index 0000000..0d83deb
--- /dev/null
+++ b/debian/libsla-dev.doc-base
@@ -0,0 +1,10 @@
+Document: sun67
+Title: SLALIB --- Positional Astronomy Library
+Section: Programming
+Abstract: SLALIB is a library used by writers of positional-astronomy 
+ applications. Most of the routines are concerned with astronomical position
+ and time, but a number have wider trigonometrical, numerical or general 
+ applications.
+
+Format: PDF
+Files: /usr/share/doc/libsla-dev/sun67.pdf.gz
diff --git a/debian/libsla-dev.docs b/debian/libsla-dev.docs
new file mode 100644
index 0000000..57102f1
--- /dev/null
+++ b/debian/libsla-dev.docs
@@ -0,0 +1,3 @@
+sun67.pdf
+NEWS
+README
diff --git a/debian/libsla-dev.install b/debian/libsla-dev.install
new file mode 100644
index 0000000..80f35dc
--- /dev/null
+++ b/debian/libsla-dev.install
@@ -0,0 +1,3 @@
+usr/lib/libsla.so
+usr/lib/libsla.a
+usr/include/star/slalib.h
diff --git a/debian/libsla7.install b/debian/libsla7.install
new file mode 100644
index 0000000..6529979
--- /dev/null
+++ b/debian/libsla7.install
@@ -0,0 +1,2 @@
+usr/lib/libsla.so.7.0.0
+usr/lib/libsla.so.7
diff --git a/debian/patches/fix_doc_generation.patch b/debian/patches/fix_doc_generation.patch
new file mode 100644
index 0000000..2041f45
--- /dev/null
+++ b/debian/patches/fix_doc_generation.patch
@@ -0,0 +1,17 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Add rules for generating the documentation. This is needed since 
+ the automated generation via starlink's automake rules does not work for us
+ (since we dont use automake-starlink).
+--- slalib-2.5.5.orig/Makefile.am
++++ slalib-2.5.5/Makefile.am
+@@ -8,7 +8,9 @@ EXTRA_DIST = Notes
+ 
+ lib_LTLIBRARIES = libsla.la
+ 
+-stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
++stardocs_DATA =  sun67.pdf
++sun67.pdf: sun67.tex
++	pdflatex $^
+ 
+ libsla_la_SOURCES = \
+         $(PRIVATE_INCLUDES) \
diff --git a/debian/patches/series b/debian/patches/series
index 7480f1e..e10e3b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 use_std_automake.patch
+fix_doc_generation.patch
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index ce627a1..a478f85 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -35,3 +35,12 @@ Description: Do not depend on the starlink's automake, but use their macro
      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
+                 } &&
diff --git a/debian/rules b/debian/rules
index f7c1b9b..7573db3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,9 @@ override_dh_autoreconf:
 	cp read.me README
 	AUTOMAKE="automake --foreign" dh_autoreconf
 
+override_dh_auto_configure:
+	dh_auto_configure -- --without-cnf
+
 debiandir_SQ = $(subst ','\'',$(dir $(lastword $(MAKEFILE_LIST))))
 get-orig-source:
 	sh '$(debiandir_SQ)'get-orig-source.sh
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..902e96a
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+# Empty file since the source is downloaded from a git repository.
+# Use get-orig-source.sh or the "rules" target get-orig-source
+# to download the current source tree.

-- 
Positional Astronomy Library

