[Debian-astro-commits] [wcslib] 02/03: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Sun Jan 15 15:44:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository wcslib.
commit 36b07fbe852d7534c8722dfd3fca0f4143db1bdf
Author: Ole Streicher <olebole at debian.org>
Date: Sun Jan 15 16:37:24 2017 +0100
Rediff patches
---
debian/patches/add_CPGPLOT.patch | 99 ++++++++++-------
debian/patches/disable_Ftspx_test.patch | 24 +++--
debian/patches/dynlink.patch | 126 +++++++++++++---------
debian/patches/fix_ar_timestamp.patch | 78 ++++++++------
debian/patches/increase_tspx_test_tol.patch | 17 ++-
debian/patches/set-null-graphics-on-tests.patch | 138 +++++++++++++++++-------
6 files changed, 303 insertions(+), 179 deletions(-)
diff --git a/debian/patches/add_CPGPLOT.patch b/debian/patches/add_CPGPLOT.patch
index 7133137..dda68d2 100644
--- a/debian/patches/add_CPGPLOT.patch
+++ b/debian/patches/add_CPGPLOT.patch
@@ -1,8 +1,48 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Correct linker flags for pgsbox
+From: Ole Streicher <olebole at debian.org>
+Date: Sun, 15 Jan 2017 16:35:33 +0100
+Subject: Correct linker flags for pgsbox
+
+---
+ C/GNUmakefile | 6 +++---
+ configure.ac | 5 +++--
+ makedefs.in | 2 ++
+ pgsbox/GNUmakefile | 2 +-
+ 4 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/C/GNUmakefile b/C/GNUmakefile
+index 8c8feee..a1867d0 100644
+--- a/C/GNUmakefile
++++ b/C/GNUmakefile
+@@ -312,13 +312,13 @@ $(TEST_N) $(TEST_n) : % : test/%.c $(WCSLIB)
+ $(TEST_P) : % : test/%.c $(WCSLIB)
+ -@ echo ''
+ $(CC) $(CPPFLAGS) $(PGPLOTINC) $(CFLAGS) -c -o $@.o $<
+- $(LD) -o $@ $@.o $(LDFLAGS) $(PGPLOTLIB) $(WCSLIB) $(FLIBS) $(LIBS)
++ $(LD) -o $@ $@.o $(LDFLAGS) $(CPGPLOTLIB) $(WCSLIB) $(FLIBS) $(LIBS)
+ -@ $(RM) $@.o
+
+ tpih2 : test/tpih2.c $(PGSBOXLIB) $(WCSLIB)
+ -@ echo ''
+ $(CC) $(CPPFLAGS) -I../pgsbox $(PGPLOTINC) $(CFLAGS) -c -o $@.o $<
+- $(LD) -o $@ $@.o $(LDFLAGS) $(PGSBOXLIB) $(PGPLOTLIB) $(WCSLIB) \
++ $(LD) -o $@ $@.o $(LDFLAGS) $(PGSBOXLIB) $(PGPLOTLIB) $(CPGPLOTLIB) $(WCSLIB) \
+ $(FLIBS) $(LIBS)
+ -@ $(RM) $@.o
+
+@@ -332,7 +332,7 @@ tpih2_cfitsio : test/tpih2.c $(PGSBOXLIB) $(WCSLIB)
+ -@ echo ''
+ $(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox $(PGPLOTINC) \
+ $(CFITSIOINC) $(CFLAGS) -c -o $@.o $<
+- $(LD) -o $@ $@.o $(LDFLAGS) $(PGSBOXLIB) $(PGPLOTLIB) \
++ $(LD) -o $@ $@.o $(LDFLAGS) $(PGSBOXLIB) $(PGPLOTLIB) $(CPGPLOTLIB) \
+ $(CFITSIOLIB) $(WCSLIB) $(FLIBS) $(LIBS)
+ -@ $(RM) $@.o
+
+diff --git a/configure.ac b/configure.ac
+index f7028c1..5235335 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -460,8 +460,8 @@
+@@ -460,8 +460,8 @@ if test "x$with_cfitsio" != xno -o \
[], [$PGPLOTLIB $LIBS])
AC_CHECK_LIB([pgplot], [pgbeg_], [PGPLOTLIB="-lpgplot $PGPLOTLIB"],
[], [$PGPLOTLIB $FLIBS $LIBS])
@@ -13,7 +53,7 @@ Description: Correct linker flags for pgsbox
# Only need the PGPLOT include file to build PGSBOX.
if test "x$PGPLOTINC" != x; then
-@@ -501,6 +501,7 @@
+@@ -501,6 +501,7 @@ AC_SUBST([GETWCSTAB])
AC_SUBST([PGPLOTINC])
AC_SUBST([PGPLOTLIB])
@@ -21,17 +61,8 @@ Description: Correct linker flags for pgsbox
AC_SUBST([SUBDIRS])
AC_SUBST([TSTDIRS])
---- a/pgsbox/GNUmakefile
-+++ b/pgsbox/GNUmakefile
-@@ -192,7 +192,7 @@
- -@ echo ''
- $(FC) -I../Fortran $(FFLAGS) -c fscan.f lngvel.f
- $(CC) $(CPPFLAGS) $(PGPLOTINC) $(CFLAGS) -o $@ $(^:.f=.o) \
-- $(LDFLAGS) $(PGPLOTLIB) $(FLIBS) $(LIBS)
-+ $(LDFLAGS) $(CPGPLOTLIB) $(PGPLOTLIB) $(FLIBS) $(LIBS)
- -@ $(RM) fscan.o lngvel.o
-
- GNUmakefile : ../makedefs ;
+diff --git a/makedefs.in b/makedefs.in
+index b91a278..6ac192a 100644
--- a/makedefs.in
+++ b/makedefs.in
@@ -152,6 +152,7 @@
@@ -42,7 +73,7 @@ Description: Correct linker flags for pgsbox
# CFITSIO (see note 5 above).
CFITSIOINC := @CFITSIOINC@
-@@ -229,6 +230,7 @@
+@@ -229,6 +230,7 @@ show :: wcsconfig.h
-@ echo ' LDFLAGS := $(LDFLAGS)'
-@ echo ' PGPLOTINC := $(PGPLOTINC)'
-@ echo ' PGPLOTLIB := $(PGPLOTLIB)'
@@ -50,30 +81,16 @@ Description: Correct linker flags for pgsbox
-@ echo ' CFITSIOINC := $(CFITSIOINC)'
-@ echo ' CFITSIOLIB := $(CFITSIOLIB)'
-@ echo ' GETWCSTAB := $(GETWCSTAB)'
---- a/C/GNUmakefile
-+++ b/C/GNUmakefile
-@@ -312,13 +312,13 @@
- $(TEST_P) : % : test/%.c $(WCSLIB)
- -@ echo ''
- $(CC) $(CPPFLAGS) $(PGPLOTINC) $(CFLAGS) -c -o $@.o $<
-- $(LD) -o $@ $@.o $(LDFLAGS) $(PGPLOTLIB) $(WCSLIB) $(FLIBS) $(LIBS)
-+ $(LD) -o $@ $@.o $(LDFLAGS) $(CPGPLOTLIB) $(WCSLIB) $(FLIBS) $(LIBS)
- -@ $(RM) $@.o
-
- tpih2 : test/tpih2.c $(PGSBOXLIB) $(WCSLIB)
- -@ echo ''
- $(CC) $(CPPFLAGS) -I../pgsbox $(PGPLOTINC) $(CFLAGS) -c -o $@.o $<
-- $(LD) -o $@ $@.o $(LDFLAGS) $(PGSBOXLIB) $(PGPLOTLIB) $(WCSLIB) \
-+ $(LD) -o $@ $@.o $(LDFLAGS) $(PGSBOXLIB) $(PGPLOTLIB) $(CPGPLOTLIB) $(WCSLIB) \
- $(FLIBS) $(LIBS)
- -@ $(RM) $@.o
-
-@@ -332,7 +332,7 @@
+diff --git a/pgsbox/GNUmakefile b/pgsbox/GNUmakefile
+index af1b52f..3ca6bd6 100644
+--- a/pgsbox/GNUmakefile
++++ b/pgsbox/GNUmakefile
+@@ -192,7 +192,7 @@ cpgtest : cpgtest.c fscan.f lngvel.f $(PGSBOXLIB) $(WCSLIB)
-@ echo ''
- $(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox $(PGPLOTINC) \
- $(CFITSIOINC) $(CFLAGS) -c -o $@.o $<
-- $(LD) -o $@ $@.o $(LDFLAGS) $(PGSBOXLIB) $(PGPLOTLIB) \
-+ $(LD) -o $@ $@.o $(LDFLAGS) $(PGSBOXLIB) $(PGPLOTLIB) $(CPGPLOTLIB) \
- $(CFITSIOLIB) $(WCSLIB) $(FLIBS) $(LIBS)
- -@ $(RM) $@.o
+ $(FC) -I../Fortran $(FFLAGS) -c fscan.f lngvel.f
+ $(CC) $(CPPFLAGS) $(PGPLOTINC) $(CFLAGS) -o $@ $(^:.f=.o) \
+- $(LDFLAGS) $(PGPLOTLIB) $(FLIBS) $(LIBS)
++ $(LDFLAGS) $(CPGPLOTLIB) $(PGPLOTLIB) $(FLIBS) $(LIBS)
+ -@ $(RM) fscan.o lngvel.o
+ GNUmakefile : ../makedefs ;
diff --git a/debian/patches/disable_Ftspx_test.patch b/debian/patches/disable_Ftspx_test.patch
index 1abf880..9284aeb 100644
--- a/debian/patches/disable_Ftspx_test.patch
+++ b/debian/patches/disable_Ftspx_test.patch
@@ -1,13 +1,21 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Disable the Fortran TSPX test. TSPX tests the spectral
- transformation routines for closure. On some systems (sparc, s390), this
- test fails completely for unknown reasons in the Fortran variant, but the C
- variant succeeds. The reason here is still unknown. Since wcslib is going
- to be used from C mainly, and after a discussion with upstream, this test
- failure is will not cause an error.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Sun, 15 Jan 2017 16:35:33 +0100
+Subject: Disable the Fortran TSPX test. TSPX tests the spectral
+ transformation routines for closure. On some systems (sparc, s390),
+ this test fails completely for unknown reasons in the Fortran variant,
+ but the C variant succeeds. The reason here is still unknown. Since wcslib is
+ going to be used from C mainly, and after a discussion with upstream,
+ this test failure is will not cause an error.
+
+---
+ GNUmakefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 8026a10..7aadce8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ check ::
-@ echo 'Summary of results for non-graphical tests'
-@ echo '------------------------------------------'
-@ cat ./*/test_results
diff --git a/debian/patches/dynlink.patch b/debian/patches/dynlink.patch
index a9ed1e8..aa2b50d 100644
--- a/debian/patches/dynlink.patch
+++ b/debian/patches/dynlink.patch
@@ -1,8 +1,76 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use dynamic linking for wcslib-tools instead of static
+From: Ole Streicher <olebole at debian.org>
+Date: Sun, 15 Jan 2017 16:35:33 +0100
+Subject: Use dynamic linking for wcslib-tools instead of static
+
+---
+ C/GNUmakefile | 4 +++-
+ C/test/tdis3 | 3 +++
+ C/test/twcslint | 3 +++
+ pgsbox/GNUmakefile | 4 +++-
+ utils/GNUmakefile | 17 +++++++----------
+ 5 files changed, 19 insertions(+), 12 deletions(-)
+
+diff --git a/C/GNUmakefile b/C/GNUmakefile
+index 2cc311b..6d2305d 100644
+--- a/C/GNUmakefile
++++ b/C/GNUmakefile
+@@ -246,7 +246,9 @@ $(SHRLIB) : $(PICLIB)
+ trap 'cd .. ; $(RM) -r tmp' 0 1 2 3 15 ; \
+ $(AR) x ../$(PICLIB) && \
+ $(SHRLD) -o $@ *.o $(LDFLAGS) $(LIBS) && \
+- mv $@ ..
++ mv $@ .. && \
++ ln -sf $@ ../$(SONAME) && \
++ ln -sf $(SONAME) ../$(SHRLN)
+
+ $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ;
+
+diff --git a/C/test/tdis3 b/C/test/tdis3
+index 5916345..79b5847 100644
+--- a/C/test/tdis3
++++ b/C/test/tdis3
+@@ -1,5 +1,8 @@
+ #!/bin/sh
+
++ LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:.
++ export LD_LIBRARY_PATH
++
+ echo "Testing WCSLIB's handling of translated distortions (tdis3)"
+ echo "-----------------------------------------------------------"
+
+diff --git a/C/test/twcslint b/C/test/twcslint
+index 83721a5..019eb90 100644
+--- a/C/test/twcslint
++++ b/C/test/twcslint
+@@ -1,5 +1,8 @@
+ #!/bin/sh
+
++ LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:.
++ export LD_LIBRARY_PATH
++
+ exec 1>twcslint.out 2>&1
+
+ echo "Testing WCSLIB syntax checker for FITS WCS keyrecords (twcslint)"
+diff --git a/pgsbox/GNUmakefile b/pgsbox/GNUmakefile
+index ed2eeb3..4891d99 100644
+--- a/pgsbox/GNUmakefile
++++ b/pgsbox/GNUmakefile
+@@ -118,7 +118,9 @@ $(SHRLIB) : $(PICLIB)
+ trap 'cd .. ; $(RM) -r tmp' 0 1 2 3 15 ; \
+ $(AR) x ../$(PICLIB) && \
+ $(SHRLD) -o $@ *.o ../$(WCSSHR) $(LDFLAGS) $(PGPLOTLIB) $(FLIBS) && \
+- mv $@ ..
++ mv $@ .. && \
++ ln -sf $@ ../$(SONAME) && \
++ ln -sf $(SONAME) ../$(SHRLN)
+
+ $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ;
+
+diff --git a/utils/GNUmakefile b/utils/GNUmakefile
+index 230c981..0a49383 100644
--- a/utils/GNUmakefile
+++ b/utils/GNUmakefile
-@@ -38,9 +38,6 @@
+@@ -38,9 +38,6 @@ endif
MAN := $(addsuffix .1,$(UTILS))
@@ -12,7 +80,7 @@ Description: Use dynamic linking for wcslib-tools instead of static
ifneq "$(GETWCSTAB)" ""
GETWCSTAB := ../C/$(GETWCSTAB)
endif
-@@ -70,20 +67,20 @@
+@@ -70,20 +67,20 @@ HPXcvt : HPXcvt.c
$(LD) -o $@ $@.o $(LDFLAGS) $(CFITSIOLIB) $(LIBS)
-@ $(RM) $@.o
@@ -39,7 +107,7 @@ Description: Use dynamic linking for wcslib-tools instead of static
-@ $(RM) $@.o
../C/getwcstab.o :
-@@ -102,7 +99,7 @@
+@@ -102,7 +99,7 @@ $(PGSBOXLIB) :
-@ echo ''
$(MAKE) -C ../pgsbox lib
@@ -48,51 +116,3 @@ Description: Use dynamic linking for wcslib-tools instead of static
-@ echo ''
$(MAKE) -C ../C lib
---- a/C/GNUmakefile
-+++ b/C/GNUmakefile
-@@ -246,7 +246,9 @@
- trap 'cd .. ; $(RM) -r tmp' 0 1 2 3 15 ; \
- $(AR) x ../$(PICLIB) && \
- $(SHRLD) -o $@ *.o $(LDFLAGS) $(LIBS) && \
-- mv $@ ..
-+ mv $@ .. && \
-+ ln -sf $@ ../$(SONAME) && \
-+ ln -sf $(SONAME) ../$(SHRLN)
-
- $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ;
-
---- a/pgsbox/GNUmakefile
-+++ b/pgsbox/GNUmakefile
-@@ -118,7 +118,9 @@
- trap 'cd .. ; $(RM) -r tmp' 0 1 2 3 15 ; \
- $(AR) x ../$(PICLIB) && \
- $(SHRLD) -o $@ *.o ../$(WCSSHR) $(LDFLAGS) $(PGPLOTLIB) $(FLIBS) && \
-- mv $@ ..
-+ mv $@ .. && \
-+ ln -sf $@ ../$(SONAME) && \
-+ ln -sf $(SONAME) ../$(SHRLN)
-
- $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ;
-
---- a/C/test/tdis3
-+++ b/C/test/tdis3
-@@ -1,5 +1,8 @@
- #!/bin/sh
-
-+ LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:.
-+ export LD_LIBRARY_PATH
-+
- echo "Testing WCSLIB's handling of translated distortions (tdis3)"
- echo "-----------------------------------------------------------"
-
---- a/C/test/twcslint
-+++ b/C/test/twcslint
-@@ -1,5 +1,8 @@
- #!/bin/sh
-
-+ LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:.
-+ export LD_LIBRARY_PATH
-+
- exec 1>twcslint.out 2>&1
-
- echo "Testing WCSLIB syntax checker for FITS WCS keyrecords (twcslint)"
diff --git a/debian/patches/fix_ar_timestamp.patch b/debian/patches/fix_ar_timestamp.patch
index ba6618f..8cc7125 100644
--- a/debian/patches/fix_ar_timestamp.patch
+++ b/debian/patches/fix_ar_timestamp.patch
@@ -1,31 +1,27 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Explicitely add timestamps for `ar r`
- The `ar` program distributed with binutils does not include the time stamp
- of the object files by default. This causes several recompilations of the
- library. Since the time stamp is removed anyway by dh_strip_nondeterminism,
+From: Ole Streicher <olebole at debian.org>
+Date: Sun, 15 Jan 2017 16:35:33 +0100
+Subject: Explicitely add timestamps for `ar r` The `ar` program distributed
+ with binutils does not include the time stamp of the object files by
+ default. This causes several recompilations of the library. Since the time
+ stamp is removed anyway by dh_strip_nondeterminism,
we add the time stamp here.
---- a/pgsbox/GNUmakefile
-+++ b/pgsbox/GNUmakefile
-@@ -64,25 +64,25 @@
- $(PGSBOXLIB)(%.o) : %.f
- -@ echo ''
- $(FC) -I../Fortran $(FFLAGS) -c $<
-- $(AR) r $(PGSBOXLIB) $%
-+ $(AR) Ur $(PGSBOXLIB) $%
- -@ $(RM) $%
-
- $(PGSBOXLIB)(%.o) : %.c
+
+---
+ C/GNUmakefile | 4 ++--
+ Fortran/GNUmakefile | 8 ++++----
+ pgsbox/GNUmakefile | 8 ++++----
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/C/GNUmakefile b/C/GNUmakefile
+index 6d2305d..8c8feee 100644
+--- a/C/GNUmakefile
++++ b/C/GNUmakefile
+@@ -124,13 +124,13 @@ endif
+ $(WCSLIB)(%.o) : %.c
-@ echo ''
$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-- $(AR) r $(PGSBOXLIB) $%
-+ $(AR) Ur $(PGSBOXLIB) $%
- -@ $(RM) $%
-
- $(PICLIB)(%.o) : %.f
- -@ echo ''
- $(FC) -I../Fortran $(FFLAGS) $(SHRFLAGS) -c $<
-- $(AR) r $(PICLIB) $%
-+ $(AR) Ur $(PICLIB) $%
+- $(AR) r $(WCSLIB) $%
++ $(AR) Ur $(WCSLIB) $%
-@ $(RM) $%
$(PICLIB)(%.o) : %.c
@@ -36,9 +32,11 @@ Description: Explicitely add timestamps for `ar r`
-@ $(RM) $%
%.i : %.c
+diff --git a/Fortran/GNUmakefile b/Fortran/GNUmakefile
+index 482d8ff..e244d8f 100644
--- a/Fortran/GNUmakefile
+++ b/Fortran/GNUmakefile
-@@ -106,25 +106,25 @@
+@@ -106,25 +106,25 @@ PGPLOTLIB := $(PGPLOTLIB)
$(WCSLIB)(%.o) : %.c
-@ echo ''
$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
@@ -68,14 +66,30 @@ Description: Explicitely add timestamps for `ar r`
-@ $(RM) $%
%.i : %.c
---- a/C/GNUmakefile
-+++ b/C/GNUmakefile
-@@ -124,13 +124,13 @@
- $(WCSLIB)(%.o) : %.c
+diff --git a/pgsbox/GNUmakefile b/pgsbox/GNUmakefile
+index 4891d99..af1b52f 100644
+--- a/pgsbox/GNUmakefile
++++ b/pgsbox/GNUmakefile
+@@ -64,25 +64,25 @@ vpath %.inc ../Fortran
+ $(PGSBOXLIB)(%.o) : %.f
+ -@ echo ''
+ $(FC) -I../Fortran $(FFLAGS) -c $<
+- $(AR) r $(PGSBOXLIB) $%
++ $(AR) Ur $(PGSBOXLIB) $%
+ -@ $(RM) $%
+
+ $(PGSBOXLIB)(%.o) : %.c
-@ echo ''
$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-- $(AR) r $(WCSLIB) $%
-+ $(AR) Ur $(WCSLIB) $%
+- $(AR) r $(PGSBOXLIB) $%
++ $(AR) Ur $(PGSBOXLIB) $%
+ -@ $(RM) $%
+
+ $(PICLIB)(%.o) : %.f
+ -@ echo ''
+ $(FC) -I../Fortran $(FFLAGS) $(SHRFLAGS) -c $<
+- $(AR) r $(PICLIB) $%
++ $(AR) Ur $(PICLIB) $%
-@ $(RM) $%
$(PICLIB)(%.o) : %.c
diff --git a/debian/patches/increase_tspx_test_tol.patch b/debian/patches/increase_tspx_test_tol.patch
index 7c98a3f..be49795 100644
--- a/debian/patches/increase_tspx_test_tol.patch
+++ b/debian/patches/increase_tspx_test_tol.patch
@@ -1,7 +1,16 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Increase the tolerance in the TSPX test. TSPX tests the spectral
- transformation routines for closure. On some systems (armel, armhf), this test shows a slightly increased
- residual, which is however still acceptable.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Sun, 15 Jan 2017 16:35:33 +0100
+Subject: Increase the tolerance in the TSPX test. TSPX tests the spectral
+ transformation routines for closure. On some systems (armel, armhf),
+ this test shows a slightly increased residual,
+ which is however still acceptable.
+
+---
+ Fortran/test/tspx.f | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Fortran/test/tspx.f b/Fortran/test/tspx.f
+index d52d1b3..d9128ce 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 7d8e9d3..379f81a 100644
--- a/debian/patches/set-null-graphics-on-tests.patch
+++ b/debian/patches/set-null-graphics-on-tests.patch
@@ -1,9 +1,33 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Use dummy graphics for testing.
- The tests run unattended anyway, so there is no use of a visible graphics.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Sun, 15 Jan 2017 16:35:33 +0100
+Subject: Use dummy graphics for testing. The tests run unattended anyway,
+ so there is no use of a visible graphics.
+
+---
+ C/test/tcel1.c | 2 +-
+ C/test/tcel2.c | 2 +-
+ C/test/tpih2.c | 2 +-
+ C/test/tprj2.c | 2 +-
+ C/test/tspc.c | 2 +-
+ C/test/ttab2.c | 2 +-
+ C/test/ttab3.c | 2 +-
+ C/test/twcsmix.c | 2 +-
+ Fortran/test/tcel1.f | 2 +-
+ Fortran/test/tpih2.f | 2 +-
+ Fortran/test/tprj2.f | 2 +-
+ Fortran/test/tspc.f | 2 +-
+ Fortran/test/ttab2.f | 2 +-
+ Fortran/test/ttab3.f | 2 +-
+ Fortran/test/twcsmix.f | 2 +-
+ pgsbox/cpgtest.c | 2 +-
+ pgsbox/pgtest.f | 2 +-
+ 17 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/C/test/tcel1.c b/C/test/tcel1.c
+index 322b636..1de168d 100644
--- a/C/test/tcel1.c
+++ b/C/test/tcel1.c
-@@ -80,7 +80,7 @@
+@@ -80,7 +80,7 @@ int main()
/* PGPLOT initialization. */
@@ -12,9 +36,11 @@ Description: Use dummy graphics for testing.
cpgbeg(0, text, 1, 1);
/* Define pen colours. */
+diff --git a/C/test/tcel2.c b/C/test/tcel2.c
+index 6ba0c7b..1122c34 100644
--- a/C/test/tcel2.c
+++ b/C/test/tcel2.c
-@@ -106,7 +106,7 @@
+@@ -106,7 +106,7 @@ int main()
/* PGPLOT initialization. */
@@ -23,9 +49,24 @@ Description: Use dummy graphics for testing.
cpgbeg(0, text, 1, 1);
/* Define pen colours. */
+diff --git a/C/test/tpih2.c b/C/test/tpih2.c
+index e55963f..f295dcd 100644
+--- a/C/test/tpih2.c
++++ b/C/test/tpih2.c
+@@ -147,7 +147,7 @@ int main()
+ trc[0] = naxis[0] + 0.5f;
+ trc[1] = naxis[1] + 0.5f;
+
+- strcpy(devtyp, "/XWINDOW");
++ strcpy(devtyp, "/NULL");
+ cpgbeg(0, devtyp, 1, 1);
+ cpgvstd();
+
+diff --git a/C/test/tprj2.c b/C/test/tprj2.c
+index a62ace5..05c9172 100644
--- a/C/test/tprj2.c
+++ b/C/test/tprj2.c
-@@ -60,7 +60,7 @@
+@@ -60,7 +60,7 @@ int main()
/* PGPLOT initialization. */
@@ -34,9 +75,11 @@ Description: Use dummy graphics for testing.
cpgbeg(0, text, 1, 1);
/* Define pen colours. */
+diff --git a/C/test/tspc.c b/C/test/tspc.c
+index ec972cd..1be49ec 100644
--- a/C/test/tspc.c
+++ b/C/test/tspc.c
-@@ -69,7 +69,7 @@
+@@ -69,7 +69,7 @@ int main()
/* PGPLOT initialization. */
@@ -45,9 +88,11 @@ Description: Use dummy graphics for testing.
cpgbeg(0, text, 1, 1);
naxisj = NSPEC;
+diff --git a/C/test/ttab2.c b/C/test/ttab2.c
+index 7dd6873..4598b4c 100644
--- a/C/test/ttab2.c
+++ b/C/test/ttab2.c
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ int main()
/* PGPLOT initialization. */
@@ -56,9 +101,11 @@ Description: Use dummy graphics for testing.
cpgbeg(0, text, 1, 1);
cpgvstd();
cpgsch(0.7f);
+diff --git a/C/test/ttab3.c b/C/test/ttab3.c
+index 04e5587..fc16dbe 100644
--- a/C/test/ttab3.c
+++ b/C/test/ttab3.c
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ int main()
/* PGPLOT initialization. */
@@ -67,9 +114,11 @@ Description: Use dummy graphics for testing.
cpgbeg(0, text, 1, 1);
cpgvstd();
cpgsch(0.7f);
+diff --git a/C/test/twcsmix.c b/C/test/twcsmix.c
+index 502224b..c79f732 100644
--- a/C/test/twcsmix.c
+++ b/C/test/twcsmix.c
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ int main()
/* PGPLOT initialization. */
@@ -78,6 +127,8 @@ Description: Use dummy graphics for testing.
cpgbeg(0, text, 1, 1);
/* Define pen colours. */
+diff --git a/Fortran/test/tcel1.f b/Fortran/test/tcel1.f
+index 3149452..3e8f275 100644
--- a/Fortran/test/tcel1.f
+++ b/Fortran/test/tcel1.f
@@ -77,7 +77,7 @@
@@ -89,6 +140,21 @@ Description: Use dummy graphics for testing.
* 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
+--- a/Fortran/test/tpih2.f
++++ b/Fortran/test/tpih2.f
+@@ -131,7 +131,7 @@
+ TRC(1) = NAXIS(1) + 0.5
+ TRC(2) = NAXIS(2) + 0.5
+
+- DEVTYP = '/XWINDOW'
++ DEVTYP = '/NULL'
+ CALL PGBEG(0, DEVTYP, 1, 1)
+ CALL PGVSTD()
+
+diff --git a/Fortran/test/tprj2.f b/Fortran/test/tprj2.f
+index c3fdd75..0c593cc 100644
--- a/Fortran/test/tprj2.f
+++ b/Fortran/test/tprj2.f
@@ -48,7 +48,7 @@
@@ -100,6 +166,8 @@ Description: Use dummy graphics for testing.
* 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
--- a/Fortran/test/tspc.f
+++ b/Fortran/test/tspc.f
@@ -55,7 +55,7 @@
@@ -111,6 +179,8 @@ Description: Use dummy graphics for testing.
NAXISJ = NSPEC
CRPIXJ = NAXISJ/2 + 1
+diff --git a/Fortran/test/ttab2.f b/Fortran/test/ttab2.f
+index 071958d..608b8a5 100644
--- a/Fortran/test/ttab2.f
+++ b/Fortran/test/ttab2.f
@@ -72,7 +72,7 @@
@@ -122,6 +192,8 @@ Description: Use dummy graphics for testing.
CALL PGVSTD ()
CALL PGSCH (0.7)
+diff --git a/Fortran/test/ttab3.f b/Fortran/test/ttab3.f
+index e957c86..b1043de 100644
--- a/Fortran/test/ttab3.f
+++ b/Fortran/test/ttab3.f
@@ -67,7 +67,7 @@
@@ -133,6 +205,8 @@ Description: Use dummy graphics for testing.
CALL PGVSTD ()
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
--- a/Fortran/test/twcsmix.f
+++ b/Fortran/test/twcsmix.f
@@ -89,7 +89,7 @@
@@ -144,17 +218,21 @@ Description: Use dummy graphics for testing.
* Define pen colours.
CALL PGSCR (0, 0.00, 0.00, 0.00)
---- a/Fortran/test/tpih2.f
-+++ b/Fortran/test/tpih2.f
-@@ -131,7 +131,7 @@
- TRC(1) = NAXIS(1) + 0.5
- TRC(2) = NAXIS(2) + 0.5
+diff --git a/pgsbox/cpgtest.c b/pgsbox/cpgtest.c
+index c5f683b..16ae359 100644
+--- a/pgsbox/cpgtest.c
++++ b/pgsbox/cpgtest.c
+@@ -68,7 +68,7 @@ int main()
+ trc[0] = naxis[0] + 0.5f;
+ trc[1] = naxis[1] + 0.5f;
-- DEVTYP = '/XWINDOW'
-+ DEVTYP = '/NULL'
- CALL PGBEG(0, DEVTYP, 1, 1)
- CALL PGVSTD()
+- strcpy(devtyp, "/XWINDOW");
++ strcpy(devtyp, "/NULL");
+ cpgbeg(0, devtyp, 1, 1);
+ j = 16;
+diff --git a/pgsbox/pgtest.f b/pgsbox/pgtest.f
+index ea4eafb..4985bdf 100644
--- a/pgsbox/pgtest.f
+++ b/pgsbox/pgtest.f
@@ -60,7 +60,7 @@
@@ -166,25 +244,3 @@ Description: Use dummy graphics for testing.
CALL PGQINF ('TYPE', DEVTYP, J)
IF (DEVTYP.EQ.'PS' .OR.
---- a/C/test/tpih2.c
-+++ b/C/test/tpih2.c
-@@ -147,7 +147,7 @@
- trc[0] = naxis[0] + 0.5f;
- trc[1] = naxis[1] + 0.5f;
-
-- strcpy(devtyp, "/XWINDOW");
-+ strcpy(devtyp, "/NULL");
- cpgbeg(0, devtyp, 1, 1);
- cpgvstd();
-
---- a/pgsbox/cpgtest.c
-+++ b/pgsbox/cpgtest.c
-@@ -68,7 +68,7 @@
- trc[0] = naxis[0] + 0.5f;
- trc[1] = naxis[1] + 0.5f;
-
-- strcpy(devtyp, "/XWINDOW");
-+ strcpy(devtyp, "/NULL");
- cpgbeg(0, devtyp, 1, 1);
-
- j = 16;
--
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