[Debian-astro-commits] [wcslib] 02/09: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Tue Sep 19 20:43:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository wcslib.
commit a6d733c9b863aa432eef3a59f6489b8f44fa53bf
Author: Ole Streicher <olebole at debian.org>
Date: Mon Sep 18 21:01:21 2017 +0200
Rediff patches
---
debian/patches/add_CPGPLOT.patch | 8 +++---
debian/patches/disable_Ftspx_test.patch | 2 +-
debian/patches/dynlink.patch | 6 ++---
debian/patches/fix_ar_timestamp.patch | 6 ++---
debian/patches/increase_tspx_test_tol.patch | 2 +-
debian/patches/set-null-graphics-on-tests.patch | 34 ++++++++++++-------------
6 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/debian/patches/add_CPGPLOT.patch b/debian/patches/add_CPGPLOT.patch
index dda68d2..8358be8 100644
--- a/debian/patches/add_CPGPLOT.patch
+++ b/debian/patches/add_CPGPLOT.patch
@@ -10,7 +10,7 @@ Subject: Correct linker flags for pgsbox
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/C/GNUmakefile b/C/GNUmakefile
-index 8c8feee..a1867d0 100644
+index 90d59ae..b261b59 100644
--- a/C/GNUmakefile
+++ b/C/GNUmakefile
@@ -312,13 +312,13 @@ $(TEST_N) $(TEST_n) : % : test/%.c $(WCSLIB)
@@ -39,7 +39,7 @@ index 8c8feee..a1867d0 100644
-@ $(RM) $@.o
diff --git a/configure.ac b/configure.ac
-index f7028c1..5235335 100644
+index f17e05c..a3380c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -460,8 +460,8 @@ if test "x$with_cfitsio" != xno -o \
@@ -62,7 +62,7 @@ index f7028c1..5235335 100644
AC_SUBST([SUBDIRS])
AC_SUBST([TSTDIRS])
diff --git a/makedefs.in b/makedefs.in
-index b91a278..6ac192a 100644
+index a7de341..554091e 100644
--- a/makedefs.in
+++ b/makedefs.in
@@ -152,6 +152,7 @@
@@ -82,7 +82,7 @@ index b91a278..6ac192a 100644
-@ echo ' CFITSIOLIB := $(CFITSIOLIB)'
-@ echo ' GETWCSTAB := $(GETWCSTAB)'
diff --git a/pgsbox/GNUmakefile b/pgsbox/GNUmakefile
-index af1b52f..3ca6bd6 100644
+index 9bb461b..2f210cb 100644
--- a/pgsbox/GNUmakefile
+++ b/pgsbox/GNUmakefile
@@ -192,7 +192,7 @@ cpgtest : cpgtest.c fscan.f lngvel.f $(PGSBOXLIB) $(WCSLIB)
diff --git a/debian/patches/disable_Ftspx_test.patch b/debian/patches/disable_Ftspx_test.patch
index 9284aeb..f0b34d2 100644
--- a/debian/patches/disable_Ftspx_test.patch
+++ b/debian/patches/disable_Ftspx_test.patch
@@ -12,7 +12,7 @@ Subject: Disable the Fortran TSPX test. TSPX tests the spectral
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/GNUmakefile b/GNUmakefile
-index 8026a10..7aadce8 100644
+index 94e0187..74f66a9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -70,7 +70,7 @@ check ::
diff --git a/debian/patches/dynlink.patch b/debian/patches/dynlink.patch
index aa2b50d..b70017a 100644
--- a/debian/patches/dynlink.patch
+++ b/debian/patches/dynlink.patch
@@ -11,7 +11,7 @@ Subject: Use dynamic linking for wcslib-tools instead of static
5 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/C/GNUmakefile b/C/GNUmakefile
-index 2cc311b..6d2305d 100644
+index b5d1df3..a1800df 100644
--- a/C/GNUmakefile
+++ b/C/GNUmakefile
@@ -246,7 +246,9 @@ $(SHRLIB) : $(PICLIB)
@@ -52,7 +52,7 @@ index 83721a5..019eb90 100644
echo "Testing WCSLIB syntax checker for FITS WCS keyrecords (twcslint)"
diff --git a/pgsbox/GNUmakefile b/pgsbox/GNUmakefile
-index ed2eeb3..4891d99 100644
+index 770e7b9..f1f9e53 100644
--- a/pgsbox/GNUmakefile
+++ b/pgsbox/GNUmakefile
@@ -118,7 +118,9 @@ $(SHRLIB) : $(PICLIB)
@@ -67,7 +67,7 @@ index ed2eeb3..4891d99 100644
$(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ;
diff --git a/utils/GNUmakefile b/utils/GNUmakefile
-index 230c981..0a49383 100644
+index 93212ca..d27afe6 100644
--- a/utils/GNUmakefile
+++ b/utils/GNUmakefile
@@ -38,9 +38,6 @@ endif
diff --git a/debian/patches/fix_ar_timestamp.patch b/debian/patches/fix_ar_timestamp.patch
index 8cc7125..3d94486 100644
--- a/debian/patches/fix_ar_timestamp.patch
+++ b/debian/patches/fix_ar_timestamp.patch
@@ -13,7 +13,7 @@ Subject: Explicitely add timestamps for `ar r` The `ar` program distributed
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/C/GNUmakefile b/C/GNUmakefile
-index 6d2305d..8c8feee 100644
+index a1800df..90d59ae 100644
--- a/C/GNUmakefile
+++ b/C/GNUmakefile
@@ -124,13 +124,13 @@ endif
@@ -33,7 +33,7 @@ index 6d2305d..8c8feee 100644
%.i : %.c
diff --git a/Fortran/GNUmakefile b/Fortran/GNUmakefile
-index 482d8ff..e244d8f 100644
+index ba5e495..61291f8 100644
--- a/Fortran/GNUmakefile
+++ b/Fortran/GNUmakefile
@@ -106,25 +106,25 @@ PGPLOTLIB := $(PGPLOTLIB)
@@ -67,7 +67,7 @@ index 482d8ff..e244d8f 100644
%.i : %.c
diff --git a/pgsbox/GNUmakefile b/pgsbox/GNUmakefile
-index 4891d99..af1b52f 100644
+index f1f9e53..9bb461b 100644
--- a/pgsbox/GNUmakefile
+++ b/pgsbox/GNUmakefile
@@ -64,25 +64,25 @@ vpath %.inc ../Fortran
diff --git a/debian/patches/increase_tspx_test_tol.patch b/debian/patches/increase_tspx_test_tol.patch
index be49795..fc67270 100644
--- a/debian/patches/increase_tspx_test_tol.patch
+++ b/debian/patches/increase_tspx_test_tol.patch
@@ -10,7 +10,7 @@ Subject: Increase the tolerance in the TSPX test. TSPX tests the spectral
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Fortran/test/tspx.f b/Fortran/test/tspx.f
-index d52d1b3..d9128ce 100644
+index 014fe50..09d088a 100644
--- a/Fortran/test/tspx.f
+++ b/Fortran/test/tspx.f
@@ -191,7 +191,7 @@
diff --git a/debian/patches/set-null-graphics-on-tests.patch b/debian/patches/set-null-graphics-on-tests.patch
index 379f81a..dfdadcb 100644
--- a/debian/patches/set-null-graphics-on-tests.patch
+++ b/debian/patches/set-null-graphics-on-tests.patch
@@ -24,7 +24,7 @@ Subject: Use dummy graphics for testing. The tests run unattended anyway,
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/C/test/tcel1.c b/C/test/tcel1.c
-index 322b636..1de168d 100644
+index 34d3819..1789805 100644
--- a/C/test/tcel1.c
+++ b/C/test/tcel1.c
@@ -80,7 +80,7 @@ int main()
@@ -37,7 +37,7 @@ index 322b636..1de168d 100644
/* Define pen colours. */
diff --git a/C/test/tcel2.c b/C/test/tcel2.c
-index 6ba0c7b..1122c34 100644
+index 6f46a88..f655b89 100644
--- a/C/test/tcel2.c
+++ b/C/test/tcel2.c
@@ -106,7 +106,7 @@ int main()
@@ -50,7 +50,7 @@ index 6ba0c7b..1122c34 100644
/* Define pen colours. */
diff --git a/C/test/tpih2.c b/C/test/tpih2.c
-index e55963f..f295dcd 100644
+index ebc57f1..000c7e7 100644
--- a/C/test/tpih2.c
+++ b/C/test/tpih2.c
@@ -147,7 +147,7 @@ int main()
@@ -63,7 +63,7 @@ index e55963f..f295dcd 100644
cpgvstd();
diff --git a/C/test/tprj2.c b/C/test/tprj2.c
-index a62ace5..05c9172 100644
+index 7765375..279d2d8 100644
--- a/C/test/tprj2.c
+++ b/C/test/tprj2.c
@@ -60,7 +60,7 @@ int main()
@@ -76,7 +76,7 @@ index a62ace5..05c9172 100644
/* Define pen colours. */
diff --git a/C/test/tspc.c b/C/test/tspc.c
-index ec972cd..1be49ec 100644
+index b9a1737..a0ce62e 100644
--- a/C/test/tspc.c
+++ b/C/test/tspc.c
@@ -69,7 +69,7 @@ int main()
@@ -89,7 +89,7 @@ index ec972cd..1be49ec 100644
naxisj = NSPEC;
diff --git a/C/test/ttab2.c b/C/test/ttab2.c
-index 7dd6873..4598b4c 100644
+index 225db3d..364e8dc 100644
--- a/C/test/ttab2.c
+++ b/C/test/ttab2.c
@@ -77,7 +77,7 @@ int main()
@@ -102,7 +102,7 @@ index 7dd6873..4598b4c 100644
cpgvstd();
cpgsch(0.7f);
diff --git a/C/test/ttab3.c b/C/test/ttab3.c
-index 04e5587..fc16dbe 100644
+index e03fafb..4a53299 100644
--- a/C/test/ttab3.c
+++ b/C/test/ttab3.c
@@ -74,7 +74,7 @@ int main()
@@ -115,7 +115,7 @@ index 04e5587..fc16dbe 100644
cpgvstd();
cpgsch(0.7f);
diff --git a/C/test/twcsmix.c b/C/test/twcsmix.c
-index 502224b..c79f732 100644
+index a5dd566..b9beb67 100644
--- a/C/test/twcsmix.c
+++ b/C/test/twcsmix.c
@@ -93,7 +93,7 @@ int main()
@@ -128,7 +128,7 @@ index 502224b..c79f732 100644
/* Define pen colours. */
diff --git a/Fortran/test/tcel1.f b/Fortran/test/tcel1.f
-index 3149452..3e8f275 100644
+index a960814..799e4fa 100644
--- a/Fortran/test/tcel1.f
+++ b/Fortran/test/tcel1.f
@@ -77,7 +77,7 @@
@@ -141,7 +141,7 @@ index 3149452..3e8f275 100644
* Define pen colours.
CALL PGSCR (0, 0.00, 0.00, 0.00)
diff --git a/Fortran/test/tpih2.f b/Fortran/test/tpih2.f
-index 95b2c68..f3ec93b 100644
+index b360757..12fcefe 100644
--- a/Fortran/test/tpih2.f
+++ b/Fortran/test/tpih2.f
@@ -131,7 +131,7 @@
@@ -154,7 +154,7 @@ index 95b2c68..f3ec93b 100644
CALL PGVSTD()
diff --git a/Fortran/test/tprj2.f b/Fortran/test/tprj2.f
-index c3fdd75..0c593cc 100644
+index 14b6faa..106dba4 100644
--- a/Fortran/test/tprj2.f
+++ b/Fortran/test/tprj2.f
@@ -48,7 +48,7 @@
@@ -167,7 +167,7 @@ index c3fdd75..0c593cc 100644
* Define pen colours.
CALL PGSCR (0, 0.00, 0.00, 0.00)
diff --git a/Fortran/test/tspc.f b/Fortran/test/tspc.f
-index 6764934..ad438d7 100644
+index 80563fc..d1b9722 100644
--- a/Fortran/test/tspc.f
+++ b/Fortran/test/tspc.f
@@ -55,7 +55,7 @@
@@ -180,7 +180,7 @@ index 6764934..ad438d7 100644
NAXISJ = NSPEC
CRPIXJ = NAXISJ/2 + 1
diff --git a/Fortran/test/ttab2.f b/Fortran/test/ttab2.f
-index 071958d..608b8a5 100644
+index 19d61e1..1db033e 100644
--- a/Fortran/test/ttab2.f
+++ b/Fortran/test/ttab2.f
@@ -72,7 +72,7 @@
@@ -193,7 +193,7 @@ index 071958d..608b8a5 100644
CALL PGSCH (0.7)
diff --git a/Fortran/test/ttab3.f b/Fortran/test/ttab3.f
-index e957c86..b1043de 100644
+index 91566dd..bbbcf83 100644
--- a/Fortran/test/ttab3.f
+++ b/Fortran/test/ttab3.f
@@ -67,7 +67,7 @@
@@ -206,7 +206,7 @@ index e957c86..b1043de 100644
CALL PGSCH (0.7)
CALL PGWNAD (-135.0, 135.0, -95.0, 140.0)
diff --git a/Fortran/test/twcsmix.f b/Fortran/test/twcsmix.f
-index 0c49f34..fbe7be7 100644
+index 5031b29..94b9a1d 100644
--- a/Fortran/test/twcsmix.f
+++ b/Fortran/test/twcsmix.f
@@ -89,7 +89,7 @@
@@ -219,7 +219,7 @@ index 0c49f34..fbe7be7 100644
* Define pen colours.
CALL PGSCR (0, 0.00, 0.00, 0.00)
diff --git a/pgsbox/cpgtest.c b/pgsbox/cpgtest.c
-index c5f683b..16ae359 100644
+index a2511da..6314694 100644
--- a/pgsbox/cpgtest.c
+++ b/pgsbox/cpgtest.c
@@ -68,7 +68,7 @@ int main()
@@ -232,7 +232,7 @@ index c5f683b..16ae359 100644
j = 16;
diff --git a/pgsbox/pgtest.f b/pgsbox/pgtest.f
-index ea4eafb..4985bdf 100644
+index 76ceae9..5bad054 100644
--- a/pgsbox/pgtest.f
+++ b/pgsbox/pgtest.f
@@ -60,7 +60,7 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/wcslib.git
More information about the Debian-astro-commits
mailing list