[SCM] Source extractor for astronomical images branch, master, updated. be39fb13eb980e860672b5e0328addc994eab1d3

[Ole Streicher]

The following commit has been merged in the master branch:
commit 86cf8d8a721ec0442432a5fa2054873de9d5fd0e
Author: Ole Streicher <github at liska.ath.cx>
Date:   Fri Dec 9 16:29:42 2011 +0100

    Add Description to all patches; install config files

diff --git a/debian/patches/fix-manpage.patch b/debian/patches/fix-manpage.patch
index 02cac19..0b84c80 100644
--- a/debian/patches/fix-manpage.patch
+++ b/debian/patches/fix-manpage.patch
@@ -1,3 +1,5 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Correct sextractor manpage name and add a minimal ldactoasc manpage
 --- a/man/Makefile.am
 +++ b/man/Makefile.am
 @@ -1,3 +1,7 @@
diff --git a/debian/patches/have_malloc.patch b/debian/patches/have_malloc.patch
index 9bccd42..645e54d 100644
--- a/debian/patches/have_malloc.patch
+++ b/debian/patches/have_malloc.patch
@@ -1,3 +1,5 @@
+Author: Justin Pryzby <justinpryzby at users.sf.net>
+Description: (guess) Define rpl_malloc if not there.
 --- a/src/misc.c
 +++ b/src/misc.c
 @@ -18,6 +18,8 @@
diff --git a/debian/patches/have_mmap.patch b/debian/patches/have_mmap.patch
index 273b6a5..97989a8 100644
--- a/debian/patches/have_mmap.patch
+++ b/debian/patches/have_mmap.patch
@@ -1,3 +1,5 @@
+Author: Justin Pryzby <justinpryzby at users.sf.net>
+Description: (guess) Use mmap only if it exists.
 --- a/src/fits/fitsbody.c
 +++ b/src/fits/fitsbody.c
 @@ -51,9 +51,12 @@
diff --git a/debian/patches/install-configfiles.patch b/debian/patches/install-configfiles.patch
new file mode 100644
index 0000000..b238d94
--- /dev/null
+++ b/debian/patches/install-configfiles.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Install the configuration files under /usr/share/sextractor
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@
+ # Copyright (C) 2002-2009 Emmanuel Bertin.
+ AUTOMAKE_OPTIONS	= foreign no-dependencies
+ SUBDIRS			= man src tests
+-dist_pkgdata_DATA	= xsl/sextractor.xsl
++dist_pkgdata_DATA	= xsl/sextractor.xsl config/*
+ EXTRA_DIST		= config doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY \
+ 			  INSTALL README THANKS \
+ 			  acx_atlas.m4 acx_prog_cc_optim.m4 \
diff --git a/debian/patches/rename_executable.patch b/debian/patches/rename_executable.patch
index 7acf241..577e2c1 100644
--- a/debian/patches/rename_executable.patch
+++ b/debian/patches/rename_executable.patch
@@ -1,3 +1,6 @@
+Author: Justin Pryzby <justinpryzby at users.sf.net>
+Description: Don't use up a valuable 3-letter command-name with an
+ Priority: optional package
 --- a/man/sex.1.in
 +++ b/man/sex.1.in
 @@ -1,24 +1,26 @@
@@ -10,13 +13,15 @@
 -.B sex \fIimage\fR [\fI-c configuration-file\fR]
 +.B sextractor \fIimage\fR [\fI-c configuration-file\fR]
  .RS
- [\fI-parameter1 value1 -parameter2 value2 ...\fR]
+-[\fI-parameter1 value1 -parameter2 value2 ...\fR]
++[\fI-parameter1 value1 \-parameter2 value2 ...\fR]
  .RE
  .TP
 -.B sex \fIimage\_detect\fR \fIimage_measure\fR [\fI-c configuration-file\fR]
 +.B sextractor \fIimage\_detect\fR \fIimage_measure\fR [\fI-c configuration-file\fR]
  .RS
- [\fI-parameter1 value1 -parameter2 value2 ...\fR]
+-[\fI-parameter1 value1 -parameter2 value2 ...\fR]
++[\fI-parameter1 value1 \-parameter2 value2 ...\fR]
  .RE
  .TP
 -.B sex \fI-d\fR
@@ -33,7 +38,7 @@
  .SS "Operation modes:"
  .TP
  \fB\-h\fR, \fB\-\-help\fR
-@@ -29,6 +31,13 @@
+@@ -29,6 +31,13 @@ print version number, then exit
  .TP
  \fB\-d\fR, \fB\-\-dump\fR
  dump a default configuration file
@@ -42,12 +47,12 @@
 +For a minimal sextractor run, without customizing any of the
 +parameters, use
 +
-+\fBsextractor file.fits -c /usr/share/sextractor/default.sex -PARAMETERS_NAME /usr/share/sextractor/default.param -FILTER N
++\fBsextractor file.fits \-c /usr/share/sextractor/default.sex \-PARAMETERS_NAME /usr/share
 +
  .SH AUTHOR
  Written by Emmanuel Bertin (Institut d'Astrophysique de Paris and Observatoire de Paris).
  .PP
-@@ -38,10 +47,10 @@
+@@ -38,10 +47,10 @@ This is free software; see the source for copying conditions.  There is
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  .SH "REPORTING BUGS"
  Report bugs to <sextractor at iap.fr>.
diff --git a/debian/patches/series b/debian/patches/series
index 2521d44..b2728eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ have_mmap.patch
 win32.patch
 rename_executable.patch
 fix-manpage.patch
+install-configfiles.patch
diff --git a/debian/patches/sigbus.patch b/debian/patches/sigbus.patch
index a3b5d14..5337431 100644
--- a/debian/patches/sigbus.patch
+++ b/debian/patches/sigbus.patch
@@ -1,3 +1,5 @@
+Author: Justin Pryzby <justinpryzby at users.sf.net>
+Description: (guess) Handle the "sigbus" case only if it exists
 --- a/src/fits/fitscleanup.c
 +++ b/src/fits/fitscleanup.c
 @@ -151,7 +151,9 @@
diff --git a/debian/patches/win32.patch b/debian/patches/win32.patch
index 1441c8f..3f83133 100644
--- a/debian/patches/win32.patch
+++ b/debian/patches/win32.patch
@@ -1,3 +1,5 @@
+Author: Justin Pryzby <justinpryzby at users.sf.net>
+Description: (guess) Fix errors on win32
 --- a/src/astrom.c
 +++ b/src/astrom.c
 @@ -13,6 +13,9 @@

-- 
Source extractor for astronomical images