[starlink-ast] 02/02: Update patches for new upstream version

Ole Streicher olebole-guest at moszumanska.debian.org
Mon Mar 10 09:59:46 UTC 2014


This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository starlink-ast.

commit d45238ada02f337a6b942744b23f314944a22a1e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Mar 10 10:59:23 2014 +0100

    Update patches for new upstream version
---
 debian/changelog                      |  6 ++++++
 debian/patches/rename_library         |  4 ++--
 debian/patches/use_external_pal.patch |  2 +-
 debian/patches/use_std_automake.patch | 14 +++-----------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed11ea2..5b63692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+starlink-ast (7.3.4+dfsg-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 10 Mar 2014 10:34:04 +0100
+
 starlink-ast (7.3.3+dfsg-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index 2e46f96..e42c95b 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
-@@ -163,7 +163,7 @@
+@@ -174,7 +174,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.
  
  
-@@ -171,7 +171,7 @@
+@@ -182,7 +182,7 @@
  ----------------------
  
  - The levmar and wcslib code distributed within AST is now stored in the
diff --git a/debian/patches/use_external_pal.patch b/debian/patches/use_external_pal.patch
index 1d35de6..65075a6 100644
--- a/debian/patches/use_external_pal.patch
+++ b/debian/patches/use_external_pal.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: The external PAL library in Debian is called "starlink-pal".
 --- a/configure.ac
 +++ b/configure.ac
-@@ -57,7 +57,7 @@
+@@ -56,7 +56,7 @@
          external_pal="0")
  AC_SUBST( EXTERNAL_PAL, $external_pal )
  if test "$external_pal" = "1"; then
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index 6cf8d37..6d3883f 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -3,9 +3,9 @@ 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
-@@ -12,7 +12,11 @@
+@@ -13,7 +13,11 @@
  dnl   Require autoconf-2.50 at least
- AC_PREREQ(2.50)
+ AC_PREREQ([2.69])
  dnl   Require Starlink automake
 -AM_INIT_AUTOMAKE(1.8.2-starlink)
 +AM_INIT_AUTOMAKE([foreign])
@@ -16,15 +16,7 @@ Description: Do not depend on the starlink's automake, but use their macro
  
  dnl   Sanity-check: name a file in the source directory
  AC_CONFIG_SRCDIR([ast_link.in])
-@@ -107,6 +111,7 @@
- 
- #   ast_link needs to be able to link against the Fortran runtime if
- #   necessary
-+AC_PROG_FC
- AC_FC_LIBRARY_LDFLAGS
- 
- #   Find an absolute path to the Perl binary, augmenting the path with the
-@@ -175,7 +180,7 @@
+@@ -175,7 +179,7 @@
  #   satisfy these targets, so give a non-null value
  #   for the second argument, to suppress automatic generation of
  #   rules.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/starlink-ast.git



More information about the debian-science-commits mailing list