[Debian-astro-commits] [starlink-ast] 04/05: Rediff patches

Ole Streicher olebole at moszumanska.debian.org
Tue Jul 5 13:41:10 UTC 2016


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

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

commit f784e0cc36b5e3db11ca5f19e74e52968ea594b0
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Jul 5 15:23:38 2016 +0200

    Rediff patches
---
 debian/patches/rename_library                     | 40 +++++++------
 debian/patches/use_external_cminpack.patch        | 17 +++++-
 debian/patches/use_external_pal.patch             | 64 ++++++++++++---------
 debian/patches/use_std_automake.patch             | 68 ++++++++++++++---------
 debian/patches/workround_armhf_compiler_bug.patch | 33 ++++++-----
 5 files changed, 137 insertions(+), 85 deletions(-)

diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index 455be61..503ddc7 100644
--- a/debian/patches/rename_library
+++ b/debian/patches/rename_library
@@ -1,15 +1,21 @@
 From: Ole Streicher <olebole at debian.org>
-Last-Update: 2015-10-14
-Subject: "ast" is a quite short name for a library that is so 
- specific as this one. Therefore, and for consistency with the "pal" library, 
- "ast" is prefixed by the vendor name "starlink".
- .
- This patch can be re-created by running 
-  debian/create_patches_rename_library.sh
- on the freshly unpacked source tarball.
+Date: Tue, 5 Jul 2016 15:13:46 +0200
+Subject: "ast" is a quite short name for a library that is so specific as
+ this one. Therefore, and for consistency with the "pal" library,
+ "ast" is prefixed by the vendor name "starlink". . This patch can be
+ re-created by running debian/create_patches_rename_library.sh on the freshly
+ unpacked source tarball.
+
+---
+ Makefile.am | 104 ++++++++++++++++++++++++++++++------------------------------
+ ast.news    |   4 +--
+ 2 files changed, 54 insertions(+), 54 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b3ff279..75667dd 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -248,7 +248,7 @@
+@@ -248,7 +248,7 @@ F_C_INCLUDE_FILES = \
  
  # The following list should include AST_PAR, but that must not be
  # distributed, and so it is listed separately in
@@ -18,7 +24,7 @@ Subject: "ast" is a quite short name for a library that is so
  GRP_F_INCLUDE_FILES = \
      GRF_PAR \
      AST_ERR
-@@ -571,21 +571,21 @@
+@@ -571,21 +571,21 @@ include_MESSAGES = AST_ERR ast_err.h
  if EXTERNAL_PAL
  PAL_LIB =
  else
@@ -51,7 +57,7 @@ Subject: "ast" is a quite short name for a library that is so
  
  stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
  dist_starnews_DATA = ast.news
-@@ -600,31 +600,31 @@
+@@ -600,31 +600,31 @@ dist_pkgdata_DATA = COPYING COPYING.LESSER COPYING.LIB
  if !NOTHREADS
  
  if !NOPIC
@@ -97,7 +103,7 @@ Subject: "ast" is a quite short name for a library that is so
      $(GRP_C_ROUTINES) \
      $(F_C_ROUTINES) \
      $(GRP_C_INCLUDE_FILES) \
-@@ -634,55 +634,55 @@
+@@ -634,55 +634,55 @@ libast_la_SOURCES = \
      $(WCSLIB_FILES) \
      ast_err.h
  
@@ -169,7 +175,7 @@ Subject: "ast" is a quite short name for a library that is so
  
  # The following files are built by the targets in this makefile.
  MAINTAINERCLEANFILES = version.h builddocs addversion \
-@@ -736,24 +736,24 @@
+@@ -736,24 +736,24 @@ BUILT_SOURCES = AST_ERR ast_err.h version.h
  #  Form a second link to the main object library (static and shared). This
  #  is used when a second pass through the library is needed during linking
  #  to resolve references made within other AST libraries (e.g. the grf
@@ -202,7 +208,7 @@ Subject: "ast" is a quite short name for a library that is so
  	fi
  
  # Make pre-distribution files.  These are files which are required for
-@@ -791,8 +791,8 @@
+@@ -791,8 +791,8 @@ check_PROGRAMS = ast_test
  ast_test_SOURCES = ast_test.c
  
  #ast_test_LDADD = `ast_link`
@@ -213,9 +219,11 @@ Subject: "ast" is a quite short name for a library that is so
  
  #  Need to include latex support files in the distribution tar ball so
  #  that the docs can be built from the tex source files. Requires environment
