[Debian-astro-commits] [wcslib] 01/01: Merge branch 'debian' into debian-contrib

Ole Streicher olebole at moszumanska.debian.org
Mon May 9 01:57:32 UTC 2016


This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian-contrib
in repository wcslib.

commit 5a0bff16a98b8ab47ea7039dd16f983ce516d3a3
Merge: 8febf8f 7ffc5a6
Author: Ole Streicher <ole at aip.de>
Date:   Sun May 8 21:58:22 2016 -0300

    Merge branch 'debian' into debian-contrib

 C/GNUmakefile                                  |   4 +-
 C/cel.c                                        |   4 +-
 C/cel.h                                        |   6 +-
 C/dis.c                                        |   4 +-
 C/dis.h                                        |   6 +-
 C/fitshdr.h                                    |   6 +-
 C/fitshdr.l                                    |   4 +-
 C/flexed/fitshdr.c                             |   4 +-
 C/flexed/wcsbth.c                              |   4 +-
 C/flexed/wcspih.c                              |   4 +-
 C/flexed/wcsulex.c                             |   6 +-
 C/flexed/wcsutrn.c                             |   4 +-
 C/getwcstab.c                                  |   4 +-
 C/getwcstab.h                                  |   6 +-
 C/lin.c                                        |   4 +-
 C/lin.h                                        |   6 +-
 C/log.c                                        |   4 +-
 C/log.h                                        |   6 +-
 C/prj.c                                        |   4 +-
 C/prj.h                                        |   6 +-
 C/spc.c                                        |   4 +-
 C/spc.h                                        |   9 +-
 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/DSS.keyrec                              |   4 +-
 C/test/SIP.keyrec                              |   4 +-
 C/test/SIPTPV.keyrec                           |   4 +-
 C/test/TNX.keyrec                              |   4 +-
 C/test/TPV3.keyrec                             |   4 +-
 C/test/TPV5.keyrec                             |   4 +-
 C/test/TPV7.keyrec                             |   4 +-
 C/test/ZPX.keyrec                              |   4 +-
 C/test/bth.keyrec                              |   4 +-
 C/test/fitshdr.keyrec                          |   4 +-
 C/test/pih.keyrec                              |   4 +-
 C/test/tbth1.c                                 |   4 +-
 C/test/tcel1.c                                 |   4 +-
 C/test/tcel2.c                                 |   4 +-
 C/test/tdis1.c                                 |   4 +-
 C/test/tdis2.c                                 |   4 +-
 C/test/tdisiter.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/twcscompare.c                           |   4 +-
 C/test/twcsfix.c                               |   4 +-
 C/test/twcsfix.out                             |   4 +-
 C/test/twcshdr.c                               |   4 +-
 C/test/twcsmix.c                               |   4 +-
 C/test/twcssub.c                               |   4 +-
 C/test/twcstab.c                               |   4 +-
 C/test/wcslint.keyrec                          |   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                                     |   6 +-
 C/wcsfix.c                                     |  14 +-
 C/wcsfix.h                                     |   6 +-
 C/wcshdr.c                                     |   4 +-
 C/wcshdr.h                                     |   6 +-
 C/wcslib.h                                     |   6 +-
 C/wcsmath.h                                    |   6 +-
 C/wcspih.l                                     |   4 +-
 C/wcsprintf.c                                  |   4 +-
 C/wcsprintf.h                                  |   6 +-
 C/wcstrig.c                                    |   4 +-
 C/wcstrig.h                                    |   6 +-
 C/wcsulex.l                                    |   6 +-
 C/wcsunits.c                                   |   4 +-
 C/wcsunits.h                                   |   6 +-
 C/wcsutil.c                                    |   4 +-
 C/wcsutil.h                                    |   6 +-
 C/wcsutrn.l                                    |   4 +-
 CHANGES                                        |  14 +-
 Fortran/GNUmakefile                            |   6 +-
 Fortran/cel.inc                                |   4 +-
 Fortran/cel_data.f                             |   4 +-
 Fortran/cel_f.c                                |   4 +-
 Fortran/dis.inc                                |   4 +-
 Fortran/dis_data.f                             |   4 +-
 Fortran/dis_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/tdis1.f                           |   4 +-
 Fortran/test/tdis2.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                                        |  12 +-
 README                                         |   6 +-
 THANKS                                         |   2 +-
 VALIDATION                                     |  12 +-
 configure                                      |  24 +-
 configure.ac                                   |   6 +-
 debian/changelog                               |   8 +
 debian/control                                 |   8 +-
 debian/upstream/metadata                       |  13 +
 doxygen/Doxyfile                               |   2 +-
 doxygen/GNUmakefile                            |   4 +-
 doxygen/README                                 |   2 +-
 doxygen/doxextr.l                              |   4 +-
 doxygen/mainpage.dox                           |  10 +-
 flavours                                       |   2 +-
 html/annotated.html                            |   4 +-
 html/cel_8h.html                               |   4 +-
 html/cel_8h_source.html                        |  10 +-
 html/classes.html                              |   4 +-
 html/deprecated.html                           |   4 +-
 html/diagnostics.html                          |   6 +-
 html/dir_af99bb3c152a306abd27951285ad1127.html |   4 +-
 html/dis_8h.html                               |   4 +-
 html/dis_8h_source.html                        |  10 +-
 html/files.html                                |   4 +-
 html/fitshdr_8h.html                           |   4 +-
 html/fitshdr_8h_source.html                    |  10 +-
 html/fortran.html                              |   6 +-
 html/functions.html                            |   4 +-
 html/functions_b.html                          |   4 +-
 html/functions_c.html                          |   4 +-
 html/functions_d.html                          |   4 +-
 html/functions_e.html                          |   4 +-
 html/functions_f.html                          |   4 +-
 html/functions_g.html                          |   4 +-
 html/functions_i.html                          |   4 +-
 html/functions_j.html                          |   4 +-
 html/functions_k.html                          |   4 +-
 html/functions_l.html                          |   4 +-
 html/functions_m.html                          |   4 +-
 html/functions_n.html                          |   4 +-
 html/functions_o.html                          |   4 +-
 html/functions_p.html                          |   4 +-
 html/functions_r.html                          |   4 +-
 html/functions_s.html                          |   4 +-
 html/functions_t.html                          |   4 +-
 html/functions_u.html                          |   4 +-
 html/functions_v.html                          |   4 +-
 html/functions_vars.html                       |   4 +-
 html/functions_vars_b.html                     |   4 +-
 html/functions_vars_c.html                     |   4 +-
 html/functions_vars_d.html                     |   4 +-
 html/functions_vars_e.html                     |   4 +-
 html/functions_vars_f.html                     |   4 +-
 html/functions_vars_g.html                     |   4 +-
 html/functions_vars_i.html                     |   4 +-
 html/functions_vars_j.html                     |   4 +-
 html/functions_vars_k.html                     |   4 +-
 html/functions_vars_l.html                     |   4 +-
 html/functions_vars_m.html                     |   4 +-
 html/functions_vars_n.html                     |   4 +-
 html/functions_vars_o.html                     |   4 +-
 html/functions_vars_p.html                     |   4 +-
 html/functions_vars_r.html                     |   4 +-
 html/functions_vars_s.html                     |   4 +-
 html/functions_vars_t.html                     |   4 +-
 html/functions_vars_u.html                     |   4 +-
 html/functions_vars_v.html                     |   4 +-
 html/functions_vars_w.html                     |   4 +-
 html/functions_vars_x.html                     |   4 +-
 html/functions_vars_y.html                     |   4 +-
 html/functions_vars_z.html                     |   4 +-
 html/functions_w.html                          |   4 +-
 html/functions_x.html                          |   4 +-
 html/functions_y.html                          |   4 +-
 html/functions_z.html                          |   4 +-
 html/getwcstab_8h.html                         |   4 +-
 html/getwcstab_8h_source.html                  |  10 +-
 html/globals.html                              |   4 +-
 html/globals_b.html                            |   4 +-
 html/globals_c.html                            |   4 +-
 html/globals_d.html                            |   4 +-
 html/globals_defs.html                         |   4 +-
 html/globals_e.html                            |   4 +-
 html/globals_enum.html                         |   4 +-
 html/globals_eval.html                         |   4 +-
 html/globals_f.html                            |   4 +-
 html/globals_func.html                         |   4 +-
 html/globals_func_b.html                       |   4 +-
 html/globals_func_c.html                       |   4 +-
 html/globals_func_d.html                       |   4 +-
 html/globals_func_e.html                       |   4 +-
 html/globals_func_f.html                       |   4 +-
 html/globals_func_h.html                       |   4 +-
 html/globals_func_l.html                       |   4 +-
 html/globals_func_m.html                       |   4 +-
 html/globals_func_p.html                       |   4 +-
 html/globals_func_q.html                       |   4 +-
 html/globals_func_s.html                       |   4 +-
 html/globals_func_t.html                       |   4 +-
 html/globals_func_u.html                       |   4 +-
 html/globals_func_v.html                       |   4 +-
 html/globals_func_w.html                       |   4 +-
 html/globals_func_x.html                       |   4 +-
 html/globals_func_z.html                       |   4 +-
 html/globals_h.html                            |   4 +-
 html/globals_i.html                            |   4 +-
 html/globals_k.html                            |   4 +-
 html/globals_l.html                            |   4 +-
 html/globals_m.html                            |   4 +-
 html/globals_n.html                            |   4 +-
 html/globals_p.html                            |   4 +-
 html/globals_q.html                            |   4 +-
 html/globals_r.html                            |   4 +-
 html/globals_s.html                            |   4 +-
 html/globals_t.html                            |   4 +-
 html/globals_type.html                         |   4 +-
 html/globals_u.html                            |   4 +-
 html/globals_v.html                            |   4 +-
 html/globals_vars.html                         |   4 +-
 html/globals_w.html                            |   4 +-
 html/globals_x.html                            |   4 +-
 html/globals_z.html                            |   4 +-
 html/index.html                                |  12 +-
 html/intro.html                                |   6 +-
 html/lin_8h.html                               |   4 +-
 html/lin_8h_source.html                        |  10 +-
 html/log_8h.html                               |   4 +-
 html/log_8h_source.html                        |  10 +-
 html/memory.html                               |   6 +-
 html/overview.html                             |   6 +-
 html/pages.html                                |   4 +-
 html/pgsbox.html                               |   6 +-
 html/prj_8h.html                               |   4 +-
 html/prj_8h_source.html                        |  10 +-
 html/software.html                             |   6 +-
 html/spc_8h.html                               |   7 +-
 html/spc_8h_source.html                        | 547 +++++++++++++------------
 html/sph_8h.html                               |   4 +-
 html/sph_8h_source.html                        |  10 +-
 html/spx_8h.html                               |   4 +-
 html/spx_8h_source.html                        |  10 +-
 html/structcelprm.html                         |   4 +-
 html/structdisprm.html                         |   4 +-
 html/structdpkey.html                          |   4 +-
 html/structfitskey.html                        |   4 +-
 html/structfitskeyid.html                      |   4 +-
 html/structlinprm.html                         |   4 +-
 html/structprjprm.html                         |   4 +-
 html/structpscard.html                         |   4 +-
 html/structpvcard.html                         |   4 +-
 html/structs.html                              |   6 +-
 html/structspcprm.html                         |   4 +-
 html/structspxprm.html                         |   4 +-
 html/structtabprm.html                         |   4 +-
 html/structwcserr.html                         |   4 +-
 html/structwcsprm.html                         |   4 +-
 html/structwtbarr.html                         |   4 +-
 html/tab_8h.html                               |   4 +-
 html/tab_8h_source.html                        |  10 +-
 html/testing.html                              |   6 +-
 html/threads.html                              |   8 +-
 html/vector.html                               |   6 +-
 html/versioning.html                           |   8 +-
 html/wcs_8h.html                               |   4 +-
 html/wcs_8h_source.html                        |  12 +-
 html/wcserr_8h.html                            |   4 +-
 html/wcserr_8h_source.html                     |  10 +-
 html/wcsfix_8h.html                            |   4 +-
 html/wcsfix_8h_source.html                     |  10 +-
 html/wcshdr_8h.html                            |   4 +-
 html/wcshdr_8h_source.html                     |  10 +-
 html/wcslib_8h.html                            |   4 +-
 html/wcslib_8h_source.html                     |  10 +-
 html/wcsmath_8h.html                           |   4 +-
 html/wcsmath_8h_source.html                    |  10 +-
 html/wcsprintf_8h.html                         |   4 +-
 html/wcsprintf_8h_source.html                  |  10 +-
 html/wcstrig_8h.html                           |   4 +-
 html/wcstrig_8h_source.html                    |  10 +-
 html/wcsunits_8h.html                          |   4 +-
 html/wcsunits_8h_source.html                   |  10 +-
 html/wcsutil_8h.html                           |   4 +-
 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 1000794 -> 1000706 bytes
 379 files changed, 1197 insertions(+), 1145 deletions(-)

