[Debian-astro-commits] [cpl-plugin-vimos] 04/05: Rediff patches

Ole Streicher olebole at moszumanska.debian.org
Fri Jul 8 07:45:42 UTC 2016 

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

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

commit 05d2eb37ea5fffac1c59c35e74ff66ed1c38fb85
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Jul 8 09:38:33 2016 +0200

    Rediff patches
---
 ...l-library-private-since-it-should-only-be.patch | 203 +--------------------
 ...tem-provided-sextractor-binary-instead-of.patch |   2 +-
 ...serial-tests-to-get-better-verbose-output.patch |   2 +-
 3 files changed, 5 insertions(+), 202 deletions(-)

diff --git a/debian/patches/0003-Make-the-pil-library-private-since-it-should-only-be.patch b/debian/patches/0003-Make-the-pil-library-private-since-it-should-only-be.patch
index c419b1a..d305f15 100644
--- a/debian/patches/0003-Make-the-pil-library-private-since-it-should-only-be.patch
+++ b/debian/patches/0003-Make-the-pil-library-private-since-it-should-only-be.patch
@@ -4,10 +4,9 @@ Subject: Make the "pil" library private since it should only be used by this
  pipeline.
 
 ---
- acinclude.m4        |   2 +-
- libpil/acinclude.m4 |   5 +++
- recipes/Makefile.am | 104 ++++++++++++++++++++++++++--------------------------
- 3 files changed, 58 insertions(+), 53 deletions(-)
+ acinclude.m4        | 2 +-
+ libpil/acinclude.m4 | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/acinclude.m4 b/acinclude.m4
 index b77de13..54e0d1f 100644
@@ -44,199 +43,3 @@ index fd64d9b..5f7ae2f 100644
 +    AC_SUBST(privatelibdir)
  
  ])