+diff --git a/ast.news b/ast.news
+index d8f991c..756d85b 100644
 --- a/ast.news
 +++ b/ast.news
-@@ -343,7 +343,7 @@
+@@ -343,7 +343,7 @@ astResampleUK that handles 64 bit integer data.
  Main Changes in V7.0.2
  ----------------------
  
@@ -224,7 +232,7 @@ Subject: "ast" is a quite short name for a library that is so
  option is used when AST is configured.
  
  
-@@ -351,7 +351,7 @@
+@@ -351,7 +351,7 @@ Main Changes in V7.0.1
  ----------------------
  
  - The levmar and wcslib code distributed within AST is now stored in the
diff --git a/debian/patches/use_external_cminpack.patch b/debian/patches/use_external_cminpack.patch
index 83defab..18eef1d 100644
--- a/debian/patches/use_external_cminpack.patch
+++ b/debian/patches/use_external_cminpack.patch
@@ -1,8 +1,17 @@
 From: Ole Streicher <debian at liska.ath.cx>
+Date: Tue, 5 Jul 2016 15:13:46 +0200
 Subject: Use cminpack provided by Debian
+
+---
+ Makefile.am | 3 +--
+ polymap.c   | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 56aa7e1..8ad65ea 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -632,7 +632,6 @@
+@@ -632,7 +632,6 @@ libstarlink_ast_la_SOURCES = \
      $(GRP_C_INCLUDE_FILES) \
      $(F_C_INCLUDE_FILES) \
      $(GRP_F_INCLUDE_FILES) \
@@ -10,7 +19,7 @@ Subject: Use cminpack provided by Debian
      $(WCSLIB_FILES) \
      ast_err.h
  
-@@ -641,7 +640,7 @@
+@@ -641,7 +640,7 @@ libstarlink_ast_la_SOURCES = \
  # libstarlink_ast_pal library will be empty, and we link to an external PAL
  # library instead.
  if EXTERNAL_PAL
@@ -19,9 +28,11 @@ Subject: Use cminpack provided by Debian
  else
  libstarlink_ast_la_LIBADD = libstarlink_ast_pal.la
  endif
+diff --git a/polymap.c b/polymap.c
+index 5265b95..13f1608 100644
 --- a/polymap.c
 +++ b/polymap.c
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ f     - AST_POLYTRAN: Fit a PolyMap inverse or forward transformation
  #include "cmpmap.h"              /* Compound mappings */
  #include "polymap.h"             /* Interface definition for this class */
  #include "unitmap.h"             /* Unit mappings */
diff --git a/debian/patches/use_external_pal.patch b/debian/patches/use_external_pal.patch
index b336fc7..d626108 100644
--- a/debian/patches/use_external_pal.patch
+++ b/debian/patches/use_external_pal.patch
@@ -1,30 +1,18 @@
 From: Ole Streicher <debian at liska.ath.cx>
+Date: Tue, 5 Jul 2016 15:13:46 +0200
 Subject: The external PAL library in Debian is called "starlink-pal".
---- a/configure.ac
-+++ b/configure.ac
-@@ -55,7 +55,7 @@
-         external_pal="0")
- AC_SUBST( EXTERNAL_PAL, $external_pal )
- if test "$external_pal" = "1"; then
--   AC_SUBST( LIBPAL, "-lpal" )
-+   AC_SUBST( LIBPAL, "-lstarlink_pal" )
-    AC_DEFINE([EXTERNAL_PAL],[1],[use external PAL and ERFA libraries]),
- else
-    AC_SUBST( LIBPAL, "" )
---- a/ast_link.in
-+++ b/ast_link.in
-@@ -337,7 +337,7 @@
- 
- #  If we configured --with-external_pal include a link option to pick up
- #  an external PAL library.
--      1) args="${args} -lpal";;
-+      1) args="${args} @LIBPAL@";;
- 
- #  Otherwise, use the internal PAL & ERFA libraries.
-       *) args="${args} -last_pal";;
+
+---
+ Makefile.am  | 6 ++----
+ ast_link.in  | 2 +-
+ configure.ac | 2 +-
+ 3 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index fc9af18..56aa7e1 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -578,8 +578,6 @@
+@@ -578,8 +578,6 @@ lib_LTLIBRARIES = \
      $(PAL_LIB) \
      libstarlink_ast.la \
      libstarlink_ast_err.la \
@@ -33,7 +21,7 @@ Subject: The external PAL library in Debian is called "starlink-pal".
      libstarlink_ast_grf3d.la \
      libstarlink_ast_grf_2.0.la \
      libstarlink_ast_grf_3.2.la \
