[sextractor] 02/08: Adjust patched and changelog for new upstream version
Ole Streicher
olebole-guest at moszumanska.debian.org
Fri Mar 21 09:54:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository sextractor.
commit 1175c1b91ea6ca514a1e398eb6c295e6318abe87
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Mar 21 10:11:26 2014 +0100
Adjust patched and changelog for new upstream version
---
debian/changelog | 6 +++
debian/patches/fix-manpage.patch | 8 +--
debian/patches/have_malloc.patch | 8 +--
debian/patches/have_mmap.patch | 10 ++--
debian/patches/rename_executable.patch | 89 ++++++++++------------------------
debian/patches/series | 2 -
debian/patches/sigbus.patch | 4 +-
debian/patches/win32.patch | 40 ---------------
8 files changed, 47 insertions(+), 120 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bf99184..1ed8820 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sextractor (2.19.5+dfsg-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Ole Streicher <debian at liska.ath.cx> Fri, 21 Mar 2014 10:10:23 +0100
+
sextractor (2.8.6+dfsg-1) unstable; urgency=low
* Remove non-free documentation from source. Closes: #699275, #399759
diff --git a/debian/patches/fix-manpage.patch b/debian/patches/fix-manpage.patch
index 0b84c80..d99a63c 100644
--- a/debian/patches/fix-manpage.patch
+++ b/debian/patches/fix-manpage.patch
@@ -2,15 +2,17 @@ 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 @@
- # Manpage Makefile for SExtractor
- # Copyright (C) 2002 Emmanuel Bertin.
+@@ -26,5 +26,9 @@
+ #
+ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
-dist_man_MANS = sex.1 sex.x
+
+dist_man_MANS = sextractor.1 ldactoasc.1
+
+sextractor.1: sex.1
+ cp -f $< $@
+
--- /dev/null
+++ b/man/ldactoasc.1
@@ -0,0 +1,23 @@
diff --git a/debian/patches/have_malloc.patch b/debian/patches/have_malloc.patch
index 645e54d..dd10d4a 100644
--- a/debian/patches/have_malloc.patch
+++ b/debian/patches/have_malloc.patch
@@ -2,16 +2,16 @@ 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 @@
- #include "config.h"
- #endif
+@@ -34,6 +34,8 @@
+ #include <time.h>
+ #include <sys/time.h>
+#include <sys/types.h>
+
#include "define.h"
#include "globals.h"
-@@ -70,3 +72,18 @@
+@@ -153,3 +155,18 @@
}
diff --git a/debian/patches/have_mmap.patch b/debian/patches/have_mmap.patch
index 97989a8..1b65650 100644
--- a/debian/patches/have_mmap.patch
+++ b/debian/patches/have_mmap.patch
@@ -2,7 +2,7 @@ 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 @@
+@@ -64,9 +64,12 @@
***/
PIXTYPE *alloc_body(tabstruct *tab, void (*func)(PIXTYPE *ptr, int npix))
{
@@ -16,7 +16,7 @@ Description: (guess) Use mmap only if it exists.
if (!body_ramflag)
{
-@@ -74,7 +77,9 @@
+@@ -87,7 +90,9 @@
/* Decide if the data will go in physical memory or on swap-space */
npix = tab->tabsize/tab->bytepix;
size = npix*sizeof(PIXTYPE);
@@ -26,7 +26,7 @@ Description: (guess) Use mmap only if it exists.
{
/*-- There should be enough RAM left: try to do a malloc() */
if ((tab->bodybuf = malloc(size)))
-@@ -92,6 +97,7 @@
+@@ -105,6 +110,7 @@
tab->bodybuf = NULL;
}
@@ -34,7 +34,7 @@ Description: (guess) Use mmap only if it exists.
if (size < body_vramleft)
{
/*-- Convert and copy the data to a swap file, and mmap() it */
-@@ -131,6 +137,7 @@
+@@ -144,6 +150,7 @@
return NULL;
return (PIXTYPE *)tab->bodybuf;
}
@@ -42,7 +42,7 @@ Description: (guess) Use mmap only if it exists.
/* If no memory left at all: forget it! */
return NULL;
-@@ -157,8 +164,10 @@
+@@ -270,8 +277,10 @@
size = (tab->tabsize/tab->bytepix)*sizeof(PIXTYPE);
if (tab->swapflag)
{
diff --git a/debian/patches/rename_executable.patch b/debian/patches/rename_executable.patch
index 577e2c1..8860034 100644
--- a/debian/patches/rename_executable.patch
+++ b/debian/patches/rename_executable.patch
@@ -3,25 +3,22 @@ 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 @@
--.TH SEXTRACTOR "1" "@DATE3@" "SWarp @PACKAGE_VERSION@" "User Commands"
-+.TH SEXTRACTOR "1" "@DATE3@" "SExtractor @PACKAGE_VERSION@" "User Commands"
+@@ -1,18 +1,18 @@
+ .TH SEXTRACTOR "1" "@DATE3@" "SExtractor @PACKAGE_VERSION@" "User Commands"
.SH NAME
--sex \- extract a source catalog from an astronomical FITS image
-+sextractor \- extract a source catalog from an astronomical FITS image
+-sex \- extract a source catalogue from an astronomical FITS image
++sextractor \- extract a source catalogue from an astronomical FITS image
.SH SYNOPSIS
-.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
@@ -29,77 +26,41 @@ Description: Don't use up a valuable 3-letter command-name with an
.SH DESCRIPTION
SExtractor is a program that builds a catalogue of objects from an astronomical
image. Although it is particularly oriented towards reduction of large scale
- galaxy-survey data, it performs rather well on moderately crowded star fields.
- .RE
--See http://terapix.iap.fr/soft/sextractor for more details.
-+On Debian systems, sample SExtractor parameter files are installed to
-+/usr/share/sextractor.
-+.RE
- .SS "Operation modes:"
- .TP
- \fB\-h\fR, \fB\-\-help\fR
-@@ -29,6 +31,13 @@ print version number, then exit
- .TP
- \fB\-d\fR, \fB\-\-dump\fR
- dump a default configuration file
-+
-+.SH EXAMPLE
-+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
-+
- .SH AUTHOR
- Written by Emmanuel Bertin (Institut d'Astrophysique de Paris and Observatoire de Paris).
- .PP
-@@ -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>.
--.SH "SEE ALSO"
--.BR swarp (1)
- .PP
- The full documentation for
- .B SExtractor
- is maintained as a Postscript manual available at
- .B http://terapix.iap.fr/soft/sextractor
-+; on Debian systems, it is also installed to
-+/usr/share/doc/sextractor/.
--- a/src/define.h
+++ b/src/define.h
-@@ -25,7 +25,7 @@
+@@ -37,7 +37,7 @@
#define BANNER "SExtractor"
#define MYVERSION VERSION
-#define EXECUTABLE "sex"
+#define EXECUTABLE "sextractor"
- #define COPYRIGHT "Emmanuel BERTIN <bertin at iap.fr>"
- #define WEBSITE "http://astromatic.iap.fr/software/sextractor"
- #define INSTITUTE "IAP http://www.iap.fr"
+ #define COPYRIGHT "2012 IAP/CNRS/UPMC"
+ #define DISCLAIMER BANNER " comes with ABSOLUTELY NO WARRANTY\n" \
+ "You may redistribute copies of " BANNER "\n" \
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -1,9 +1,9 @@
- # Program Makefile for SEx
- # Copyright (C) 2004-2008 Emmanuel Bertin.
- SUBDIRS = fits levmar wcs
+@@ -34,9 +34,9 @@
+ LEVDIR = levmar
+ endif
+ SUBDIRS = fits $(LEVDIR) wcs
-bin_PROGRAMS = sex ldactoasc
-check_PROGRAMS = sex
-sex_SOURCES = analyse.c assoc.c astrom.c back.c bpro.c catout.c \
+bin_PROGRAMS = sextractor ldactoasc
+check_PROGRAMS = sextractor
+sextractor_SOURCES = analyse.c assoc.c astrom.c back.c bpro.c catout.c \
- check.c clean.c extract.c fft.c field.c filter.c \
- fitswcs.c flag.c graph.c growth.c image.c \
- interpolate.c main.c makeit.c manobjlist.c misc.c \
-@@ -18,7 +18,7 @@
- retina.h sexhead1.h sexhead.h sexheadsc.h som.h \
- threads.h types.h wcscelsys.h weight.h winpos.h xml.h
+ check.c clean.c extract.c $(FFTSOURCE) field.c \
+ filter.c fitswcs.c flag.c graph.c growth.c header.c \
+ image.c interpolate.c main.c makeit.c manobjlist.c \
+@@ -53,7 +53,7 @@
+ sexheadsc.h som.h threads.h types.h wcscelsys.h \
+ weight.h winpos.h xml.h
ldactoasc_SOURCES = ldactoasc.c ldactoasc.h
--sex_LDADD = $(top_builddir)/src/fits/libfits.a \
-+sextractor_LDADD = $(top_builddir)/src/fits/libfits.a \
- $(top_builddir)/src/wcs/libwcs_c.a \
- $(top_builddir)/src/levmar/liblevmar.a
- ldactoasc_LDADD = $(top_builddir)/src/fits/libfits.a
+-sex_LDADD = $(srcdir)/fits/libfits.a \
++sextractor_LDADD = $(srcdir)/fits/libfits.a \
+ $(srcdir)/wcs/libwcs_c.a \
+ $(LEVLIB)
+ ldactoasc_LDADD = $(srcdir)/fits/libfits.a
--- a/tests/efigi1.test
+++ b/tests/efigi1.test
@@ -1,4 +1,4 @@
diff --git a/debian/patches/series b/debian/patches/series
index b2728eb..c28e3b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
sigbus.patch
have_malloc.patch
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 5337431..2796f63 100644
--- a/debian/patches/sigbus.patch
+++ b/debian/patches/sigbus.patch
@@ -2,7 +2,7 @@ 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 @@
+@@ -164,7 +164,9 @@
/* Catch CTRL-Cs */
signal(SIGINT, signal_function);
/* Catch bus errors */
@@ -12,7 +12,7 @@ Description: (guess) Handle the "sigbus" case only if it exists
/* Catch segmentation faults */
signal(SIGSEGV, signal_function);
/* Catch floating exceptions */
-@@ -182,9 +184,11 @@
+@@ -195,9 +197,11 @@
case SIGINT:
fprintf(stderr, "^C\n");
exit(-1);
diff --git a/debian/patches/win32.patch b/debian/patches/win32.patch
deleted file mode 100644
index 3f83133..0000000
--- a/debian/patches/win32.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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 @@
- *
- *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- */
-+#ifdef _WIN32
-+#define _NO_OLDNAMES 1
-+#endif
-
- #ifdef HAVE_CONFIG_H
- #include "config.h"
---- a/src/readimage.c
-+++ b/src/readimage.c
-@@ -14,6 +14,10 @@
- *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- */
-
-+#ifdef _WIN32
-+#define _NO_OLDNAMES 1
-+#endif
-+
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
---- a/src/wcs/wcs.c
-+++ b/src/wcs/wcs.c
-@@ -378,6 +378,10 @@
- * $Id: wcs.c,v 1.1.1.1 2002/03/15 16:33:26 bertin Exp $
- *===========================================================================*/
-
-+#ifdef _WIN32
-+#define _NO_OLDNAMES 1
-+#endif
-+
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sextractor.git
More information about the debian-science-commits
mailing list