[wcslib] 01/01: Merge branch 'debian' into debian-contrib
Ole Streicher
olebole at moszumanska.debian.org
Thu Sep 18 20:32:50 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian-contrib
in repository wcslib.
commit 6ddb37a6133d43b0b06857830110036096d6fd2d
Merge: 4ede028 42c6772
Author: Ole Streicher <olebole at debian.org>
Date: Thu Sep 18 22:20:59 2014 +0200
Merge branch 'debian' into debian-contrib
Conflicts:
debian/changelog
debian/control
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 | 4 +-
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 | 11 +-
C/tab.h | 15 +-
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/twcscompare.c | 16 +-
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 | 47 +-
C/wcs.h | 15 +-
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 | 25 +-
C/wcsutil.h | 16 +-
C/wcsutrn.l | 4 +-
CHANGES | 22 +-
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 | 15 +-
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 | 2 +-
configure | 14553 +++++++------------
configure.ac | 8 +-
debian/changelog | 8 +
debian/control | 4 +-
debian/copyright | 2 +-
doxygen/Doxyfile | 2310 +--
doxygen/{Doxyfile => Doxyfile.bak} | 2 +-
doxygen/GNUmakefile | 4 +-
doxygen/README | 2 +-
doxygen/doxextr.c | 4751 ++++++
doxygen/doxextr.l | 4 +-
doxygen/mainpage.dox | 21 +-
flavours | 2 +-
html/annotated.html | 39 +-
html/cel_8h.html | 75 +-
html/cel_8h_source.html | 128 +-
html/classes.html | 27 +-
html/deprecated.html | 13 +-
html/diagnostics.html | 27 +-
html/dir_af99bb3c152a306abd27951285ad1127.html | 13 +-
html/doxygen.css | 272 +-
html/dynsections.js | 54 +-
html/files.html | 53 +-
html/fitshdr_8h.html | 66 +-
html/fitshdr_8h_source.html | 124 +-
html/fortran.html | 15 +-
html/ftv2cl.png | Bin 453 -> 0 bytes
html/ftv2mo.png | Bin 403 -> 0 bytes
html/ftv2ns.png | Bin 388 -> 0 bytes
html/functions.html | 57 +-
html/{functions_0x62.html => functions_b.html} | 57 +-
html/{functions_0x63.html => functions_c.html} | 59 +-
html/{functions_0x64.html => functions_d.html} | 57 +-
html/{functions_0x65.html => functions_e.html} | 63 +-
html/{functions_0x66.html => functions_f.html} | 67 +-
html/{functions_0x67.html => functions_g.html} | 57 +-
html/{functions_0x69.html => functions_i.html} | 59 +-
html/{functions_0x6b.html => functions_k.html} | 57 +-
html/{functions_0x6c.html => functions_l.html} | 57 +-
html/{functions_0x6d.html => functions_m.html} | 75 +-
html/{functions_0x6e.html => functions_n.html} | 57 +-
html/{functions_0x6f.html => functions_o.html} | 57 +-
html/{functions_0x70.html => functions_p.html} | 65 +-
html/{functions_0x72.html => functions_r.html} | 57 +-
html/{functions_0x73.html => functions_s.html} | 61 +-
html/{functions_0x74.html => functions_t.html} | 57 +-
html/{functions_0x75.html => functions_u.html} | 57 +-
html/{functions_0x76.html => functions_v.html} | 61 +-
html/functions_vars.html | 57 +-
...ctions_vars_0x62.html => functions_vars_b.html} | 57 +-
...ctions_vars_0x63.html => functions_vars_c.html} | 59 +-
...ctions_vars_0x64.html => functions_vars_d.html} | 57 +-
...ctions_vars_0x65.html => functions_vars_e.html} | 63 +-
...ctions_vars_0x66.html => functions_vars_f.html} | 67 +-
...ctions_vars_0x67.html => functions_vars_g.html} | 57 +-
...ctions_vars_0x69.html => functions_vars_i.html} | 59 +-
...ctions_vars_0x6b.html => functions_vars_k.html} | 57 +-
...ctions_vars_0x6c.html => functions_vars_l.html} | 57 +-
...ctions_vars_0x6d.html => functions_vars_m.html} | 75 +-
...ctions_vars_0x6e.html => functions_vars_n.html} | 57 +-
...ctions_vars_0x6f.html => functions_vars_o.html} | 57 +-
...ctions_vars_0x70.html => functions_vars_p.html} | 65 +-
...ctions_vars_0x72.html => functions_vars_r.html} | 57 +-
...ctions_vars_0x73.html => functions_vars_s.html} | 61 +-
...ctions_vars_0x74.html => functions_vars_t.html} | 57 +-
...ctions_vars_0x75.html => functions_vars_u.html} | 57 +-
...ctions_vars_0x76.html => functions_vars_v.html} | 61 +-
...ctions_vars_0x77.html => functions_vars_w.html} | 57 +-
...ctions_vars_0x78.html => functions_vars_x.html} | 57 +-
...ctions_vars_0x79.html => functions_vars_y.html} | 57 +-
...ctions_vars_0x7a.html => functions_vars_z.html} | 57 +-
html/{functions_0x77.html => functions_w.html} | 57 +-
html/{functions_0x78.html => functions_x.html} | 57 +-
html/{functions_0x79.html => functions_y.html} | 57 +-
html/{functions_0x7a.html => functions_z.html} | 57 +-
html/getwcstab_8h.html | 29 +-
html/getwcstab_8h_source.html | 68 +-
html/globals.html | 55 +-
html/{globals_0x62.html => globals_b.html} | 55 +-
html/{globals_0x63.html => globals_c.html} | 55 +-
html/{globals_0x64.html => globals_d.html} | 55 +-
html/globals_defs.html | 15 +-
html/{globals_0x65.html => globals_e.html} | 55 +-
html/globals_enum.html | 13 +-
html/globals_eval.html | 15 +-
html/{globals_0x66.html => globals_f.html} | 55 +-
html/globals_func.html | 47 +-
...{globals_func_0x62.html => globals_func_b.html} | 47 +-
...{globals_func_0x63.html => globals_func_c.html} | 47 +-
...{globals_func_0x64.html => globals_func_d.html} | 47 +-
...{globals_func_0x65.html => globals_func_e.html} | 47 +-
...{globals_func_0x66.html => globals_func_f.html} | 47 +-
...{globals_func_0x68.html => globals_func_h.html} | 47 +-
...{globals_func_0x6c.html => globals_func_l.html} | 47 +-
...{globals_func_0x6d.html => globals_func_m.html} | 47 +-
...{globals_func_0x70.html => globals_func_p.html} | 47 +-
...{globals_func_0x71.html => globals_func_q.html} | 47 +-
...{globals_func_0x73.html => globals_func_s.html} | 47 +-
...{globals_func_0x74.html => globals_func_t.html} | 49 +-
...{globals_func_0x75.html => globals_func_u.html} | 47 +-
...{globals_func_0x76.html => globals_func_v.html} | 47 +-
...{globals_func_0x77.html => globals_func_w.html} | 51 +-
...{globals_func_0x78.html => globals_func_x.html} | 47 +-
...{globals_func_0x7a.html => globals_func_z.html} | 47 +-
html/{globals_0x68.html => globals_h.html} | 55 +-
html/{globals_0x69.html => globals_i.html} | 55 +-
html/{globals_0x6b.html => globals_k.html} | 55 +-
html/{globals_0x6c.html => globals_l.html} | 55 +-
html/{globals_0x6d.html => globals_m.html} | 55 +-
html/{globals_0x6e.html => globals_n.html} | 55 +-
html/{globals_0x70.html => globals_p.html} | 55 +-
html/{globals_0x71.html => globals_q.html} | 55 +-
html/{globals_0x72.html => globals_r.html} | 55 +-
html/{globals_0x73.html => globals_s.html} | 55 +-
html/{globals_0x74.html => globals_t.html} | 57 +-
html/globals_type.html | 13 +-
html/{globals_0x75.html => globals_u.html} | 55 +-
html/{globals_0x76.html => globals_v.html} | 55 +-
html/globals_vars.html | 13 +-
html/{globals_0x77.html => globals_w.html} | 59 +-
html/{globals_0x78.html => globals_x.html} | 55 +-
html/{globals_0x7a.html => globals_z.html} | 55 +-
html/index.html | 19 +-
html/intro.html | 15 +-
html/lin_8h.html | 69 +-
html/lin_8h_source.html | 144 +-
html/log_8h.html | 43 +-
html/log_8h_source.html | 58 +-
html/memory.html | 15 +-
html/overview.html | 37 +-
html/pages.html | 15 +-
html/pgsbox.html | 15 +-
html/prj_8h.html | 458 +-
html/prj_8h_source.html | 460 +-
html/software.html | 30 +-
html/spc_8h.html | 113 +-
html/spc_8h_source.html | 171 +-
html/sph_8h.html | 40 +-
html/sph_8h_source.html | 43 +-
html/spx_8h.html | 163 +-
html/spx_8h_source.html | 201 +-
html/structcelprm.html | 16 +-
html/structfitskey.html | 39 +-
html/structfitskeyid.html | 13 +-
html/structlinprm.html | 25 +-
html/structprjprm.html | 18 +-
html/structpscard.html | 13 +-
html/structpvcard.html | 13 +-
html/structs.html | 15 +-
html/structspcprm.html | 26 +-
html/structspxprm.html | 13 +-
html/structtabprm.html | 25 +-
html/structwcserr.html | 13 +-
html/structwcsprm.html | 57 +-
html/structwtbarr.html | 16 +-
html/tab_8h.html | 104 +-
html/tab_8h_source.html | 828 +-
html/testing.html | 57 +-
html/threads.html | 17 +-
html/vector.html | 35 +-
html/wcs_8h.html | 221 +-
html/wcs_8h_source.html | 2611 ++--
html/wcserr_8h.html | 54 +-
html/wcserr_8h_source.html | 74 +-
html/wcsfix_8h.html | 104 +-
html/wcsfix_8h_source.html | 132 +-
html/wcshdr_8h.html | 214 +-
html/wcshdr_8h_source.html | 146 +-
html/wcslib_8h.html | 49 +-
html/wcslib_8h_source.html | 141 +-
html/wcsmath_8h.html | 23 +-
html/wcsmath_8h_source.html | 75 +-
html/wcsprintf_8h.html | 42 +-
html/wcsprintf_8h_source.html | 47 +-
html/wcstrig_8h.html | 49 +-
html/wcstrig_8h_source.html | 92 +-
html/wcsunits_8h.html | 206 +-
html/wcsunits_8h_source.html | 143 +-
html/wcsutil_8h.html | 96 +-
html/wcsutil_8h_source.html | 433 +-
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 869871 -> 833198 bytes
358 files changed, 19835 insertions(+), 16992 deletions(-)
diff --cc debian/changelog
index 74b9391,72dbc5b..482c2c6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,12 +1,12 @@@
-wcslib (4.24-1) unstable; urgency=low
++wcslib-contrib (4.24-1) unstable; urgency=low
+
+ * New upstream version
- * build-depend on libcfitsio-dev instead of libcfitsio3-dev. Closes: #761721
++ * Build-depend on libcfitsio-dev instead of libcfitsio3-dev
+ * Update uploader e-mail
+
+ -- Ole Streicher <olebole at debian.org> Thu, 18 Sep 2014 22:12:03 +0200
+
-wcslib (4.23-1) unstable; urgency=low
+wcslib-contrib (4.23-1) unstable; urgency=low
* New upstream version
diff --cc debian/control
index e1ebd21,37a5c09..adc1e50
--- a/debian/control
+++ b/debian/control
@@@ -1,15 -1,13 +1,15 @@@
-Source: wcslib
+Source: wcslib-contrib
Maintainer: Debian Astronomy Maintainers <debian-astro-maintainers at lists.alioth.debian.org>
- Uploaders: Ole Streicher <debian at liska.ath.cx>
+ Uploaders: Ole Streicher <olebole at debian.org>
-Section: science
+Section: contrib/science
Priority: optional
Build-Depends: autotools-dev,
debhelper (>= 9),
dh-autoreconf,
gfortran,
- libcfitsio3-dev,
- libcfitsio-dev
++ libcfitsio-dev,
+ libwcs4,
+ pgplot5
Standards-Version: 3.9.5
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/wcslib.git
Vcs-Git: git://anonscm.debian.org/debian-astro/packages/wcslib.git
--
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