-@@ -643,7 +641,7 @@
+@@ -643,7 +641,7 @@ libstarlink_ast_la_SOURCES = \
  # libstarlink_ast_pal library will be empty, and we link to an external PAL
  # library instead.
  if EXTERNAL_PAL
@@ -42,7 +30,7 @@ Subject: The external PAL library in Debian is called "starlink-pal".
  else
  libstarlink_ast_la_LIBADD = libstarlink_ast_pal.la
  endif
-@@ -797,7 +795,7 @@
+@@ -797,7 +795,7 @@ ast_test_SOURCES = ast_test.c
  
  #ast_test_LDADD = `ast_link`
  # Expand ast_link to avoid libstarlink_ast_pass2, which causes problems for Solaris
@@ -51,3 +39,29 @@ Subject: The external PAL library in Debian is called "starlink-pal".
  
  #  Need to include latex support files in the distribution tar ball so
  #  that the docs can be built from the tex source files. Requires environment
+diff --git a/ast_link.in b/ast_link.in
+index c5759e2..3c5b2e1 100644
+--- a/ast_link.in
++++ b/ast_link.in
+@@ -337,7 +337,7 @@
+ 
+ #  If we configured --with-external_pal include a link option to pick up
+ #  an external PAL library.
+-      1) args="${args} -lpal";;
++      1) args="${args} @LIBPAL@";;
+ 
+ #  Otherwise, use the internal PAL & ERFA libraries.
+       *) args="${args} -last_pal";;
+diff --git a/configure.ac b/configure.ac
+index 7dec32d..b901e2e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@ AC_ARG_WITH([external_pal],
+         external_pal="0")
+ AC_SUBST( EXTERNAL_PAL, $external_pal )
+ if test "$external_pal" = "1"; then
+-   AC_SUBST( LIBPAL, "-lpal" )
++   AC_SUBST( LIBPAL, "-lstarlink_pal" )
+    AC_DEFINE([EXTERNAL_PAL],[1],[use external PAL and ERFA libraries]),
+ else
+    AC_SUBST( LIBPAL, "" )
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index df6bc7b..482f837 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -1,32 +1,19 @@
 From: Ole Streicher <debian at liska.ath.cx>
-Subject: Do not depend on the starlink's automake, but use their macro
- file together with the standard automake
---- a/configure.ac
-+++ b/configure.ac
-@@ -13,7 +13,10 @@
- dnl   Require autoconf-2.50 at least
- AC_PREREQ([2.69])
- dnl   Require Starlink automake
--AM_INIT_AUTOMAKE([1.8.2-starlink subdir-objects])
-+AM_INIT_AUTOMAKE([foreign subdir-objects])
-+# Comment out predistribution sources in Makefile.am
-+PREDIST='#'  # safe default
-+AC_SUBST(PREDIST)
- 
- dnl   Sanity-check: name a file in the source directory
- AC_CONFIG_SRCDIR([ast_link.in])
-@@ -195,7 +198,7 @@
- #   satisfy these targets, so give a non-null value
- #   for the second argument, to suppress automatic generation of
- #   rules.
--STAR_LATEX_DOCUMENTATION([sun210 sun211], [sun210.pdf sun210.tex sun211.pdf sun211.tex sun210.htx_tar sun211.htx_tar])
-+STAR_LATEX_DOCUMENTATION([sun211])
- STAR_PREDIST_SOURCES(sun_master.tex)
- STAR_CHECK_PROGS(star2html)
- STAR_CHECK_PROGS(prolat, sst)   # prolat is part of SST
+Date: Tue, 5 Jul 2016 15:13:46 +0200
+Subject: Do not depend on the starlink's automake,
+ but use their macro file together with the standard automake
+
+---
+ Makefile.am  | 11 ++++++++---
+ acinclude.m4 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ configure.ac |  7 +++++--
+ 3 files changed, 69 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 75667dd..fc9af18 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -587,9 +587,13 @@
+@@ -587,9 +587,13 @@ lib_LTLIBRARIES = \
      libstarlink_ast_pgplot.la \
      libstarlink_ast_pgplot3d.la
  
@@ -43,7 +30,7 @@ Subject: Do not depend on the starlink's automake, but use their macro
  
  # Make all library code position independent by default. This is handy for
  # creating shareable libraries from the static ones (Java JNI libraries).
-@@ -742,6 +746,7 @@
+@@ -742,6 +746,7 @@ BUILT_SOURCES = AST_ERR ast_err.h version.h
  #  Use target install-exec-hook rather than install-exec-local so that the
  #  soft links and files are created *after* the main library has been
  #  installed.
