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

Fri Dec 9 15:55:14 UTC 2011

The following commit has been merged in the master branch:
commit 96486b002f0ef67e3a11c3a5ad2e42b9cbe9e3cd
Author: Ole Streicher <github at liska.ath.cx>
Date:   Fri Dec 9 12:07:26 2011 +0100

    Update patches to 2.6.8 source.
    Add renaming of executable in Makefile

diff --git a/debian/patches/have_malloc.patch b/debian/patches/have_malloc.patch
index 4bf5889..9bccd42 100644
--- a/debian/patches/have_malloc.patch
+++ b/debian/patches/have_malloc.patch
@@ -1,5 +1,5 @@
---- sextractor-2.4.4.orig/src/misc.c
-+++ sextractor-2.4.4/src/misc.c
+--- a/src/misc.c
++++ b/src/misc.c
 @@ -18,6 +18,8 @@
  #include        "config.h"
  #endif
diff --git a/debian/patches/have_mmap.patch b/debian/patches/have_mmap.patch
index ba1ec30..273b6a5 100644
--- a/debian/patches/have_mmap.patch
+++ b/debian/patches/have_mmap.patch
@@ -1,6 +1,6 @@
---- sextractor-2.4.4.orig/src/fits/fitsbody.c
-+++ sextractor-2.4.4/src/fits/fitsbody.c
-@@ -52,9 +52,12 @@
+--- a/src/fits/fitsbody.c
++++ b/src/fits/fitsbody.c
+@@ -51,9 +51,12 @@
   ***/
  PIXTYPE	*alloc_body(tabstruct *tab, void (*func)(PIXTYPE *ptr, int npix))
    {
@@ -14,7 +14,7 @@
  
    if (!body_ramflag)
      {
-@@ -75,7 +78,9 @@
+@@ -74,7 +77,9 @@
  /* Decide if the data will go in physical memory or on swap-space */
    npix = tab->tabsize/tab->bytepix;
    size = npix*sizeof(PIXTYPE);
@@ -24,7 +24,7 @@
      {
  /*-- There should be enough RAM left: try to do a malloc() */
      if ((tab->bodybuf = malloc(size)))
-@@ -93,6 +98,7 @@
+@@ -92,6 +97,7 @@
        tab->bodybuf = NULL;
      }
  
@@ -32,7 +32,7 @@
    if (size < body_vramleft)
      {
  /*-- Convert and copy the data to a swap file, and mmap() it */
-@@ -132,6 +138,7 @@
+@@ -131,6 +137,7 @@
        return NULL;
      return (PIXTYPE *)tab->bodybuf;
      }
@@ -40,7 +40,7 @@
  
  /* If no memory left at all: forget it! */
    return NULL;
-@@ -158,8 +165,10 @@
+@@ -157,8 +164,10 @@
      size = (tab->tabsize/tab->bytepix)*sizeof(PIXTYPE);
      if (tab->swapflag)
        {
diff --git a/debian/patches/rename_sex.patch b/debian/patches/rename_executable.patch
similarity index 61%
rename from debian/patches/rename_sex.patch
rename to debian/patches/rename_executable.patch
index ba69a15..c7e38c2 100644
--- a/debian/patches/rename_sex.patch
+++ b/debian/patches/rename_executable.patch
@@ -1,5 +1,5 @@
---- sextractor-2.4.4.orig/man/sex.1.in
-+++ sextractor-2.4.4/man/sex.1.in
+--- 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"
@@ -60,14 +60,38 @@
  .B http://terapix.iap.fr/soft/sextractor
 +; on Debian systems, it is also installed to
 +/usr/share/doc/sextractor/.
---- sextractor-2.4.4.orig/src/define.h
-+++ sextractor-2.4.4/src/define.h
-@@ -23,7 +23,7 @@
- /*------------------------ what, who, when and where ------------------------*/
+--- a/src/define.h
++++ b/src/define.h
+@@ -25,7 +25,7 @@
  
  #define		BANNER		"SExtractor"
--#define         EXECUTABLE      "sex"
-+#define         EXECUTABLE      "sextractor"
  #define		MYVERSION	VERSION
- #define		COPYRIGHT	"Emmanuel BERTIN (bertin at iap.fr)"
- #define		WEBSITE		"http://terapix.iap.fr/soft/sextractor"
+-#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"
+--- 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
+-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
+ 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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4d96c53
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+sigbus.patch
+have_malloc.patch
+have_mmap.patch
+win32.patch
+rename_executable.patch
diff --git a/debian/patches/sigbus.patch b/debian/patches/sigbus.patch
index 216be8b..a3b5d14 100644
--- a/debian/patches/sigbus.patch
+++ b/debian/patches/sigbus.patch
@@ -1,6 +1,6 @@
---- sextractor-2.4.4.orig/src/fits/fitscleanup.c
-+++ sextractor-2.4.4/src/fits/fitscleanup.c
-@@ -156,7 +156,9 @@
+--- a/src/fits/fitscleanup.c
++++ b/src/fits/fitscleanup.c
+@@ -151,7 +151,9 @@
  /* Catch CTRL-Cs */
    signal(SIGINT, signal_function);
  /* Catch bus errors */
@@ -10,7 +10,7 @@
  /* Catch segmentation faults */
    signal(SIGSEGV, signal_function);
  /* Catch floating exceptions */
-@@ -187,9 +189,11 @@
+@@ -182,9 +184,11 @@
      case SIGINT:
        fprintf(stderr, "^C\n");
        exit(-1);
diff --git a/debian/patches/win32.patch b/debian/patches/win32.patch
index fcfdbb0..1441c8f 100644
--- a/debian/patches/win32.patch
+++ b/debian/patches/win32.patch
@@ -1,18 +1,17 @@
---- sextractor-2.4.4.orig/src/wcs/wcs.c
-+++ sextractor-2.4.4/src/wcs/wcs.c
-@@ -378,6 +378,10 @@
- *   $Id: wcs.c,v 1.1.1.1 2002/03/15 16:33:26 bertin Exp $
- *===========================================================================*/
- 
+--- 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"
- #endif
---- sextractor-2.4.4.orig/src/readimage.c
-+++ sextractor-2.4.4/src/readimage.c
+ #include        "config.h"
+--- a/src/readimage.c
++++ b/src/readimage.c
 @@ -14,6 +14,10 @@
  *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  */
@@ -24,15 +23,16 @@
  #ifdef HAVE_CONFIG_H
  #include        "config.h"
  #endif
---- sextractor-2.4.4.orig/src/astrom.c
-+++ sextractor-2.4.4/src/astrom.c
-@@ -13,6 +13,9 @@
- *
- *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- */
+--- 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"
+ #include	"config.h"
+ #endif

-- 
Source extractor for astronomical images

