[cpl-plugin-fors] 13/40: Adjust patches for 4.2.3

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-fors.

commit 0b94a51d8e546859401de3d15dc6555660689aac
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed May 8 14:33:14 2013 +0200

    Adjust patches for 4.2.3
---
 debian/changelog                           |    2 +-
 debian/patches/dont_build_sextractor.patch |    8 ++++----
 debian/patches/fix_format_security.patch   |   20 ++++++++++----------
 debian/patches/libadd_cpl.patch            |   17 +----------------
 4 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5111527..639d534 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cpl-plugin-fors (4.9.18-1) unstable; urgency=low
+cpl-plugin-fors (4.9.23-1) UNRELEASED; urgency=low
 
   * New package. Closes: #XXXXXXX
 
diff --git a/debian/patches/dont_build_sextractor.patch b/debian/patches/dont_build_sextractor.patch
index cca4fa8..23b817a 100644
--- a/debian/patches/dont_build_sextractor.patch
+++ b/debian/patches/dont_build_sextractor.patch
@@ -4,14 +4,14 @@
  DISTCLEANFILES = *~
  
  
--SUBDIRS = irplib sextractor fors recipes reflex
-+SUBDIRS = irplib fors recipes reflex
+-SUBDIRS = irplib sextractor mosca fors recipes reflex
++SUBDIRS = irplib mosca fors recipes reflex
  
  
  HTML_SUBDIRS = 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -111,8 +111,6 @@
+@@ -112,8 +112,6 @@
  
  FORS_SET_SEX_PREFIX
  
@@ -19,7 +19,7 @@
 -
  AC_CONFIG_FILES(Makefile
                  doxygen/Doxyfile
-                 irplib/Makefile
+                 mosca/Makefile
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -162,7 +162,7 @@
diff --git a/debian/patches/fix_format_security.patch b/debian/patches/fix_format_security.patch
index 53701fd..0fcdd35 100644
--- a/debian/patches/fix_format_security.patch
+++ b/debian/patches/fix_format_security.patch
@@ -161,7 +161,7 @@ Description: Fix format security errors
              if (rejection) {
 --- a/recipes/fors_calib.c
 +++ b/recipes/fors_calib.c
-@@ -2242,7 +2242,7 @@
+@@ -2082,7 +2082,7 @@
      slits = mos_locate_spectra(refmask);
  
      if (!slits) {
@@ -170,7 +170,7 @@ Description: Fix format security errors
          fors_calib_exit("No slits could be detected!");
      }
  
-@@ -3024,7 +3024,7 @@
+@@ -2712,7 +2712,7 @@
      cpl_table_delete(slits); slits = NULL;
  
      if (cpl_error_get_code()) {
@@ -181,7 +181,7 @@ Description: Fix format security errors
  
 --- a/recipes/fors_science.c
 +++ b/recipes/fors_science.c
-@@ -1695,7 +1695,7 @@
+@@ -1668,7 +1668,7 @@
                      cpl_msg_error(recipe, "The IDS coeff table is "
                      "incompatible with the input slit position table.");
                  }
@@ -190,7 +190,7 @@ Description: Fix format security errors
                  fors_science_exit(NULL);
              }
              cpl_msg_warning(recipe, "Alignment of the wavelength solution "
-@@ -2349,7 +2349,7 @@
+@@ -2314,7 +2314,7 @@
      cpl_propertylist_delete(header); header = NULL;
  
      if (cpl_error_get_code()) {
@@ -212,7 +212,7 @@ Description: Fix format security errors
      else 
 --- a/recipes/fors_detect_spectra.c
 +++ b/recipes/fors_detect_spectra.c
-@@ -771,7 +771,7 @@
+@@ -759,7 +759,7 @@
      slits = mos_locate_spectra(refmask);
  
      if (!slits) {
@@ -234,7 +234,7 @@ Description: Fix format security errors
  
 --- a/recipes/fors_pmos_calib.c
 +++ b/recipes/fors_pmos_calib.c
-@@ -1465,7 +1465,7 @@
+@@ -1467,7 +1467,7 @@
              slits = mos_locate_spectra(refmask);
  
              if (!slits) {
@@ -243,7 +243,7 @@ Description: Fix format security errors
                  fors_pmos_calib_exit("No slits could be detected!");
              }
  
-@@ -2330,7 +2330,7 @@
+@@ -2332,7 +2332,7 @@
      cpl_vector_delete(lines); lines = NULL;
  
      if (cpl_error_get_code()) {
@@ -254,7 +254,7 @@ Description: Fix format security errors
  
 --- a/recipes/fors_pmos_extract.c
 +++ b/recipes/fors_pmos_extract.c
-@@ -2761,7 +2761,7 @@
+@@ -2759,7 +2759,7 @@
      cpl_free(nobjs_per_slit);
  
      if (cpl_error_get_code()) {
@@ -265,7 +265,7 @@ Description: Fix format security errors
      else 
 --- a/recipes/fors_pmos_science.c
 +++ b/recipes/fors_pmos_science.c
-@@ -3359,7 +3359,7 @@
+@@ -3358,7 +3358,7 @@
      cpl_free(nobjs_per_slit);
  
      if (cpl_error_get_code()) {
@@ -276,7 +276,7 @@ Description: Fix format security errors
      else 
 --- a/recipes/fors_subtract_sky_lss.c
 +++ b/recipes/fors_subtract_sky_lss.c
-@@ -445,7 +445,7 @@
+@@ -434,7 +434,7 @@
      cpl_propertylist_delete(header); header = NULL;
  
      if (cpl_error_get_code()) {
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 872331d..dad8c8c 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -203,24 +203,9 @@ Description: Add the cpl libraries to the recips.so and the test program
 +fors_pmos_extract_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  fors_pmos_extract_la_LDFLAGS = -module -avoid-version
  fors_pmos_extract_la_DEPENDENCIES = $(LIBFORS)
---- a/fors/Makefile.am
-+++ b/fors/Makefile.am
-@@ -117,10 +117,10 @@
- noinst_PROGRAMS = create_stetson \
-                   create_phot
- 
--create_stetson_LDADD = $(LIBFORS)
-+create_stetson_LDADD = $(LIBFORS) $(LIBCPLUI) $(LIBCPLCORE)
- create_stetson_DEPENDENCIES = libfors.la
- 
--create_phot_LDADD = $(LIBFORS)
-+create_phot_LDADD = $(LIBFORS) $(LIBCPLUI) $(LIBCPLCORE)
- create_phot_DEPENDENCIES = libfors.la
- 
- clean-local:
 --- a/fors/tests/Makefile.am
 +++ b/fors/tests/Makefile.am
-@@ -39,12 +39,12 @@
+@@ -37,12 +37,12 @@
  # Convenience libraries
  LIBTEST = libtest.la
  libtest_la_SOURCES =  test.c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-fors.git