diff --cc debian/changelog
index d281559,c037150..d54e0f7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,12 +1,12 @@@
 -wcslib (5.15-1) unstable; urgency=low
++wcslib-contrib (5.15-1) unstable; urgency=low
+ 
+   * New upstream version
 -  * Update standards-version to 3.9.7 (no changes)
++  * Update standards-version to 3.9.8 (no changes)
+   * Update VCS fields, add d/u/metadata
+ 
+  -- Ole Streicher <olebole at debian.org>  Tue, 05 Apr 2016 15:24:21 +0200
+ 
 -wcslib (5.14-1) unstable; urgency=low
 +wcslib-contrib (5.14-1) unstable; urgency=low
  
    * New upstream version
  
diff --cc debian/control
index 18be67a,7f7b736..eab1903
--- a/debian/control
+++ b/debian/control
@@@ -1,29 -1,34 +1,29 @@@
 -Source: wcslib
 +Source: wcslib-contrib
- Maintainer: Debian Astronomy Maintainers <debian-astro-maintainers at lists.alioth.debian.org>
+ Maintainer: Debian Astronomy Team <debian-astro-maintainers at lists.alioth.debian.org>
  Uploaders: Ole Streicher <olebole at debian.org>
 -Section: science
 +Section: contrib/science
  Priority: optional
  Build-Depends: autotools-dev,
                 debhelper (>= 9),
                 dh-autoreconf,
  	       flex,
                 gfortran,
 -               libcfitsio-dev
 -Standards-Version: 3.9.7
 +               libcfitsio-dev,
 +               libwcs5,
 +               pgplot5
- Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/wcslib.git
- Vcs-Git: git://anonscm.debian.org/debian-astro/packages/wcslib.git
++Standards-Version: 3.9.8
+ Vcs-Browser: https://anonscm.debian.org/cgit/debian-astro/packages/wcslib.git
+ Vcs-Git: https://anonscm.debian.org/cgit/debian-astro/packages/wcslib.git
  Homepage: http://www.atnf.csiro.au/people/mcalabre/WCS/
  
 -Package: libwcs5
 +Package: libpgsbox5
 +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-astro-commits mailing list