[cpl-plugin-vimos] 11/17: Merge branch 'upstream' into debian
Ole Streicher
olebole-guest at moszumanska.debian.org
Tue Dec 10 14:13:39 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository cpl-plugin-vimos.
commit 177b603ed4409f1e5f762bcd7f31abab835e4c38
Merge: 1a26e65 3afc02a
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Dec 10 14:18:32 2013 +0100
Merge branch 'upstream' into debian
Conflicts:
external/sextractor/source/wcs/cel.c
external/sextractor/source/wcs/lin.c
external/sextractor/source/wcs/proj.c
external/sextractor/source/wcs/sph.c
external/sextractor/source/wcs/tcel.c
external/sextractor/source/wcs/tlin.c
external/sextractor/source/wcs/tpgc.c
external/sextractor/source/wcs/wcs.c
external/sextractor/source/wcs/wcs_ori/Makefile
external/sextractor/source/wcs/wcs_ori/README
external/sextractor/source/wcs/wcs_ori/cel.c
external/sextractor/source/wcs/wcs_ori/lin.c
external/sextractor/source/wcs/wcs_ori/proj.c
external/sextractor/source/wcs/wcs_ori/sph.c
external/sextractor/source/wcs/wcs_ori/tcel.c
external/sextractor/source/wcs/wcs_ori/tlin.c
external/sextractor/source/wcs/wcs_ori/tpgc.c
external/sextractor/source/wcs/wcs_ori/tproj1.c
external/sextractor/source/wcs/wcs_ori/tproj2.c
external/sextractor/source/wcs/wcs_ori/tsph.c
external/sextractor/source/wcs/wcs_ori/twcs1.c
external/sextractor/source/wcs/wcs_ori/twcs2.c
external/sextractor/source/wcs/wcs_ori/wcs.c
external/sextractor/source/wcs/wcs_ori/wcstrig.c
external/sextractor/source/wcs/wcstrig.c
external/psfex/CHANGES | 38 -
external/psfex/HISTORY | 19 -
external/psfex/INSTALL | 8 -
external/psfex/Makefile.am | 46 -
external/psfex/Makefile.in | 733 -
external/psfex/README | 16 -
external/psfex/README.TOO | 12 -
external/psfex/acinclude.m4 | 99 -
external/psfex/aclocal.m4 | 1015 -
external/psfex/admin/config.guess | 1530 -
external/psfex/admin/config.sub | 1782 --
external/psfex/admin/install-sh | 527 -
external/psfex/admin/missing | 330 -
external/psfex/config/default.psfex | 24 -
external/psfex/config/sex.param | 9 -
external/psfex/configure | 5538 ----
external/psfex/configure.ac | 30 -
external/psfex/m4macros/eso.m4 | 902 -
external/psfex/source/Macrodefs. | 30 -
external/psfex/source/Macrodefs.aix | 11 -
external/psfex/source/Macrodefs.alpha | 11 -
external/psfex/source/Macrodefs.debug | 11 -
external/psfex/source/Macrodefs.gcc | 11 -
external/psfex/source/Macrodefs.hpux | 11 -
external/psfex/source/Macrodefs.insure | 11 -
external/psfex/source/Macrodefs.linux | 29 -
external/psfex/source/Macrodefs.linuxp2 | 11 -
external/psfex/source/Macrodefs.linuxpc | 11 -
external/psfex/source/Macrodefs.profile | 11 -
external/psfex/source/Macrodefs.purify | 11 -
external/psfex/source/Macrodefs.sgi | 11 -
external/psfex/source/Macrodefs.solaris | 11 -
external/psfex/source/Macrodefs.sunos | 11 -
external/psfex/source/Macrodefs.ultrix | 11 -
external/psfex/source/Makefile.am | 53 -
external/psfex/source/Makefile.in | 526 -
external/psfex/source/Makefile.orig | 23 -
external/psfex/source/basis.c | 83 -
external/psfex/source/check.c | 293 -
external/psfex/source/check.h | 25 -
external/psfex/source/define.h | 153 -
external/psfex/source/fft.c | 366 -
external/psfex/source/fft.h | 29 -
external/psfex/source/fitscat.c | 394 -
external/psfex/source/fitscat.h | 221 -
external/psfex/source/fitscat_defs.h | 138 -
external/psfex/source/fitsconv.c | 187 -
external/psfex/source/fitsfield.c | 240 -
external/psfex/source/fitshead.c | 723 -
external/psfex/source/fitshead.h | 171 -
external/psfex/source/fitskey.c | 951 -
external/psfex/source/fitsmisc.c | 102 -
external/psfex/source/fitsread.c | 260 -
external/psfex/source/fitstab.c | 616 -
external/psfex/source/fitsutil.c | 476 -
external/psfex/source/fitsutil.h | 49 -
external/psfex/source/fitswrite.c | 419 -
external/psfex/source/globals.h | 33 -
external/psfex/source/key.h | 43 -
external/psfex/source/main.c | 92 -
external/psfex/source/makeit.c | 133 -
external/psfex/source/misc.c | 143 -
external/psfex/source/pc.c | 532 -
external/psfex/source/poly.c | 343 -
external/psfex/source/poly.h | 47 -
external/psfex/source/prefs.c | 360 -
external/psfex/source/prefs.h | 86 -
external/psfex/source/psf.c | 991 -
external/psfex/source/psf.h | 90 -
external/psfex/source/random.c | 216 -
external/psfex/source/random.h | 33 -
external/psfex/source/sample.c | 792 -
external/psfex/source/sample.h | 75 -
external/psfex/source/types.h | 55 -
external/psfex/source/vignet.c | 311 -
external/psfex/source/vignet.h | 45 -
external/sextractor/CHANGES | 287 -
external/sextractor/HISTORY | 96 -
external/sextractor/INSTALL | 8 -
external/sextractor/Makefile.am | 46 -
external/sextractor/Makefile.in | 733 -
external/sextractor/README | 17 -
external/sextractor/README.TOO | 19 -
external/sextractor/acinclude.m4 | 95 -
external/sextractor/aclocal.m4 | 1015 -
external/sextractor/admin/config.guess | 1530 -
external/sextractor/admin/config.sub | 1782 --
external/sextractor/admin/install-sh | 527 -
external/sextractor/admin/missing | 330 -
external/sextractor/config/README | 29 -
external/sextractor/config/block_3x3.conv | 5 -
external/sextractor/config/default.conv | 5 -
external/sextractor/config/default.nnw | 28 -
external/sextractor/config/default.param | 124 -
external/sextractor/config/default.sex | 76 -
external/sextractor/config/gauss_1.5_3x3.conv | 5 -
external/sextractor/config/gauss_2.0_3x3.conv | 6 -
external/sextractor/config/gauss_2.0_5x5.conv | 7 -
external/sextractor/config/gauss_2.5_5x5.conv | 7 -
external/sextractor/config/gauss_3.0_5x5.conv | 7 -
external/sextractor/config/gauss_3.0_7x7.conv | 9 -
external/sextractor/config/gauss_4.0_7x7.conv | 9 -
external/sextractor/config/gauss_5.0_9x9.conv | 11 -
external/sextractor/config/mexhat_1.5_5x5.conv | 7 -
external/sextractor/config/mexhat_2.0_7x7.conv | 9 -
external/sextractor/config/mexhat_2.5_7x7.conv | 9 -
external/sextractor/config/mexhat_3.0_9x9.conv | 11 -
external/sextractor/config/mexhat_4.0_9x9.conv | 11 -
external/sextractor/config/mexhat_5.0_11x11.conv | 13 -
external/sextractor/config/tophat_1.5_3x3.conv | 5 -
external/sextractor/config/tophat_2.0_3x3.conv | 5 -
external/sextractor/config/tophat_2.5_3x3.conv | 5 -
external/sextractor/config/tophat_3.0_3x3.conv | 5 -
external/sextractor/config/tophat_4.0_5x5.conv | 7 -
external/sextractor/config/tophat_5.0_5x5.conv | 7 -
external/sextractor/configure | 5439 ----
external/sextractor/configure.ac | 31 -
external/sextractor/doc/README.DOC | 8 -
external/sextractor/doc/sex2_doc.ps | 32043 ---------------------
external/sextractor/m4macros/eso.m4 | 902 -
external/sextractor/source/Macrodefs. | 30 -
external/sextractor/source/Macrodefs.aix | 11 -
external/sextractor/source/Macrodefs.alpha | 11 -
external/sextractor/source/Macrodefs.debug | 11 -
external/sextractor/source/Macrodefs.gcc | 11 -
external/sextractor/source/Macrodefs.hpux | 11 -
external/sextractor/source/Macrodefs.insure | 11 -
external/sextractor/source/Macrodefs.linux | 29 -
external/sextractor/source/Macrodefs.linuxp2 | 11 -
external/sextractor/source/Macrodefs.linuxpc | 11 -
external/sextractor/source/Macrodefs.profile | 11 -
external/sextractor/source/Macrodefs.purify | 11 -
external/sextractor/source/Macrodefs.sgi | 11 -
external/sextractor/source/Macrodefs.solaris | 11 -
external/sextractor/source/Macrodefs.sunos | 11 -
external/sextractor/source/Macrodefs.ultrix | 11 -
external/sextractor/source/Makefile.am | 150 -
external/sextractor/source/Makefile.in | 755 -
external/sextractor/source/Makefile.orig | 157 -
external/sextractor/source/analyse.c | 657 -
external/sextractor/source/assoc.c | 362 -
external/sextractor/source/assoc.h | 41 -
external/sextractor/source/astrom.c | 633 -
external/sextractor/source/astrom.h | 63 -
external/sextractor/source/back.c | 1286 -
external/sextractor/source/back.h | 59 -
external/sextractor/source/bpro.c | 134 -
external/sextractor/source/bpro.h | 45 -
external/sextractor/source/catout.c | 479 -
external/sextractor/source/check.c | 454 -
external/sextractor/source/check.h | 41 -
external/sextractor/source/clean.c | 315 -
external/sextractor/source/clean.h | 36 -
external/sextractor/source/define.h | 211 -
external/sextractor/source/extract.c | 347 -
external/sextractor/source/extract.h | 50 -
external/sextractor/source/field.c | 174 -
external/sextractor/source/field.h | 27 -
external/sextractor/source/filter.c | 386 -
external/sextractor/source/filter.h | 47 -
external/sextractor/source/fitscat.c | 394 -
external/sextractor/source/fitscat.h | 222 -
external/sextractor/source/fitscat_defs.h | 138 -
external/sextractor/source/fitsconv.c | 187 -
external/sextractor/source/fitsfield.c | 240 -
external/sextractor/source/fitshead.c | 723 -
external/sextractor/source/fitshead.h | 171 -
external/sextractor/source/fitskey.c | 951 -
external/sextractor/source/fitsmisc.c | 102 -
external/sextractor/source/fitsread.c | 260 -
external/sextractor/source/fitstab.c | 616 -
external/sextractor/source/fitsutil.c | 476 -
external/sextractor/source/fitsutil.h | 49 -
external/sextractor/source/fitswrite.c | 419 -
external/sextractor/source/flag.c | 222 -
external/sextractor/source/flag.h | 25 -
external/sextractor/source/globals.h | 89 -
external/sextractor/source/graph.c | 154 -
external/sextractor/source/growth.c | 325 -
external/sextractor/source/growth.h | 36 -
external/sextractor/source/image.c | 638 -
external/sextractor/source/image.h | 42 -
external/sextractor/source/interpolate.c | 120 -
external/sextractor/source/interpolate.h | 24 -
external/sextractor/source/key.h | 42 -
external/sextractor/source/main.c | 100 -
external/sextractor/source/makeit.c | 366 -
external/sextractor/source/manobjlist.c | 108 -
external/sextractor/source/misc.c | 168 -
external/sextractor/source/neurro.c | 182 -
external/sextractor/source/neurro.h | 40 -
external/sextractor/source/param.h | 490 -
external/sextractor/source/pc.c | 470 -
external/sextractor/source/photom.c | 594 -
external/sextractor/source/photom.h | 38 -
external/sextractor/source/plist.c | 201 -
external/sextractor/source/plist.h | 49 -
external/sextractor/source/poly.c | 346 -
external/sextractor/source/poly.h | 47 -
external/sextractor/source/prefs.c | 508 -
external/sextractor/source/prefs.h | 177 -
external/sextractor/source/psf.c | 1159 -
external/sextractor/source/psf.h | 112 -
external/sextractor/source/readimage.c | 811 -
external/sextractor/source/refine.c | 334 -
external/sextractor/source/retina.c | 114 -
external/sextractor/source/retina.h | 35 -
external/sextractor/source/scan.c | 894 -
external/sextractor/source/sexchanges.log | 333 -
external/sextractor/source/sexhead.h | 111 -
external/sextractor/source/sexhead1.h | 131 -
external/sextractor/source/sexheadsc.h | 27 -
external/sextractor/source/som.c | 681 -
external/sextractor/source/som.h | 79 -
external/sextractor/source/types.h | 513 -
external/sextractor/source/wcs/Makefile.am | 44 -
external/sextractor/source/wcs/Makefile.in | 471 -
external/sextractor/source/wcs/Makefile.orig | 25 -
external/sextractor/source/wcs/README.SEX | 11 -
external/sextractor/source/wcs/cel.c | 567 -
external/sextractor/source/wcs/cel.h | 59 -
external/sextractor/source/wcs/lin.c | 423 -
external/sextractor/source/wcs/lin.h | 45 -
external/sextractor/source/wcs/proj.c | 3434 ---
external/sextractor/source/wcs/proj.h | 140 -
external/sextractor/source/wcs/sph.c | 222 -
external/sextractor/source/wcs/tcel.c | 313 -
external/sextractor/source/wcs/tlin.c | 123 -
external/sextractor/source/wcs/tpgc.c | 177 -
external/sextractor/source/wcs/wcs.c | 1083 -
external/sextractor/source/wcs/wcs.h | 80 -
external/sextractor/source/wcs/wcs_ori/Makefile | 254 -
external/sextractor/source/wcs/wcs_ori/README | 165 -
external/sextractor/source/wcs/wcs_ori/cel.c | 567 -
external/sextractor/source/wcs/wcs_ori/cel.h | 59 -
external/sextractor/source/wcs/wcs_ori/lin.c | 423 -
external/sextractor/source/wcs/wcs_ori/lin.h | 45 -
external/sextractor/source/wcs/wcs_ori/proj.c | 3434 ---
external/sextractor/source/wcs/wcs_ori/proj.h | 138 -
external/sextractor/source/wcs/wcs_ori/sph.c | 222 -
external/sextractor/source/wcs/wcs_ori/tcel.c | 313 -
external/sextractor/source/wcs/wcs_ori/tlin.c | 123 -
external/sextractor/source/wcs/wcs_ori/tpgc.c | 177 -
external/sextractor/source/wcs/wcs_ori/tproj1.c | 319 -
external/sextractor/source/wcs/wcs_ori/tproj2.c | 377 -
external/sextractor/source/wcs/wcs_ori/tsph.c | 133 -
external/sextractor/source/wcs/wcs_ori/twcs1.c | 317 -
external/sextractor/source/wcs/wcs_ori/twcs2.c | 764 -
external/sextractor/source/wcs/wcs_ori/wcs.c | 1081 -
external/sextractor/source/wcs/wcs_ori/wcs.h | 80 -
external/sextractor/source/wcs/wcs_ori/wcstrig.c | 183 -
external/sextractor/source/wcs/wcs_ori/wcstrig.h | 45 -
external/sextractor/source/wcs/wcstrig.c | 185 -
external/sextractor/source/wcs/wcstrig.h | 45 -
external/sextractor/source/weight.c | 121 -
external/sextractor/source/weight.h | 24 -
256 files changed, 108935 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-vimos.git
More information about the debian-science-commits
mailing list