[Debian-astro-commits] [wcslib] 03/03: Move libpgsbox and wcsgrid from contrib
Ole Streicher
olebole at moszumanska.debian.org
Mon Jun 20 15:22:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository wcslib.
commit bfed1b6f511aab54533a976e0ee74860c231d370
Author: Ole Streicher <olebole at debian.org>
Date: Mon Jun 20 17:10:28 2016 +0200
Move libpgsbox and wcsgrid from contrib
---
debian/changelog | 1 +
debian/control | 13 +-
debian/libpgsbox5.install | 1 +
debian/libpgsbox5.lintian-overrides | 2 +
debian/libpgsbox5.symbols | 11 ++
debian/patches/add_CPGPLOT.patch | 88 +++++++++++
debian/patches/series | 2 +
debian/patches/set-null-graphics-on-tests.patch | 190 ++++++++++++++++++++++++
debian/wcslib-dev.install | 2 +
debian/wcslib-tools.install | 2 +
10 files changed, 310 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ef44822..057b438 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
wcslib (5.15-2) UNRELEASED; urgency=low
* Use dynamic linking for wcslib-tools instead of static
+ * Move libpgsbox and wcsgrid from contrib
-- Ole Streicher <olebole at debian.org> Sat, 18 Jun 2016 15:16:41 +0200
diff --git a/debian/control b/debian/control
index 7f7b736..8f058fa 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,9 @@ Priority: optional
Build-Depends: autotools-dev,
debhelper (>= 9),
dh-autoreconf,
- flex,
+ flex,
gfortran,
+ giza-dev,
libcfitsio-dev
Standards-Version: 3.9.7
Vcs-Browser: https://anonscm.debian.org/cgit/debian-astro/packages/wcslib.git
@@ -33,6 +34,15 @@ Description: Implementation of the FITS WCS standard
This package contains what you need to run programs that use this
library.
+Package: libpgsbox5
+Section: libs
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Draw and label curvilinear coordinate grids with pgplot
+ PGSBOX draws and labels a curvilinear coordinate grid. The caller
+ must provide a separate external function, NLFUNC, to define the
+ non-linear coordinate transformation.
+
Package: wcslib-dev
Architecture: any
Section: libdevel
@@ -69,4 +79,3 @@ Description: Command line tools utilizing wcslib
.
This package contains the utility programs fitshdr, wcsware, and HPXcvt
that are included in wcslib.
-
diff --git a/debian/libpgsbox5.install b/debian/libpgsbox5.install
new file mode 100644
index 0000000..1aa8305
--- /dev/null
+++ b/debian/libpgsbox5.install
@@ -0,0 +1 @@
+usr/lib/*/libpgsbox*.so.*
diff --git a/debian/libpgsbox5.lintian-overrides b/debian/libpgsbox5.lintian-overrides
new file mode 100644
index 0000000..672ad39
--- /dev/null
+++ b/debian/libpgsbox5.lintian-overrides
@@ -0,0 +1,2 @@
+# False positive
+libpgsbox5: hardening-no-fortify-functions usr/lib/*/libpgsbox.so*
diff --git a/debian/libpgsbox5.symbols b/debian/libpgsbox5.symbols
new file mode 100644
index 0000000..9d6e227
--- /dev/null
+++ b/debian/libpgsbox5.symbols
@@ -0,0 +1,11 @@
+libpgsbox.so.5 libpgsbox5 #MINVER#
+ cpglbox at Base 5.15
+ cpgsbox at Base 5.15
+ pgcrfn_ at Base 5.15
+ pgcrlb_ at Base 5.15
+ pglbok_ at Base 5.15
+ pglbox_ at Base 5.15
+ pgmjd_ at Base 5.15
+ pgsbok_ at Base 5.15
+ pgsbox_ at Base 5.15
+ pgwcsl_ at Base 5.15
diff --git a/debian/patches/add_CPGPLOT.patch b/debian/patches/add_CPGPLOT.patch
new file mode 100644
index 0000000..5ee603c
--- /dev/null
+++ b/debian/patches/add_CPGPLOT.patch
@@ -0,0 +1,88 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Correct linker flags for pgsbox
+--- a/configure.ac
++++ b/configure.ac
+@@ -460,8 +460,8 @@
+ [], [$PGPLOTLIB $LIBS])
+ AC_CHECK_LIB([pgplot], [pgbeg_], [PGPLOTLIB="-lpgplot $PGPLOTLIB"],
+ [], [$PGPLOTLIB $FLIBS $LIBS])
+- AC_CHECK_LIB([cpgplot], [cpgbeg], [PGPLOTLIB="-lcpgplot $PGPLOTLIB"],
+- [PGPLOTLIB=], [$PGPLOTLIB $FLIBS $LIBS])
++ AC_CHECK_LIB([cpgplot], [cpgbeg], [CPGPLOTLIB="-lcpgplot"],
++ [], [$CPGPLOTLIB $LIBS])
+
+ # Only need the PGPLOT include file to build PGSBOX.
+ if test "x$PGPLOTINC" != x; then
+@@ -501,6 +501,7 @@
+
+ AC_SUBST([PGPLOTINC])
+ AC_SUBST([PGPLOTLIB])
++AC_SUBST([CPGPLOTLIB])
+
+ AC_SUBST([SUBDIRS])
+ AC_SUBST([TSTDIRS])
+--- a/pgsbox/GNUmakefile
++++ b/pgsbox/GNUmakefile
+@@ -117,7 +117,7 @@
+ cd tmp && \
+ trap 'cd .. ; $(RM) -r tmp' 0 1 2 3 15 ; \
+ $(AR) x ../$(PICLIB) && \
+- $(SHRLD) -o $@ *.o ../$(WCSSHR) $(LDFLAGS) $(PGPLOTLIB) $(FLIBS) && \
++ $(SHRLD) -o $@ *.o ../$(WCSSHR) $(LDFLAGS) $(PGPLOTLIB) $(CPGPLOTLIB) $(FLIBS) && \
+ mv $@ .. && \
+ ln -sf $@ ../$(SONAME) && \
+ ln -sf $(SONAME) ../$(SHRLN)
+@@ -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 ;
+--- a/makedefs.in
++++ b/makedefs.in
+@@ -152,6 +152,7 @@
+ # PGPLOT (see note 4 above).
+ PGPLOTINC := @PGPLOTINC@
+ PGPLOTLIB := @PGPLOTLIB@
++ CPGPLOTLIB := @CPGPLOTLIB@
+
+ # CFITSIO (see note 5 above).
+ CFITSIOINC := @CFITSIOINC@
+@@ -229,6 +230,7 @@
+ -@ echo ' LDFLAGS := $(LDFLAGS)'
+ -@ echo ' PGPLOTINC := $(PGPLOTINC)'
+ -@ echo ' PGPLOTLIB := $(PGPLOTLIB)'
++ -@ echo ' CPGPLOTLIB := $(CPGPLOTLIB)'
+ -@ 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 @@
+ -@ 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/debian/patches/series b/debian/patches/series
index 72bbb72..7e1362a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,6 @@
dynlink.patch
fix_ar_timestamp.patch
+add_CPGPLOT.patch
increase_tspx_test_tol.patch
disable_Ftspx_test.patch
+set-null-graphics-on-tests.patch
diff --git a/debian/patches/set-null-graphics-on-tests.patch b/debian/patches/set-null-graphics-on-tests.patch
new file mode 100644
index 0000000..7d8e9d3
--- /dev/null
+++ b/debian/patches/set-null-graphics-on-tests.patch
@@ -0,0 +1,190 @@
+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.
+--- a/C/test/tcel1.c
++++ b/C/test/tcel1.c
+@@ -80,7 +80,7 @@
+
+
+ /* PGPLOT initialization. */
+- strcpy(text, "/xwindow");
++ strcpy(text, "/null");
+ cpgbeg(0, text, 1, 1);
+
+ /* Define pen colours. */
+--- a/C/test/tcel2.c
++++ b/C/test/tcel2.c
+@@ -106,7 +106,7 @@
+
+
+ /* PGPLOT initialization. */
+- strcpy(text, "/xwindow");
++ strcpy(text, "/null");
+ cpgbeg(0, text, 1, 1);
+
+ /* Define pen colours. */
+--- a/C/test/tprj2.c
++++ b/C/test/tprj2.c
+@@ -60,7 +60,7 @@
+
+
+ /* PGPLOT initialization. */
+- strcpy(text, "/xwindow");
++ strcpy(text, "/null");
+ cpgbeg(0, text, 1, 1);
+
+ /* Define pen colours. */
+--- a/C/test/tspc.c
++++ b/C/test/tspc.c
+@@ -69,7 +69,7 @@
+
+
+ /* PGPLOT initialization. */
+- strcpy(text, "/xwindow");
++ strcpy(text, "/null");
+ cpgbeg(0, text, 1, 1);
+
+ naxisj = NSPEC;
+--- a/C/test/ttab2.c
++++ b/C/test/ttab2.c
+@@ -77,7 +77,7 @@
+
+
+ /* PGPLOT initialization. */
+- strcpy(text, "/xwindow");
++ strcpy(text, "/null");
+ cpgbeg(0, text, 1, 1);
+ cpgvstd();
+ cpgsch(0.7f);
+--- a/C/test/ttab3.c
++++ b/C/test/ttab3.c
+@@ -74,7 +74,7 @@
+
+
+ /* PGPLOT initialization. */
+- strcpy(text, "/xwindow");
++ strcpy(text, "/null");
+ cpgbeg(0, text, 1, 1);
+ cpgvstd();
+ cpgsch(0.7f);
+--- a/C/test/twcsmix.c
++++ b/C/test/twcsmix.c
+@@ -93,7 +93,7 @@
+
+
+ /* PGPLOT initialization. */
+- strcpy(text, "/xwindow");
++ strcpy(text, "/null");
+ cpgbeg(0, text, 1, 1);
+
+ /* Define pen colours. */
+--- a/Fortran/test/tcel1.f
++++ b/Fortran/test/tcel1.f
+@@ -77,7 +77,7 @@
+
+
+ * PGPLOT initialization.
+- CALL PGBEG (0, '/xwindow', 1, 1)
++ CALL PGBEG (0, '/null', 1, 1)
+
+ * Define pen colours.
+ CALL PGSCR (0, 0.00, 0.00, 0.00)
+--- a/Fortran/test/tprj2.f
++++ b/Fortran/test/tprj2.f
+@@ -48,7 +48,7 @@
+ 20 CONTINUE
+
+ * PGPLOT initialization.
+- CALL PGBEG (0, '/xwindow', 1, 1)
++ CALL PGBEG (0, '/null', 1, 1)
+
+ * Define pen colours.
+ CALL PGSCR (0, 0.00, 0.00, 0.00)
+--- a/Fortran/test/tspc.f
++++ b/Fortran/test/tspc.f
+@@ -55,7 +55,7 @@
+ NFAIL = 0
+
+ * PGPLOT initialization.
+- CALL PGBEG (0, '/xwindow', 1, 1)
++ CALL PGBEG (0, '/null', 1, 1)
+
+ NAXISJ = NSPEC
+ CRPIXJ = NAXISJ/2 + 1
+--- a/Fortran/test/ttab2.f
++++ b/Fortran/test/ttab2.f
+@@ -72,7 +72,7 @@
+
+
+ * PGPLOT initialization.
+- CALL PGBEG (0, '/xwindow', 1, 1)
++ CALL PGBEG (0, '/null', 1, 1)
+ CALL PGVSTD ()
+ CALL PGSCH (0.7)
+
+--- a/Fortran/test/ttab3.f
++++ b/Fortran/test/ttab3.f
+@@ -67,7 +67,7 @@
+
+
+ * PGPLOT initialization.
+- CALL PGBEG (0, '/xwindow', 1, 1)
++ CALL PGBEG (0, '/null', 1, 1)
+ CALL PGVSTD ()
+ CALL PGSCH (0.7)
+ CALL PGWNAD (-135.0, 135.0, -95.0, 140.0)
+--- a/Fortran/test/twcsmix.f
++++ b/Fortran/test/twcsmix.f
+@@ -89,7 +89,7 @@
+ : '-----------------------------------------')
+
+ * PGPLOT initialization.
+- CALL PGBEG (0, '/xwindow', 1, 1)
++ CALL PGBEG (0, '/null', 1, 1)
+
+ * 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
+
+- DEVTYP = '/XWINDOW'
++ DEVTYP = '/NULL'
+ CALL PGBEG(0, DEVTYP, 1, 1)
+ CALL PGVSTD()
+
+--- a/pgsbox/pgtest.f
++++ b/pgsbox/pgtest.f
+@@ -60,7 +60,7 @@
+ TRC(2) = NAXIS(2) + 0.5
+
+ * CALL PGBEG (0, '?', 1, 1)
+- call pgbeg (0, '/xw', 1, 1)
++ call pgbeg (0, '/null', 1, 1)
+
+ 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;
diff --git a/debian/wcslib-dev.install b/debian/wcslib-dev.install
index 0bc2e75..23097f6 100644
--- a/debian/wcslib-dev.install
+++ b/debian/wcslib-dev.install
@@ -1,4 +1,6 @@
usr/include/*
usr/lib/*/libwcs*.a
usr/lib/*/libwcs.so
+usr/lib/*/libpgsbox*.a
+usr/lib/*/libpgsbox.so
usr/lib/*/pkgconfig/wcslib.pc
diff --git a/debian/wcslib-tools.install b/debian/wcslib-tools.install
index a001ec6..5eb9521 100644
--- a/debian/wcslib-tools.install
+++ b/debian/wcslib-tools.install
@@ -1,6 +1,8 @@
usr/bin/HPXcvt
usr/bin/fitshdr
usr/bin/wcsware
+usr/bin/wcsgrid
usr/share/man/man1/HPXcvt.*
usr/share/man/man1/fitshdr.*
usr/share/man/man1/wcsware.*
+usr/share/man/man1/wcsgrid.*
--
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