@@ -51,6 +38,8 @@ Subject: Do not depend on the starlink's automake, but use their macro
  install-exec-hook: libstarlink_ast.la
  	$(mkdir_p) $(DESTDIR)$(libdir)
  	cd $(DESTDIR)$(libdir); \
+diff --git a/acinclude.m4 b/acinclude.m4
+index 96fb878..661c2ea 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -1 +1,56 @@
@@ -111,3 +100,28 @@ Subject: Do not depend on the starlink's automake, but use their macro
 +AC_DEFUN([STAR_CHECK_PROGS], [])
 +
 +
+diff --git a/configure.ac b/configure.ac
+index 2708d45..7dec32d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,10 @@ AC_CONFIG_AUX_DIR([build-aux])
+ dnl   Require autoconf-2.50 at least
+ AC_PREREQ([2.69])
+ dnl   Require Starlink automake
+-AM_INIT_AUTOMAKE([1.8.2-starlink subdir-objects])
++AM_INIT_AUTOMAKE([foreign subdir-objects])
++# Comment out predistribution sources in Makefile.am
++PREDIST='#'  # safe default
++AC_SUBST(PREDIST)
+ 
+ dnl   Sanity-check: name a file in the source directory
+ AC_CONFIG_SRCDIR([ast_link.in])
+@@ -195,7 +198,7 @@ int main() {
+ #   satisfy these targets, so give a non-null value
+ #   for the second argument, to suppress automatic generation of
+ #   rules.
+-STAR_LATEX_DOCUMENTATION([sun210 sun211], [sun210.pdf sun210.tex sun211.pdf sun211.tex sun210.htx_tar sun211.htx_tar])
++STAR_LATEX_DOCUMENTATION([sun211])
+ STAR_PREDIST_SOURCES(sun_master.tex)
+ STAR_CHECK_PROGS(star2html)
+ STAR_CHECK_PROGS(prolat, sst)   # prolat is part of SST
diff --git a/debian/patches/workround_armhf_compiler_bug.patch b/debian/patches/workround_armhf_compiler_bug.patch
index 7af4643..dc060cc 100644
--- a/debian/patches/workround_armhf_compiler_bug.patch
+++ b/debian/patches/workround_armhf_compiler_bug.patch
@@ -1,21 +1,26 @@
 From: Ole Streicher <olebole at debian.org>
-Subject: Work around a weird optimization bug in armhf
- Without this patch, compilation on armhf fails with
- .
-  /tmp/ccJsRMs3.s: Assembler messages:
-  /tmp/ccJsRMs3.s:21403: Warning: base register written back, and overlaps one of transfer registers
-  /tmp/ccJsRMs3.s:28133: Error: registers may not be the same -- `str r3,[r3],#4'
-  /tmp/ccJsRMs3.s:28971: Warning: base register written back, and overlaps one of transfer registers
- .
- on gcc-4.9.4. See
+Date: Tue, 5 Jul 2016 15:13:46 +0200
+Subject: Work around a weird optimization bug in armhf Without this patch,
+ compilation on armhf fails with . /tmp/ccJsRMs3.s: Assembler
+ messages: /tmp/ccJsRMs3.s:21403: Warning: base register written back,
+ and overlaps one of transfer registers /tmp/ccJsRMs3.s:28133: Error:
+ registers may not be the same -- `str r3, [r3],
+ #4' /tmp/ccJsRMs3.s:28971: Warning: base register written back,
+ and overlaps one of transfer registers . on gcc-4.9.4. See
  https://buildd.debian.org/status/fetch.php?pkg=starlink-ast&arch=armhf&ver=8.0.2%2Bdfsg-1&stamp=1414223014
- as example.
- .
- The error appears with MAKE_MASK(F, float), while the warnings are with
- MAKE_MASK(D, double) and MAKE_MASK(LD, long double).
+ as example. . The error appears with MAKE_MASK(F, float),
+ while the warnings are with MAKE_MASK(D, double) and MAKE_MASK(LD,
+ long double).
+
+---
+ region.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/region.c b/region.c
+index 0089b27..fda2e6f 100644
 --- a/region.c
 +++ b/region.c
-@@ -230,6 +230,7 @@
+@@ -230,6 +230,7 @@ f     - AST_SHOWMESH: Display a mesh of points on the surface of a Region
  *     usually extend astSimplify.
  
  */

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



More information about the Debian-astro-commits mailing list