[SCM] Handle World Coordinate Systems in Astronomy branch, debian, updated. e4af438b9625f95c5992ff917f54bf5bffe4d369
Ole Streicher
debian at liska.ath.cx
Wed Jul 18 07:16:45 UTC 2012
The following commit has been merged in the debian branch:
commit e4af438b9625f95c5992ff917f54bf5bffe4d369
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Jul 18 09:16:11 2012 +0200
Update patches; remove whitespace
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index ee77620..a5f925e 100644
--- a/debian/patches/rename_library
+++ b/debian/patches/rename_library
@@ -212,7 +212,7 @@ Description: "ast" is a quite short name for a library that is so
+ast_test_LDADD = @LIBPAL@ libstarlink_ast.la libstarlink_ast_pal.la libstarlink_ast_grf_3.2.la libstarlink_ast_grf_5.6.la libstarlink_ast_grf_2.0.la libstarlink_ast_grf3d.la libstarlink_ast_err.la -lm
--- a/ast.news
+++ b/ast.news
-@@ -44,7 +44,7 @@
+@@ -52,7 +52,7 @@
Main Changes in V7.0.2
----------------------
@@ -221,7 +221,7 @@ Description: "ast" is a quite short name for a library that is so
option is used when AST is configured.
-@@ -52,7 +52,7 @@
+@@ -60,7 +60,7 @@
----------------------
- The levmar and wcslib code distributed within AST is now stored in the
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index f82bad6..14aa050 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -106,7 +106,7 @@ Description: Do not depend on the starlink's automake, but use their macro
+# Declare the message file.
+AC_DEFUN([STAR_MESSGEN], [])
+
-+# Declare the documentation.
++# 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], [
@@ -122,7 +122,7 @@ Description: Do not depend on the starlink's automake, but use their macro
+done
+])
+
-+# We ignor]e any starlinks programs here since we don' install the whole
++# We ignor]e any starlinks programs here since we don' install the whole
+# Starlink bootstrap chain.
+AC_DEFUN([STAR_CHECK_PROGS], [])
+
--
Handle World Coordinate Systems in Astronomy
More information about the debian-science-commits
mailing list