[Debian-astro-commits] [starlink-ast] 02/04: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Thu Oct 27 07:59:13 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 403947d5547afc5b83d0d0557460f5abcdd68733
Author: Ole Streicher <olebole at debian.org>
Date: Thu Oct 27 09:42:53 2016 +0200
Rediff patches
---
debian/patches/rename_library | 26 +++++++++++------------
debian/patches/use_external_cminpack.patch | 6 +++---
debian/patches/use_external_pal.patch | 10 ++++-----
debian/patches/use_std_automake.patch | 8 +++----
debian/patches/workround_armhf_compiler_bug.patch | 4 ++--
5 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index 503ddc7..4c9e4d9 100644
--- a/debian/patches/rename_library
+++ b/debian/patches/rename_library
@@ -12,7 +12,7 @@ Subject: "ast" is a quite short name for a library that is so specific as
2 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index b3ff279..75667dd 100644
+index 2739ab4..656ab3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -248,7 +248,7 @@ F_C_INCLUDE_FILES = \
@@ -24,7 +24,7 @@ index b3ff279..75667dd 100644
GRP_F_INCLUDE_FILES = \
GRF_PAR \
AST_ERR
-@@ -571,21 +571,21 @@ include_MESSAGES = AST_ERR ast_err.h
+@@ -589,21 +589,21 @@ include_MESSAGES = AST_ERR ast_err.h
if EXTERNAL_PAL
PAL_LIB =
else
@@ -57,7 +57,7 @@ index b3ff279..75667dd 100644
stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
dist_starnews_DATA = ast.news
-@@ -600,31 +600,31 @@ dist_pkgdata_DATA = COPYING COPYING.LESSER COPYING.LIB
+@@ -618,31 +618,31 @@ dist_pkgdata_DATA = COPYING COPYING.LESSER COPYING.LIB
if !NOTHREADS
if !NOPIC
@@ -103,7 +103,7 @@ index b3ff279..75667dd 100644
$(GRP_C_ROUTINES) \
$(F_C_ROUTINES) \
$(GRP_C_INCLUDE_FILES) \
-@@ -634,55 +634,55 @@ libast_la_SOURCES = \
+@@ -652,55 +652,55 @@ libast_la_SOURCES = \
$(WCSLIB_FILES) \
ast_err.h
@@ -162,12 +162,12 @@ index b3ff279..75667dd 100644
+libstarlink_ast_grf_5_6_la_SOURCES = grf_5.6.c
# The graphics module that uses PGPLOT for 2D graphical output.
--libast_pgplot_la_SOURCES = grf_pgplot.c
-+libstarlink_ast_pgplot_la_SOURCES = grf_pgplot.c
+-libast_pgplot_la_SOURCES = $(GRF_PGPLOT_SOURCES)
++libstarlink_ast_pgplot_la_SOURCES = $(GRF_PGPLOT_SOURCES)
# The graphics module that uses PGPLOT for 3D graphical output.
--libast_pgplot3d_la_SOURCES = grf3d_pgplot.c
-+libstarlink_ast_pgplot3d_la_SOURCES = grf3d_pgplot.c
+-libast_pgplot3d_la_SOURCES = $(GRF3D_PGPLOT_SOURCES)
++libstarlink_ast_pgplot3d_la_SOURCES = $(GRF3D_PGPLOT_SOURCES)
# Positional astronomy libraries.
-libast_pal_la_SOURCES = $(PAL_FILES)
@@ -175,7 +175,7 @@ index b3ff279..75667dd 100644
# The following files are built by the targets in this makefile.
MAINTAINERCLEANFILES = version.h builddocs addversion \
-@@ -736,24 +736,24 @@ BUILT_SOURCES = AST_ERR ast_err.h version.h
+@@ -754,24 +754,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
@@ -208,7 +208,7 @@ index b3ff279..75667dd 100644
fi
# Make pre-distribution files. These are files which are required for
-@@ -791,8 +791,8 @@ check_PROGRAMS = ast_test
+@@ -809,8 +809,8 @@ check_PROGRAMS = ast_test
ast_test_SOURCES = ast_test.c
#ast_test_LDADD = `ast_link`
@@ -220,10 +220,10 @@ index b3ff279..75667dd 100644
# 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
+index bd5dbbc..8b77125 100644
--- a/ast.news
+++ b/ast.news
-@@ -343,7 +343,7 @@ astResampleUK that handles 64 bit integer data.
+@@ -357,7 +357,7 @@ astResampleUK that handles 64 bit integer data.
Main Changes in V7.0.2
----------------------
@@ -232,7 +232,7 @@ index d8f991c..756d85b 100644
option is used when AST is configured.
-@@ -351,7 +351,7 @@ Main Changes in V7.0.1
+@@ -365,7 +365,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 18eef1d..cc22b0c 100644
--- a/debian/patches/use_external_cminpack.patch
+++ b/debian/patches/use_external_cminpack.patch
@@ -8,10 +8,10 @@ Subject: Use cminpack provided by Debian
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 56aa7e1..8ad65ea 100644
+index a94752b..276165a 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -632,7 +632,6 @@ libstarlink_ast_la_SOURCES = \
+@@ -650,7 +650,6 @@ libstarlink_ast_la_SOURCES = \
$(GRP_C_INCLUDE_FILES) \
$(F_C_INCLUDE_FILES) \
$(GRP_F_INCLUDE_FILES) \
@@ -19,7 +19,7 @@ index 56aa7e1..8ad65ea 100644
$(WCSLIB_FILES) \
ast_err.h
-@@ -641,7 +640,7 @@ libstarlink_ast_la_SOURCES = \
+@@ -659,7 +658,7 @@ libstarlink_ast_la_SOURCES = \
# libstarlink_ast_pal library will be empty, and we link to an external PAL
# library instead.
if EXTERNAL_PAL
diff --git a/debian/patches/use_external_pal.patch b/debian/patches/use_external_pal.patch
index d626108..77a6fc9 100644
--- a/debian/patches/use_external_pal.patch
+++ b/debian/patches/use_external_pal.patch
@@ -9,10 +9,10 @@ Subject: The external PAL library in Debian is called "starlink-pal".
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index fc9af18..56aa7e1 100644
+index 6fe2626..a94752b 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -578,8 +578,6 @@ lib_LTLIBRARIES = \
+@@ -596,8 +596,6 @@ lib_LTLIBRARIES = \
$(PAL_LIB) \
libstarlink_ast.la \
libstarlink_ast_err.la \
@@ -21,7 +21,7 @@ index fc9af18..56aa7e1 100644
libstarlink_ast_grf3d.la \
libstarlink_ast_grf_2.0.la \
libstarlink_ast_grf_3.2.la \
-@@ -643,7 +641,7 @@ libstarlink_ast_la_SOURCES = \
+@@ -661,7 +659,7 @@ libstarlink_ast_la_SOURCES = \
# libstarlink_ast_pal library will be empty, and we link to an external PAL
# library instead.
if EXTERNAL_PAL
@@ -30,7 +30,7 @@ index fc9af18..56aa7e1 100644
else
libstarlink_ast_la_LIBADD = libstarlink_ast_pal.la
endif
-@@ -797,7 +795,7 @@ ast_test_SOURCES = ast_test.c
+@@ -815,7 +813,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
@@ -53,7 +53,7 @@ index c5759e2..3c5b2e1 100644
# Otherwise, use the internal PAL & ERFA libraries.
*) args="${args} -last_pal";;
diff --git a/configure.ac b/configure.ac
-index 7dec32d..b901e2e 100644
+index b1e5b81..ed7878a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ AC_ARG_WITH([external_pal],
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index 482f837..136898e 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -10,10 +10,10 @@ Subject: Do not depend on the starlink's automake,
3 files changed, 69 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 75667dd..fc9af18 100644
+index 656ab3e..6fe2626 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -587,9 +587,13 @@ lib_LTLIBRARIES = \
+@@ -605,9 +605,13 @@ lib_LTLIBRARIES = \
libstarlink_ast_pgplot.la \
libstarlink_ast_pgplot3d.la
@@ -30,7 +30,7 @@ index 75667dd..fc9af18 100644
# 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 @@ BUILT_SOURCES = AST_ERR ast_err.h version.h
+@@ -760,6 +764,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.
@@ -101,7 +101,7 @@ index 96fb878..661c2ea 100644
+
+
diff --git a/configure.ac b/configure.ac
-index 2708d45..7dec32d 100644
+index 3ccc4cd..b1e5b81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,10 @@ AC_CONFIG_AUX_DIR([build-aux])
diff --git a/debian/patches/workround_armhf_compiler_bug.patch b/debian/patches/workround_armhf_compiler_bug.patch
index dc060cc..6fa404f 100644
--- a/debian/patches/workround_armhf_compiler_bug.patch
+++ b/debian/patches/workround_armhf_compiler_bug.patch
@@ -17,10 +17,10 @@ Subject: Work around a weird optimization bug in armhf Without this patch,
1 file changed, 1 insertion(+)
diff --git a/region.c b/region.c
-index 0089b27..fda2e6f 100644
+index 3554296..330b3e0 100644
--- a/region.c
+++ b/region.c
-@@ -230,6 +230,7 @@ f - AST_SHOWMESH: Display a mesh of points on the surface of a Region
+@@ -234,6 +234,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