[wcslib] 02/02: Merge branch 'debian' into debian-contrib
Ole Streicher
olebole-guest at moszumanska.debian.org
Sun Apr 13 09:58:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian-contrib
in repository wcslib.
commit ad34cd0936d49cfe1d5a91cf6d8f06e593e5a815
Merge: b873231 e33bde1
Author: Ole Streicher <debian at liska.ath.cx>
Date: Sun Apr 13 11:39:59 2014 +0200
Merge branch 'debian' into debian-contrib
Conflicts:
debian/changelog
C/GNUmakefile | 4 +-
C/cel.c | 4 +-
C/cel.h | 6 +-
C/fitshdr.h | 4 +-
C/fitshdr.l | 4 +-
C/flexed/fitshdr.c | 4 +-
C/flexed/wcsbth.c | 4 +-
C/flexed/wcspih.c | 4 +-
C/flexed/wcsulex.c | 4 +-
C/flexed/wcsutrn.c | 4 +-
C/getwcstab.c | 4 +-
C/getwcstab.h | 4 +-
C/lin.c | 4 +-
C/lin.h | 6 +-
C/log.c | 4 +-
C/log.h | 6 +-
C/prj.c | 117 +++++++++++++---------
C/prj.h | 6 +-
C/spc.c | 4 +-
C/spc.h | 6 +-
C/sph.c | 4 +-
C/sph.h | 6 +-
C/spx.c | 4 +-
C/spx.h | 6 +-
C/tab.c | 4 +-
C/tab.h | 6 +-
C/test/bth.keyrec | 4 +-
C/test/pih.keyrec | 4 +-
C/test/tbth1.c | 4 +-
C/test/tcel1.c | 4 +-
C/test/tcel2.c | 4 +-
C/test/tfitshdr.c | 4 +-
C/test/tlin.c | 4 +-
C/test/tlog.c | 4 +-
C/test/tofits.c | 4 +-
C/test/tpih1.c | 4 +-
C/test/tpih2.c | 4 +-
C/test/tprj1.c | 4 +-
C/test/tprj2.c | 4 +-
C/test/tspc.c | 4 +-
C/test/tspcaips.c | 4 +-
C/test/tspcspxe.c | 4 +-
C/test/tspctrne.c | 4 +-
C/test/tsph.c | 4 +-
C/test/tsphdpa.c | 4 +-
C/test/tspx.c | 4 +-
C/test/ttab1.c | 4 +-
C/test/ttab2.c | 4 +-
C/test/ttab3.c | 4 +-
C/test/tunits.c | 4 +-
C/test/twcs.c | 4 +-
C/test/twcs_locale.c | 4 +-
C/test/twcsfix.c | 4 +-
C/test/twcshdr.c | 4 +-
C/test/twcsmix.c | 4 +-
C/test/twcssub.c | 4 +-
C/test/twcstab.c | 4 +-
C/test/wcstab.keyrec | 4 +-
C/wcs.c | 4 +-
C/wcs.h | 6 +-
C/wcsbth.l | 4 +-
C/wcserr.c | 4 +-
C/wcserr.h | 4 +-
C/wcsfix.c | 4 +-
C/wcsfix.h | 6 +-
C/wcshdr.c | 4 +-
C/wcshdr.h | 6 +-
C/wcslib.h | 6 +-
C/wcsmath.h | 4 +-
C/wcspih.l | 4 +-
C/wcsprintf.c | 4 +-
C/wcsprintf.h | 6 +-
C/wcstrig.c | 4 +-
C/wcstrig.h | 4 +-
C/wcsulex.l | 4 +-
C/wcsunits.c | 4 +-
C/wcsunits.h | 6 +-
C/wcsutil.c | 4 +-
C/wcsutil.h | 4 +-
C/wcsutrn.l | 4 +-
CHANGES | 13 ++-
Fortran/GNUmakefile | 6 +-
Fortran/cel.inc | 4 +-
Fortran/cel_data.f | 4 +-
Fortran/cel_f.c | 4 +-
Fortran/fitshdr.inc | 4 +-
Fortran/fitshdr_data.f | 4 +-
Fortran/fitshdr_f.c | 4 +-
Fortran/getwcstab.inc | 4 +-
Fortran/getwcstab_f.c | 4 +-
Fortran/lin.inc | 4 +-
Fortran/lin_data.f | 4 +-
Fortran/lin_f.c | 4 +-
Fortran/log.inc | 4 +-
Fortran/log_data.f | 4 +-
Fortran/log_f.c | 4 +-
Fortran/prj.inc | 4 +-
Fortran/prj_data.f | 4 +-
Fortran/prj_f.c | 4 +-
Fortran/spc.inc | 4 +-
Fortran/spc_data.f | 4 +-
Fortran/spc_f.c | 4 +-
Fortran/sph.inc | 4 +-
Fortran/sph_f.c | 4 +-
Fortran/spx.inc | 4 +-
Fortran/spx_data.f | 4 +-
Fortran/spx_f.c | 4 +-
Fortran/tab.inc | 4 +-
Fortran/tab_data.f | 4 +-
Fortran/tab_f.c | 4 +-
Fortran/test/tcel1.f | 4 +-
Fortran/test/tfitshdr.f | 4 +-
Fortran/test/tlin.f | 4 +-
Fortran/test/tlog.f | 4 +-
Fortran/test/tpih1.f | 4 +-
Fortran/test/tpih2.f | 4 +-
Fortran/test/tprj1.f | 4 +-
Fortran/test/tprj2.f | 4 +-
Fortran/test/tspc.f | 4 +-
Fortran/test/tsph.f | 4 +-
Fortran/test/tspx.f | 4 +-
Fortran/test/ttab1.f | 4 +-
Fortran/test/ttab2.f | 4 +-
Fortran/test/ttab3.f | 4 +-
Fortran/test/tunits.f | 4 +-
Fortran/test/twcs.f | 4 +-
Fortran/test/twcsfix.f | 4 +-
Fortran/test/twcsmix.f | 4 +-
Fortran/test/twcssub.f | 4 +-
Fortran/test/twcstab.f | 4 +-
Fortran/wcs.inc | 4 +-
Fortran/wcs_data.f | 4 +-
Fortran/wcs_f.c | 4 +-
Fortran/wcserr.inc | 4 +-
Fortran/wcserr_f.c | 4 +-
Fortran/wcsfix.inc | 4 +-
Fortran/wcsfix_data.f | 4 +-
Fortran/wcsfix_f.c | 4 +-
Fortran/wcshdr.inc | 4 +-
Fortran/wcshdr_data.f | 4 +-
Fortran/wcshdr_f.c | 4 +-
Fortran/wcsmath.inc | 4 +-
Fortran/wcsunits.inc | 4 +-
Fortran/wcsunits_data.f | 4 +-
Fortran/wcsunits_f.c | 4 +-
GNUmakefile | 4 +-
INSTALL | 8 +-
README | 6 +-
THANKS | 2 +-
VALIDATION | 25 ++++-
configure | 24 ++---
configure.ac | 6 +-
debian/changelog | 132 ++++++++++++++++++++++++-
debian/control | 4 +-
doxygen/Doxyfile | 2 +-
doxygen/GNUmakefile | 4 +-
doxygen/README | 2 +-
doxygen/doxextr.l | 4 +-
doxygen/mainpage.dox | 8 +-
flavours | 2 +-
html/annotated.html | 6 +-
html/cel_8h.html | 6 +-
html/cel_8h_source.html | 12 +--
html/classes.html | 6 +-
html/deprecated.html | 6 +-
html/diagnostics.html | 8 +-
html/dir_af99bb3c152a306abd27951285ad1127.html | 6 +-
html/files.html | 6 +-
html/fitshdr_8h.html | 6 +-
html/fitshdr_8h_source.html | 10 +-
html/fortran.html | 8 +-
html/functions.html | 6 +-
html/functions_0x62.html | 6 +-
html/functions_0x63.html | 6 +-
html/functions_0x64.html | 6 +-
html/functions_0x65.html | 6 +-
html/functions_0x66.html | 6 +-
html/functions_0x67.html | 6 +-
html/functions_0x69.html | 6 +-
html/functions_0x6b.html | 6 +-
html/functions_0x6c.html | 6 +-
html/functions_0x6d.html | 6 +-
html/functions_0x6e.html | 6 +-
html/functions_0x6f.html | 6 +-
html/functions_0x70.html | 6 +-
html/functions_0x72.html | 6 +-
html/functions_0x73.html | 6 +-
html/functions_0x74.html | 6 +-
html/functions_0x75.html | 6 +-
html/functions_0x76.html | 6 +-
html/functions_0x77.html | 6 +-
html/functions_0x78.html | 6 +-
html/functions_0x79.html | 6 +-
html/functions_0x7a.html | 6 +-
html/functions_vars.html | 6 +-
html/functions_vars_0x62.html | 6 +-
html/functions_vars_0x63.html | 6 +-
html/functions_vars_0x64.html | 6 +-
html/functions_vars_0x65.html | 6 +-
html/functions_vars_0x66.html | 6 +-
html/functions_vars_0x67.html | 6 +-
html/functions_vars_0x69.html | 6 +-
html/functions_vars_0x6b.html | 6 +-
html/functions_vars_0x6c.html | 6 +-
html/functions_vars_0x6d.html | 6 +-
html/functions_vars_0x6e.html | 6 +-
html/functions_vars_0x6f.html | 6 +-
html/functions_vars_0x70.html | 6 +-
html/functions_vars_0x72.html | 6 +-
html/functions_vars_0x73.html | 6 +-
html/functions_vars_0x74.html | 6 +-
html/functions_vars_0x75.html | 6 +-
html/functions_vars_0x76.html | 6 +-
html/functions_vars_0x77.html | 6 +-
html/functions_vars_0x78.html | 6 +-
html/functions_vars_0x79.html | 6 +-
html/functions_vars_0x7a.html | 6 +-
html/getwcstab_8h.html | 6 +-
html/getwcstab_8h_source.html | 10 +-
html/globals.html | 6 +-
html/globals_0x62.html | 6 +-
html/globals_0x63.html | 6 +-
html/globals_0x64.html | 6 +-
html/globals_0x65.html | 6 +-
html/globals_0x66.html | 6 +-
html/globals_0x68.html | 6 +-
html/globals_0x69.html | 6 +-
html/globals_0x6b.html | 6 +-
html/globals_0x6c.html | 6 +-
html/globals_0x6d.html | 6 +-
html/globals_0x6e.html | 6 +-
html/globals_0x70.html | 6 +-
html/globals_0x71.html | 6 +-
html/globals_0x72.html | 6 +-
html/globals_0x73.html | 6 +-
html/globals_0x74.html | 6 +-
html/globals_0x75.html | 6 +-
html/globals_0x76.html | 6 +-
html/globals_0x77.html | 6 +-
html/globals_0x78.html | 6 +-
html/globals_0x7a.html | 6 +-
html/globals_defs.html | 6 +-
html/globals_enum.html | 6 +-
html/globals_eval.html | 6 +-
html/globals_func.html | 6 +-
html/globals_func_0x62.html | 6 +-
html/globals_func_0x63.html | 6 +-
html/globals_func_0x64.html | 6 +-
html/globals_func_0x65.html | 6 +-
html/globals_func_0x66.html | 6 +-
html/globals_func_0x68.html | 6 +-
html/globals_func_0x6c.html | 6 +-
html/globals_func_0x6d.html | 6 +-
html/globals_func_0x70.html | 6 +-
html/globals_func_0x71.html | 6 +-
html/globals_func_0x73.html | 6 +-
html/globals_func_0x74.html | 6 +-
html/globals_func_0x75.html | 6 +-
html/globals_func_0x76.html | 6 +-
html/globals_func_0x77.html | 6 +-
html/globals_func_0x78.html | 6 +-
html/globals_func_0x7a.html | 6 +-
html/globals_type.html | 6 +-
html/globals_vars.html | 6 +-
html/index.html | 12 +--
html/intro.html | 8 +-
html/lin_8h.html | 6 +-
html/lin_8h_source.html | 12 +--
html/log_8h.html | 6 +-
html/log_8h_source.html | 12 +--
html/memory.html | 8 +-
html/overview.html | 8 +-
html/pages.html | 6 +-
html/pgsbox.html | 8 +-
html/prj_8h.html | 6 +-
html/prj_8h_source.html | 12 +--
html/software.html | 8 +-
html/spc_8h.html | 6 +-
html/spc_8h_source.html | 12 +--
html/sph_8h.html | 6 +-
html/sph_8h_source.html | 12 +--
html/spx_8h.html | 6 +-
html/spx_8h_source.html | 12 +--
html/structcelprm.html | 6 +-
html/structfitskey.html | 6 +-
html/structfitskeyid.html | 6 +-
html/structlinprm.html | 6 +-
html/structprjprm.html | 6 +-
html/structpscard.html | 6 +-
html/structpvcard.html | 6 +-
html/structs.html | 8 +-
html/structspcprm.html | 6 +-
html/structspxprm.html | 6 +-
html/structtabprm.html | 6 +-
html/structwcserr.html | 6 +-
html/structwcsprm.html | 6 +-
html/structwtbarr.html | 6 +-
html/tab_8h.html | 6 +-
html/tab_8h_source.html | 12 +--
html/testing.html | 8 +-
html/threads.html | 10 +-
html/vector.html | 8 +-
html/wcs_8h.html | 6 +-
html/wcs_8h_source.html | 12 +--
html/wcserr_8h.html | 6 +-
html/wcserr_8h_source.html | 10 +-
html/wcsfix_8h.html | 6 +-
html/wcsfix_8h_source.html | 12 +--
html/wcshdr_8h.html | 6 +-
html/wcshdr_8h_source.html | 12 +--
html/wcslib_8h.html | 6 +-
html/wcslib_8h_source.html | 12 +--
html/wcsmath_8h.html | 6 +-
html/wcsmath_8h_source.html | 10 +-
html/wcsprintf_8h.html | 6 +-
html/wcsprintf_8h_source.html | 12 +--
html/wcstrig_8h.html | 6 +-
html/wcstrig_8h_source.html | 10 +-
html/wcsunits_8h.html | 6 +-
html/wcsunits_8h_source.html | 12 +--
html/wcsutil_8h.html | 6 +-
html/wcsutil_8h_source.html | 10 +-
makedefs.in | 8 +-
pgsbox/GNUmakefile | 6 +-
pgsbox/cpgsbox.c | 4 +-
pgsbox/cpgsbox.h | 4 +-
pgsbox/cpgtest.c | 4 +-
pgsbox/fscan.f | 4 +-
pgsbox/lngvel.f | 4 +-
pgsbox/pgcrfn.f | 4 +-
pgsbox/pgcrvl.f | 4 +-
pgsbox/pgsbox.f | 4 +-
pgsbox/pgtest.f | 4 +-
pgsbox/pgwcsl.c | 4 +-
pgsbox/pgwcsl.h | 4 +-
utils/GNUmakefile | 6 +-
utils/HPXcvt.1 | 2 +-
utils/HPXcvt.c | 4 +-
utils/fitshdr.1 | 2 +-
utils/fitshdr.c | 4 +-
utils/wcsgrid.1 | 2 +-
utils/wcsgrid.c | 4 +-
utils/wcsware.1 | 2 +-
utils/wcsware.c | 4 +-
wcsconfig.h.in | 4 +-
wcsconfig_f77.h.in | 4 +-
wcsconfig_tests.h.in | 4 +-
wcsconfig_utils.h.in | 4 +-
wcslib.pdf | Bin 861464 -> 862109 bytes
349 files changed, 1182 insertions(+), 997 deletions(-)
diff --cc debian/changelog
index 6ffd7a3,550a8fe..02dd9b8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,124 +1,131 @@@
- wcslib-contrib (4.20-1) unstable; urgency=low
++wcslib-contrib (4.22-1) unstable; urgency=low
+
- * New package. Closes: #742593
++ * New package containing the software that needs the non-free pgplot
++ package. Closes: #742593
+
- -- Ole Streicher <debian at liska.ath.cx> Sat, 05 Apr 2014 10:34:04 +0200
++ -- Ole Streicher <debian at liska.ath.cx> Sun, 13 Apr 2014 11:39:00 +0200
++
+ wcslib (4.22-1) unstable; urgency=low
+
+ * New upstream version
+ * Change maintainer and VCS location to debian-astro
+
+ -- Ole Streicher <debian at liska.ath.cx> Sun, 13 Apr 2014 11:32:15 +0200
+
+ wcslib (4.20-2) unstable; urgency=low
+
+ * [Colin Watson] Don't run dh_auto_clean if makedefs doesn't exist,
+ since that would end up running configure before autoreconf has been
+ run and thus fail on new ports. Closes: #733679
+
+ -- Ole Streicher <debian at liska.ath.cx> Wed, 01 Jan 2014 13:23:03 +0100
+
+ wcslib (4.20-1) unstable; urgency=low
+
+ * New upstream version.
+ * Push standard version to 3.9.5 (no changes)
+
+ -- Ole Streicher <debian at liska.ath.cx> Wed, 18 Dec 2013 12:01:46 +0100
+
+ wcslib (4.19-3) unstable; urgency=low
+
+ * update config.{sub,guess} for the AArch64 port.
+
+ -- Ole Streicher <debian at liska.ath.cx> Sat, 02 Nov 2013 16:41:15 +0100
+
+ wcslib (4.19-2) unstable; urgency=low
+
+ * Propagate CFLAGS and LDFLAGS to Fortran and test.
+
+ -- Ole Streicher <debian at liska.ath.cx> Tue, 01 Oct 2013 23:49:21 +0200
+
+ wcslib (4.19-1) unstable; urgency=low
+
+ * New upstream version. Closes: #715907
+
+ -- Ole Streicher <debian at liska.ath.cx> Tue, 01 Oct 2013 19:28:10 +0200
+
+ wcslib (4.18-1) unstable; urgency=low
+
+ * New upstream version
+ * Push standard version to 4.9.4 (no changes)
+
+ -- Ole Streicher <debian at liska.ath.cx> Sun, 21 Jul 2013 18:31:47 +0200
+
+ wcslib (4.17-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Tue, 29 Jan 2013 10:04:37 +0100
+
+ wcslib (4.16-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Wed, 07 Nov 2012 13:30:45 +0100
+
+ wcslib (4.15-11) unstable; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Thu, 27 Sep 2012 09:40:18 +0200
+
+ wcslib (4.14-1) unstable; urgency=low
+
+ * New upstream version
+ * Set Maintainers to Debian Science Maintainers
+ * Allow DM-Upload
+
+ -- Ole Streicher <debian at liska.ath.cx> Sun, 15 Jul 2012 16:50:00 +0200
+
+ wcslib (4.13.4-1) unstable; urgency=low
+
+ * New upstream version
+ * Multiarch support
+ * Remove PACKAGE_* defines from header file
+ * Increase tolerances of tspx tests, disable Fortran tests completely.
+ Closes: #663154
+
+ -- Ole Streicher <debian at liska.ath.cx> Mon, 28 Mar 2012 10:00:00 +0100
+
+ wcslib (4.13.1-1) unstable; urgency=low
+
+ * New upstream version
+ * Excplicitely link library with -lm
+
+ -- Ole Streicher <debian at liska.ath.cx> Thu, 15 Mar 2012 22:00:00 +0100
+
+ wcslib (4.12-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Sun, 04 Mar 2012 17:00:00 +0100
+
+ wcslib (4.11-1) unstable; urgency=low
+
+ * New upstream version
+ * Include upstream changelog and THANKS file
+
+ -- Ole Streicher <debian at liska.ath.cx> Thu, 23 Feb 2012 09:54:22 +0100
+
+ wcslib (4.10-1) unstable; urgency=low
+
+ * New upstream version
+ * Add wcslib.pc to dev package. Closes: #650602
+
+ -- Ole Streicher <debian at liska.ath.cx> Fri, 10 Feb 2012 16:33:25 +0100
+
+ wcslib (4.8.3-1) unstable; urgency=low
+
+ * New upstream version
+ * Fix "suggest" dependency for wcslib-doc
+ * Remove "help2man" build dependency
+ * Add format version information to copyright file
+
+ -- Ole Streicher <debian at liska.ath.cx> Mon, 21 Nov 2011 16:40:00 +0200
+
+ wcslib (4.8.2-1) unstable; urgency=low
+
+ * New package. Closes: #641624
+
+ -- Ole Streicher <debian at liska.ath.cx> Tue, 04 Oct 2011 11:15:00 +0200
diff --cc debian/control
index d3c27b0,0e089e4..e1ebd21
--- a/debian/control
+++ b/debian/control
@@@ -7,22 -7,27 +7,22 @@@ Build-Depends: autotools-dev
debhelper (>= 9),
dh-autoreconf,
gfortran,
- libcfitsio3-dev
+ libcfitsio3-dev,
+ libwcs4,
+ pgplot5
Standards-Version: 3.9.5
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/wcslib.git
- Vcs-Git: git://anonscm.debian.org/debian-science/packages/wcslib.git
+ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/wcslib.git
+ Vcs-Git: git://anonscm.debian.org/debian-astro/packages/wcslib.git
Homepage: http://www.atnf.csiro.au/people/mcalabre/WCS/
-Package: libwcs4
+Package: libpgsbox4
+Section: contrib/libs
Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: ${misc:Depends},
- ${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: Implementation of the FITS WCS standard
- WCSLIB is a C library, supplied with a full set of Fortran wrappers, that
- implements the "World Coordinate System" (WCS) standard in FITS (Flexible
- Image Transport System).
- .
- The FITS data format is widely used within the international astronomical
- community, from the radio to gamma-ray regimes, for data interchange and
- archive, and also increasingly as an online format.
+Depends: pgplot5, ${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.
.
This package contains what you need to run programs that use this
library.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/wcslib.git
More information about the debian-science-commits
mailing list