-diff --git a/recipes/Makefile.am b/recipes/Makefile.am
-index e0ef853..9dfd6bd 100644
---- a/recipes/Makefile.am
-+++ b/recipes/Makefile.am
-@@ -57,139 +57,139 @@ plugin_LTLIBRARIES = vmbias.la vmdark.la vmdet.la vmimcalphot.la \
- endif
- 
- vmbias_la_SOURCES = vmbias.cc
--vmbias_la_LIBADD = $(HDRL_LIBS) $(LIBMOSCA) $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmbias_la_LIBADD = $(HDRL_LIBS) $(LIBMOSCA) $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmbias_la_LDFLAGS = -module -avoid-version -no-undefined $(HDRL_LDFLAGS) $(CPL_LDFLAGS)
--vmbias_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmbias_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmdark_la_SOURCES = vmdark.c
--vmdark_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmdark_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmdark_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmdark_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmdark_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmifucalib_la_SOURCES = vmifucalib.c
--vmifucalib_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmifucalib_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmifucalib_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmifucalib_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmifucalib_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmifucombine_la_SOURCES = vmifucombine.c
--vmifucombine_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmifucombine_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmifucombine_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmifucombine_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmifucombine_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmifucombinecube_la_SOURCES = vmifucombinecube.cc
--vmifucombinecube_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmifucombinecube_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmifucombinecube_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmifucombinecube_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmifucombinecube_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmifuscience_la_SOURCES = vmifuscience.c
--vmifuscience_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmifuscience_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmifuscience_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmifuscience_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmifuscience_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmifustandard_la_SOURCES = vmifustandard.c
--vmifustandard_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmifustandard_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmifustandard_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmifustandard_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmifustandard_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmmosstandard_la_SOURCES = vmmosstandard.c
--vmmosstandard_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmmosstandard_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmosstandard_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmmosstandard_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmmosstandard_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmmoscombine_la_SOURCES = vmmoscombine.c
--vmmoscombine_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCFITSIO) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmmoscombine_la_LIBADD = $(LIBVIMOS)  $(LIBCFITSIO) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmoscombine_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmmoscombine_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmmoscombine_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmspphot_la_SOURCES = vmspphot.c
--vmspphot_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmspphot_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmspphot_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmspphot_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmspphot_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmdet_la_SOURCES = vmdet.c
--vmdet_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmdet_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmdet_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmdet_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmdet_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmimcalphot_la_SOURCES = vmimcalphot.c
--vmimcalphot_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmimcalphot_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimcalphot_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmimcalphot_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmimcalphot_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmimflatscreen_la_SOURCES = vmimflatscreen.c
--vmimflatscreen_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmimflatscreen_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimflatscreen_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmimflatscreen_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmimflatscreen_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmimflatsky_la_SOURCES = vmimflatsky.c
--vmimflatsky_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmimflatsky_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimflatsky_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmimflatsky_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmimflatsky_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmimobsjitter_la_SOURCES = vmimobsjitter.c
--vmimobsjitter_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmimobsjitter_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimobsjitter_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmimobsjitter_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmimobsjitter_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmimobsstare_la_SOURCES = vmimobsstare.c
--vmimobsstare_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmimobsstare_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimobsstare_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmimobsstare_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmimobsstare_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmimpreimaging_la_SOURCES = vmimpreimaging.c
--vmimpreimaging_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmimpreimaging_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimpreimaging_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmimpreimaging_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmimpreimaging_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmimstandard_la_SOURCES = vmimstandard.c
--vmimstandard_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmimstandard_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimstandard_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmimstandard_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmimstandard_la_DEPENDENCIES = $(LIBVIMOS)
- 
- if ONLINE_MODE
- vmmasktoccd_la_SOURCES = vmmasktoccd.c
- else
- vmmasktoccd_la_SOURCES =
- endif
--vmmasktoccd_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmmasktoccd_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmasktoccd_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmmasktoccd_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmmasktoccd_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmmosobsjitter_la_SOURCES = vmmosobsjitter.c
--vmmosobsjitter_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmmosobsjitter_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmosobsjitter_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmmosobsjitter_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmmosobsjitter_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmmosobsstare_la_SOURCES = vmmosobsstare.c
--vmmosobsstare_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmmosobsstare_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmosobsstare_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmmosobsstare_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmmosobsstare_la_DEPENDENCIES = $(LIBVIMOS)
- 
- if ONLINE_MODE
- vmskyccd_la_SOURCES = vmskyccd.c
- else
- vmskyccd_la_SOURCES =
- endif
--vmskyccd_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmskyccd_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmskyccd_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmskyccd_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmskyccd_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmspcaldisp_la_SOURCES = vmspcaldisp.c
--vmspcaldisp_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmspcaldisp_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmspcaldisp_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmspcaldisp_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmspcaldisp_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmspflat_la_SOURCES = vmspflat.c
--vmspflat_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmspflat_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmspflat_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
--vmspflat_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmspflat_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmmoscalib_la_SOURCES = vimos_calib.c
--vmmoscalib_la_LIBADD = $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmmoscalib_la_LIBADD = $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmoscalib_la_LDFLAGS = -module -avoid-version  -no-undefined $(CPL_LDFLAGS)
--vmmoscalib_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmmoscalib_la_DEPENDENCIES = $(LIBVIMOS)
- 
- vmmosscience_la_SOURCES = vimos_science.cc
--vmmosscience_la_LIBADD = $(HDRL_LIBS) $(LIBMOSCA) $(LIBVIMOS) $(LIBPIL) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
-+vmmosscience_la_LIBADD = $(HDRL_LIBS) $(LIBMOSCA) $(LIBVIMOS)  $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmosscience_la_LDFLAGS = -module -avoid-version -no-undefined $(HDRL_LDFLAGS) $(CPL_LDFLAGS)
--vmmosscience_la_DEPENDENCIES = $(LIBVIMOS) $(LIBPIL)
-+vmmosscience_la_DEPENDENCIES = $(LIBVIMOS)
diff --git a/debian/patches/0004-Use-the-system-provided-sextractor-binary-instead-of.patch b/debian/patches/0004-Use-the-system-provided-sextractor-binary-instead-of.patch
index 9b2485b..80d1ea8 100644
--- a/debian/patches/0004-Use-the-system-provided-sextractor-binary-instead-of.patch
+++ b/debian/patches/0004-Use-the-system-provided-sextractor-binary-instead-of.patch
@@ -23,7 +23,7 @@ index 54e0d1f..384360e 100644
      AC_DEFINE_UNQUOTED(VIMOS_SEXTRACTOR_PATH, "$sext_bindir",
                         [Absolute path to the sextractor executable])
 diff --git a/configure.ac b/configure.ac
-index c4e4a9a..8041047 100644
+index afdf0be..4283a89 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -127,7 +127,7 @@ VIMOS_SET_SEX_PREFIX
diff --git a/debian/patches/0006-Force-serial-tests-to-get-better-verbose-output.patch b/debian/patches/0006-Force-serial-tests-to-get-better-verbose-output.patch
index 48159fa..546d754 100644
--- a/debian/patches/0006-Force-serial-tests-to-get-better-verbose-output.patch
+++ b/debian/patches/0006-Force-serial-tests-to-get-better-verbose-output.patch
@@ -36,7 +36,7 @@ index 9c4b57b..08efcec 100644
  DISTCLEANFILES = *~
  
 diff --git a/regtests/tests/Makefile.am b/regtests/tests/Makefile.am
-index 5edc193..dbeccd8 100644
+index d5ae540..0213f37 100644
 --- a/regtests/tests/Makefile.am
 +++ b/regtests/tests/Makefile.am
 @@ -17,7 +17,7 @@

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

More information about the Debian-astro-commits mailing list