This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian-contrib
in repository wcslib.
commit 8c94f9ad9ee67e2bb69cd516dde406ec13f05b44
Merge: c37cec8 5acf947
Author: Ole Streicher <olebole at debian.org>
Date: Wed Jan 7 13:46:06 2015 +0100
Merge branch 'debian' into debian-contrib
Conflicts:
debian/changelog
C/GNUmakefile | 4 +-
C/cel.c | 6 +-
C/cel.h | 8 +-
C/fitshdr.h | 6 +-
C/fitshdr.l | 6 +-
C/flexed/fitshdr.c | 6 +-
C/flexed/wcsbth.c | 6 +-
C/flexed/wcspih.c | 6 +-
C/flexed/wcsulex.c | 6 +-
C/flexed/wcsutrn.c | 6 +-
C/getwcstab.c | 6 +-
C/getwcstab.h | 6 +-
C/lin.c | 6 +-
C/lin.h | 8 +-
C/log.c | 6 +-
C/log.h | 8 +-
C/prj.c | 6 +-
C/prj.h | 8 +-
C/spc.c | 6 +-
C/spc.h | 8 +-
C/sph.c | 6 +-
C/sph.h | 8 +-
C/spx.c | 6 +-
C/spx.h | 8 +-
C/tab.c | 6 +-
C/tab.h | 8 +-
C/test/bth.keyrec | 6 +-
C/test/pih.keyrec | 6 +-
C/test/tbth1.c | 6 +-
C/test/tbth1.out | 6 +-
C/test/tcel1.c | 6 +-
C/test/tcel2.c | 6 +-
C/test/tfitshdr.c | 6 +-
C/test/tlin.c | 6 +-
C/test/tlog.c | 6 +-
C/test/tofits.c | 6 +-
C/test/tpih1.c | 6 +-
C/test/tpih1.out | 2 +-
C/test/tpih2.c | 6 +-
C/test/tprj1.c | 6 +-
C/test/tprj2.c | 6 +-
C/test/tspc.c | 6 +-
C/test/tspcaips.c | 6 +-
C/test/tspcspxe.c | 6 +-
C/test/tspctrne.c | 6 +-
C/test/tsph.c | 6 +-
C/test/tsphdpa.c | 6 +-
C/test/tspx.c | 6 +-
C/test/ttab1.c | 6 +-
C/test/ttab2.c | 6 +-
C/test/ttab3.c | 6 +-
C/test/tunits.c | 6 +-
C/test/twcs.c | 6 +-
C/test/twcs_locale.c | 6 +-
C/test/twcscompare.c | 6 +-
C/test/twcsfix.c | 6 +-
C/test/twcsfix.out | 4 +-
C/test/twcshdr.c | 6 +-
C/test/twcsmix.c | 6 +-
C/test/twcssub.c | 6 +-
C/test/twcstab.c | 6 +-
C/test/twcstab.out | 4 +-
C/test/wcstab.keyrec | 6 +-
C/wcs.c | 50 +-
C/wcs.h | 8 +-
C/wcsbth.l | 6 +-
C/wcserr.c | 6 +-
C/wcserr.h | 6 +-
C/wcsfix.c | 6 +-
C/wcsfix.h | 8 +-
C/wcshdr.c | 6 +-
C/wcshdr.h | 8 +-
C/wcslib.h | 8 +-
C/wcsmath.h | 6 +-
C/wcspih.l | 6 +-
C/wcsprintf.c | 6 +-
C/wcsprintf.h | 8 +-
C/wcstrig.c | 6 +-
C/wcstrig.h | 10 +-
C/wcsulex.l | 6 +-
C/wcsunits.c | 6 +-
C/wcsunits.h | 8 +-
C/wcsutil.c | 6 +-
C/wcsutil.h | 6 +-
C/wcsutrn.l | 6 +-
CHANGES | 29 +-
Fortran/GNUmakefile | 6 +-
Fortran/cel.inc | 6 +-
Fortran/cel_data.f | 6 +-
Fortran/cel_f.c | 6 +-
Fortran/fitshdr.inc | 6 +-
Fortran/fitshdr_data.f | 6 +-
Fortran/fitshdr_f.c | 6 +-
Fortran/getwcstab.inc | 6 +-
Fortran/getwcstab_f.c | 6 +-
Fortran/lin.inc | 6 +-
Fortran/lin_data.f | 6 +-
Fortran/lin_f.c | 6 +-
Fortran/log.inc | 6 +-
Fortran/log_data.f | 6 +-
Fortran/log_f.c | 6 +-
Fortran/prj.inc | 6 +-
Fortran/prj_data.f | 6 +-
Fortran/prj_f.c | 6 +-
Fortran/spc.inc | 6 +-
Fortran/spc_data.f | 6 +-
Fortran/spc_f.c | 6 +-
Fortran/sph.inc | 6 +-
Fortran/sph_f.c | 6 +-
Fortran/spx.inc | 6 +-
Fortran/spx_data.f | 6 +-
Fortran/spx_f.c | 6 +-
Fortran/tab.inc | 6 +-
Fortran/tab_data.f | 6 +-
Fortran/tab_f.c | 6 +-
Fortran/test/tcel1.f | 6 +-
Fortran/test/tfitshdr.f | 6 +-
Fortran/test/tlin.f | 6 +-
Fortran/test/tlog.f | 6 +-
Fortran/test/tpih1.f | 6 +-
Fortran/test/tpih1.out | 2 +-
Fortran/test/tpih2.f | 6 +-
Fortran/test/tprj1.f | 6 +-
Fortran/test/tprj2.f | 6 +-
Fortran/test/tspc.f | 6 +-
Fortran/test/tsph.f | 6 +-
Fortran/test/tspx.f | 6 +-
Fortran/test/ttab1.f | 6 +-
Fortran/test/ttab2.f | 6 +-
Fortran/test/ttab3.f | 6 +-
Fortran/test/tunits.f | 6 +-
Fortran/test/twcs.f | 6 +-
Fortran/test/twcsfix.f | 6 +-
Fortran/test/twcsfix.out | 4 +-
Fortran/test/twcsmix.f | 6 +-
Fortran/test/twcssub.f | 6 +-
Fortran/test/twcstab.f | 6 +-
Fortran/test/twcstab.out | 4 +-
Fortran/wcs.inc | 6 +-
Fortran/wcs_data.f | 6 +-
Fortran/wcs_f.c | 6 +-
Fortran/wcserr.inc | 6 +-
Fortran/wcserr_f.c | 6 +-
Fortran/wcsfix.inc | 6 +-
Fortran/wcsfix_data.f | 6 +-
Fortran/wcsfix_f.c | 6 +-
Fortran/wcshdr.inc | 6 +-
Fortran/wcshdr_data.f | 6 +-
Fortran/wcshdr_f.c | 6 +-
Fortran/wcsmath.inc | 6 +-
Fortran/wcsunits.inc | 6 +-
Fortran/wcsunits_data.f | 6 +-
Fortran/wcsunits_f.c | 6 +-
GNUmakefile | 4 +-
INSTALL | 8 +-
README | 8 +-
THANKS | 2 +-
VALIDATION | 2 +-
configure | 24 +-
configure.ac | 11 +-
debian/changelog | 5 +-
doxygen/Doxyfile | 4 +-
doxygen/Doxyfile.bak | 1893 ---------
doxygen/GNUmakefile | 6 +-
doxygen/README | 2 +-
doxygen/doxextr.c | 4751 -----------------------
doxygen/doxextr.l | 6 +-
doxygen/mainpage.dox | 10 +-
flavours | 2 +-
html/annotated.html | 10 +-
html/{ftv2mlastnode.png => arrowdown.png} | Bin
html/{ftv2plastnode.png => arrowright.png} | Bin
html/cel_8h.html | 10 +-
html/cel_8h_source.html | 18 +-
html/classes.html | 10 +-
html/deprecated.html | 90 +-
html/diagnostics.html | 12 +-
html/dir_af99bb3c152a306abd27951285ad1127.html | 10 +-
html/{ftv2doc.png => doc.png} | Bin
html/doxygen.css | 19 +-
html/files.html | 10 +-
html/fitshdr_8h.html | 12 +-
html/fitshdr_8h_source.html | 16 +-
html/{ftv2folderclosed.png => folderclosed.png} | Bin
html/{ftv2folderopen.png => folderopen.png} | Bin
html/fortran.html | 12 +-
html/ftv2blank.png | Bin 86 -> 0 bytes
html/ftv2lastnode.png | Bin 86 -> 0 bytes
html/ftv2link.png | Bin 746 -> 0 bytes
html/ftv2mnode.png | Bin 246 -> 0 bytes
html/ftv2node.png | Bin 86 -> 0 bytes
html/ftv2pnode.png | Bin 229 -> 0 bytes
html/ftv2vertline.png | Bin 86 -> 0 bytes
html/functions.html | 10 +-
html/functions_b.html | 10 +-
html/functions_c.html | 10 +-
html/functions_d.html | 10 +-
html/functions_e.html | 10 +-
html/functions_f.html | 10 +-
html/functions_g.html | 10 +-
html/functions_i.html | 10 +-
html/functions_k.html | 10 +-
html/functions_l.html | 10 +-
html/functions_m.html | 10 +-
html/functions_n.html | 10 +-
html/functions_o.html | 10 +-
html/functions_p.html | 10 +-
html/functions_r.html | 10 +-
html/functions_s.html | 10 +-
html/functions_t.html | 10 +-
html/functions_u.html | 10 +-
html/functions_v.html | 10 +-
html/functions_vars.html | 10 +-
html/functions_vars_b.html | 10 +-
html/functions_vars_c.html | 10 +-
html/functions_vars_d.html | 10 +-
html/functions_vars_e.html | 10 +-
html/functions_vars_f.html | 10 +-
html/functions_vars_g.html | 10 +-
html/functions_vars_i.html | 10 +-
html/functions_vars_k.html | 10 +-
html/functions_vars_l.html | 10 +-
html/functions_vars_m.html | 10 +-
html/functions_vars_n.html | 10 +-
html/functions_vars_o.html | 10 +-
html/functions_vars_p.html | 10 +-
html/functions_vars_r.html | 10 +-
html/functions_vars_s.html | 10 +-
html/functions_vars_t.html | 10 +-
html/functions_vars_u.html | 10 +-
html/functions_vars_v.html | 10 +-
html/functions_vars_w.html | 10 +-
html/functions_vars_x.html | 10 +-
html/functions_vars_y.html | 10 +-
html/functions_vars_z.html | 10 +-
html/functions_w.html | 10 +-
html/functions_x.html | 10 +-
html/functions_y.html | 10 +-
html/functions_z.html | 10 +-
html/getwcstab_8h.html | 10 +-
html/getwcstab_8h_source.html | 16 +-
html/globals.html | 10 +-
html/globals_b.html | 10 +-
html/globals_c.html | 10 +-
html/globals_d.html | 10 +-
html/globals_defs.html | 10 +-
html/globals_e.html | 10 +-
html/globals_enum.html | 10 +-
html/globals_eval.html | 10 +-
html/globals_f.html | 10 +-
html/globals_func.html | 10 +-
html/globals_func_b.html | 10 +-
html/globals_func_c.html | 10 +-
html/globals_func_d.html | 10 +-
html/globals_func_e.html | 10 +-
html/globals_func_f.html | 10 +-
html/globals_func_h.html | 10 +-
html/globals_func_l.html | 10 +-
html/globals_func_m.html | 10 +-
html/globals_func_p.html | 10 +-
html/globals_func_q.html | 10 +-
html/globals_func_s.html | 10 +-
html/globals_func_t.html | 10 +-
html/globals_func_u.html | 10 +-
html/globals_func_v.html | 10 +-
html/globals_func_w.html | 10 +-
html/globals_func_x.html | 10 +-
html/globals_func_z.html | 10 +-
html/globals_h.html | 10 +-
html/globals_i.html | 10 +-
html/globals_k.html | 10 +-
html/globals_l.html | 10 +-
html/globals_m.html | 10 +-
html/globals_n.html | 10 +-
html/globals_p.html | 10 +-
html/globals_q.html | 10 +-
html/globals_r.html | 10 +-
html/globals_s.html | 10 +-
html/globals_t.html | 10 +-
html/globals_type.html | 10 +-
html/globals_u.html | 10 +-
html/globals_v.html | 10 +-
html/globals_vars.html | 10 +-
html/globals_w.html | 10 +-
html/globals_x.html | 10 +-
html/globals_z.html | 10 +-
html/index.html | 20 +-
html/intro.html | 12 +-
html/jquery.js | 57 +-
html/lin_8h.html | 10 +-
html/lin_8h_source.html | 18 +-
html/log_8h.html | 10 +-
html/log_8h_source.html | 18 +-
html/memory.html | 12 +-
html/nav_g.png | Bin 94 -> 95 bytes
html/overview.html | 12 +-
html/pages.html | 10 +-
html/pgsbox.html | 12 +-
html/prj_8h.html | 10 +-
html/prj_8h_source.html | 18 +-
html/software.html | 12 +-
html/spc_8h.html | 10 +-
html/spc_8h_source.html | 18 +-
html/sph_8h.html | 10 +-
html/sph_8h_source.html | 18 +-
html/{ftv2splitbar.png => splitbar.png} | Bin
html/spx_8h.html | 10 +-
html/spx_8h_source.html | 18 +-
html/structcelprm.html | 10 +-
html/structfitskey.html | 10 +-
html/structfitskeyid.html | 10 +-
html/structlinprm.html | 10 +-
html/structprjprm.html | 10 +-
html/structpscard.html | 10 +-
html/structpvcard.html | 10 +-
html/structs.html | 12 +-
html/structspcprm.html | 10 +-
html/structspxprm.html | 10 +-
html/structtabprm.html | 10 +-
html/structwcserr.html | 10 +-
html/structwcsprm.html | 10 +-
html/structwtbarr.html | 10 +-
html/tab_8h.html | 10 +-
html/tab_8h_source.html | 18 +-
html/testing.html | 12 +-
html/threads.html | 14 +-
html/vector.html | 12 +-
html/wcs_8h.html | 12 +-
html/wcs_8h_source.html | 18 +-
html/wcserr_8h.html | 10 +-
html/wcserr_8h_source.html | 16 +-
html/wcsfix_8h.html | 10 +-
html/wcsfix_8h_source.html | 18 +-
html/wcshdr_8h.html | 10 +-
html/wcshdr_8h_source.html | 18 +-
html/wcslib_8h.html | 10 +-
html/wcslib_8h_source.html | 18 +-
html/wcsmath_8h.html | 10 +-
html/wcsmath_8h_source.html | 16 +-
html/wcsprintf_8h.html | 12 +-
html/wcsprintf_8h_source.html | 18 +-
html/wcstrig_8h.html | 12 +-
html/wcstrig_8h_source.html | 20 +-
html/wcsunits_8h.html | 10 +-
html/wcsunits_8h_source.html | 18 +-
html/wcsutil_8h.html | 10 +-
html/wcsutil_8h_source.html | 16 +-
makedefs.in | 8 +-
pgsbox/GNUmakefile | 6 +-
pgsbox/cpgsbox.c | 6 +-
pgsbox/cpgsbox.h | 6 +-
pgsbox/cpgtest.c | 6 +-
pgsbox/fscan.f | 6 +-
pgsbox/lngvel.f | 6 +-
pgsbox/pgcrfn.f | 6 +-
pgsbox/pgcrvl.f | 4 +-
pgsbox/pgsbox.f | 6 +-
pgsbox/pgtest.f | 6 +-
pgsbox/pgwcsl.c | 6 +-
pgsbox/pgwcsl.h | 6 +-
utils/GNUmakefile | 6 +-
utils/HPXcvt.1 | 2 +-
utils/HPXcvt.c | 6 +-
utils/fitshdr.1 | 2 +-
utils/fitshdr.c | 6 +-
utils/wcsgrid.1 | 2 +-
utils/wcsgrid.c | 6 +-
utils/wcsware.1 | 2 +-
utils/wcsware.c | 6 +-
wcsconfig.h.in | 4 +-
wcsconfig_f77.h.in | 4 +-
wcsconfig_tests.h.in | 4 +-
wcsconfig_utils.h.in | 4 +-
wcslib.pdf | Bin 833198 -> 987836 bytes
374 files changed, 1651 insertions(+), 8188 deletions(-)
diff --cc debian/changelog
index 115163b,0f1012a..c356c8a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,13 +1,14 @@@
- wcslib-contrib (4.24-2) UNRELEASED; urgency=low
-wcslib (4.25.1-1~exp1) experimental; urgency=low
++wcslib-contrib (4.25.1-1~exp1) experimental; urgency=low
+ * New upstream version
+ * Update standards version to 3.9.6. No changes needed.
- -- Ole Streicher <olebole at debian.org> Thu, 25 Sep 2014 12:27:46 +0200
+ -- Ole Streicher <olebole at debian.org> Tue, 06 Jan 2015 13:30:52 +0100
-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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/wcslib.git