Skip to content
GitLab
Commit 22d448ee authored by Ole Streicher's avatar Ole Streicher
Browse files

Rediff patches 

Drop Use-correct-source-extractor-program-name-instead-of-sex.patch: <REASON>
parent 75763e28
Hide whitespace changes
Inline Side-by-side
debian/patches/Add-SONAME-to-libastrometry.so.patch
View file @ 22d448ee
......@@ -3,14 +3,14 @@ Date: Thu, 1 Dec 2016 21:18:56 +0100
Subject: Add SONAME to libastrometry.so
---
blind/Makefile | 7 ++++---
solver/Makefile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/blind/Makefile b/blind/Makefile
index b500716..4004a58 100644
--- a/blind/Makefile
+++ b/blind/Makefile
@@ -152,7 +152,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
diff --git a/solver/Makefile b/solver/Makefile
index 5e1bd09..2b9f0ac 100644
--- a/solver/Makefile
+++ b/solver/Makefile
@@ -128,7 +128,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
$(RANLIB) $@
$(ENGINE_SO): $(ENGINE_OBJS) $(SLIB)
......@@ -19,8 +19,8 @@ index b500716..4004a58 100644
+ ln -s $@.0 $@
# old and miscellaneous executables that aren't part of the pipeline.
OLDEXECS := plotquads rawstartree checkquads
@@ -236,8 +237,8 @@ install: $(INSTALL_EXECS) $(INSTALL_LIB)
OLDEXECS := checkquads
@@ -199,8 +200,8 @@ install: $(INSTALL_EXECS) $(INSTALL_LIB)
done
$(MKDIR) '$(LIB_INSTALL_DIR)'
@for x in $(INSTALL_LIB); do \
......
debian/patches/Call-python-scripts-as-modules-instead-of-executables.patch
View file @ 22d448ee
......@@ -6,14 +6,14 @@ In Debian, the python scripts are not installed in /usr/bin, but are
only accessible as modules. Therefore, we need to replace the direct
call of the script by "python -m astrometry.$(MODULE)".
---
blind/augment-xylist.c | 12 +++++++++---
util/image2pnm.py | 2 +-
solver/augment-xylist.c | 12 +++++++++---
util/image2pnm.py | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/blind/augment-xylist.c b/blind/augment-xylist.c
index 997b28c..0da65dd 100644
--- a/blind/augment-xylist.c
+++ b/blind/augment-xylist.c
diff --git a/solver/augment-xylist.c b/solver/augment-xylist.c
index 2b2458b..14c125b 100644
--- a/solver/augment-xylist.c
+++ b/solver/augment-xylist.c
@@ -727,7 +727,9 @@ int augment_xylist(augment_xylist_t* axy,
sl_append_nocopy(tempfiles, pnmfn);
}
......
debian/patches/Don-t-copy-demo-files-to-examples.patch
View file @ 22d448ee
......@@ -7,10 +7,10 @@ Subject: Don't copy demo files to examples
1 file changed, 1 deletion(-)
diff --git a/Makefile b/Makefile
index 8b7bba3..d6f3c94 100644
index c9a5d04..8230e44 100644
--- a/Makefile
+++ b/Makefile
@@ -152,7 +152,6 @@ install-core:
@@ -157,7 +157,6 @@ install-core:
$(MKDIR) '$(MAN1_INSTALL_DIR)'
$(CP) __init__.py '$(PY_BASE_INSTALL_DIR)'
$(CP) CREDITS LICENSE README.md report.txt '$(DOC_INSTALL_DIR)'
......
debian/patches/Don-t-fail-on-rm-during-make-clean.patch
View file @ 22d448ee
......@@ -7,10 +7,10 @@ Subject: Don't fail during 'make clean'
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 3aaa6a6..8b7bba3 100644
index ea20f78..c9a5d04 100644
--- a/Makefile
+++ b/Makefile
@@ -339,9 +339,7 @@ clean:
@@ -345,9 +345,7 @@ clean:
$(MAKE) -C util clean
$(MAKE) -C catalogs clean
-$(MAKE) -C qfits-an clean
......@@ -19,5 +19,5 @@ index 3aaa6a6..8b7bba3 100644
- -rm gsl-an/config.h
+ -rm -f __init__.pyc
$(MAKE) -C libkd clean
$(MAKE) -C blind clean
$(MAKE) -C solver clean
$(MAKE) -C sdss clean
debian/patches/Dynamically-link-to-libastrometry.so-when-possible.patch
View file @ 22d448ee
......@@ -3,16 +3,30 @@ Date: Thu, 1 Dec 2016 21:18:56 +0100
Subject: Dynamically link to libastrometry.so, when possible
---
blind/Makefile | 10 ++++------
libkd/Makefile | 3 +--
util/Makefile | 8 +++-----
libkd/Makefile | 3 +--
solver/Makefile | 10 ++++------
util/Makefile | 8 +++-----
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/blind/Makefile b/blind/Makefile
index 4004a58..f1231c9 100644
--- a/blind/Makefile
+++ b/blind/Makefile
@@ -49,9 +49,7 @@ LDFLAGS := $(LDFLAGS_DEF)
diff --git a/libkd/Makefile b/libkd/Makefile
index f535986..0442518 100644
--- a/libkd/Makefile
+++ b/libkd/Makefile
@@ -90,8 +90,7 @@ py: pyspherematch
PYSPHEREMATCH_OBJ := pyspherematch.o
spherematch_c$(PYTHON_SO_EXT): pyspherematch.c setup.py $(SLIB)
- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" \
- SLIB="$(SLIB)" \
+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../solver -lastrometry" \
INC="$(INC)" \
CFLAGS="$(CFLAGS)" \
$(PYTHON) setup.py build_ext --inplace --force --build-temp .
diff --git a/solver/Makefile b/solver/Makefile
index 2b9f0ac..06d50b0 100644
--- a/solver/Makefile
+++ b/solver/Makefile
@@ -39,9 +39,7 @@ LDFLAGS := $(LDFLAGS_DEF)
LDLIBS := $(LDLIBS_DEF)
LDLIBS += $(ANFILES_LIB)
......@@ -21,9 +35,9 @@ index 4004a58..f1231c9 100644
-SLIB += $(ANFILES_SLIB)
+SLIB := $(ENGINE_SO)
CAIRO_SLIB := $(COMMON)/cairoutils.o
CAIRO_SLIB += $(SLIB)
@@ -135,7 +133,7 @@ ENGINE_OBJS += new-wcs.o fits-guess-scale.o cut-table.o \
CFLAGS += $(CFLAGS_DEF)
CFLAGS += $(CATS_INC)
@@ -116,7 +114,7 @@ ENGINE_OBJS += new-wcs.o fits-guess-scale.o cut-table.o \
resort-xylist.o
BUILD_INDEX_OBJS := build-index.o uniformize-catalog.o startree.o hpquads.o \
......@@ -32,7 +46,7 @@ index 4004a58..f1231c9 100644
unpermute-quads.o merge-index.o
ENGINE_OBJS += $(BUILD_INDEX_OBJS)
@@ -151,8 +149,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
@@ -127,8 +125,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
$(AR) rc $@ $(ENGINE_OBJS)
$(RANLIB) $@
......@@ -43,26 +57,12 @@ index 4004a58..f1231c9 100644
ln -s $@.0 $@
# old and miscellaneous executables that aren't part of the pipeline.
diff --git a/libkd/Makefile b/libkd/Makefile
index f535986..0442518 100644
--- a/libkd/Makefile
+++ b/libkd/Makefile
@@ -90,8 +90,7 @@ py: pyspherematch
PYSPHEREMATCH_OBJ := pyspherematch.o
spherematch_c$(PYTHON_SO_EXT): pyspherematch.c setup.py $(SLIB)
- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" \
- SLIB="$(SLIB)" \
+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../blind -lastrometry" \
INC="$(INC)" \
CFLAGS="$(CFLAGS)" \
$(PYTHON) setup.py build_ext --inplace --force --build-temp .
diff --git a/util/Makefile b/util/Makefile
index aeb4e8d..5cb374a 100644
index 34c4628..58ad2c7 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -51,8 +51,7 @@ ANFILES_OBJ += multiindex.o index.o indexset.o \
tabsort.o wcs-xy2rd.o wcs-rd2xy.o
@@ -55,8 +55,7 @@ ANFILES_OBJ += multiindex.o index.o indexset.o \
tabsort.o wcs-xy2rd.o wcs-rd2xy.o matchfile.o
ANFILES_DEPS += $(QFITS_LIB)
-ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o \
......@@ -71,7 +71,7 @@ index aeb4e8d..5cb374a 100644
ANUTILS_DEPS += $(QFITS_LIB)
endif
@@ -97,8 +96,7 @@ CFLAGS += -I.
@@ -101,8 +100,7 @@ CFLAGS += -I.
LDFLAGS += $(LDFLAGS_DEF)
......@@ -81,12 +81,12 @@ index aeb4e8d..5cb374a 100644
SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF)
@@ -162,7 +160,7 @@ an-pnmtofits: an-pnmtofits.o $(ANUTILS_SLIB)
@@ -166,7 +164,7 @@ an-pnmtofits: an-pnmtofits.o $(ANUTILS_SLIB)
ALL_OBJ += an-pnmtofits.o
_util$(PYTHON_SO_EXT): util.i lanczos.i $(ANFILES_SLIB)
- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" SLIB="$(ANFILES_SLIB)" \
+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../blind -lastrometry" \
+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../solver -lastrometry" \
INC="$(ANFILES_INC)" CFLAGS="$(CFLAGS)" \
$(PYTHON) setup.py build_ext -v --inplace --build-temp .
util.py: util.i lanczos.i
debian/patches/Fix-issues-when-using-Debian-libs-instead-of-convienience.patch
View file @ 22d448ee
......@@ -8,10 +8,10 @@ Subject: Fix issues when using Debian libs instead of convienience copies
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/Makefile b/util/Makefile
index 5cb374a..7c5facc 100644
index 58ad2c7..25c2f8c 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -96,7 +96,7 @@ CFLAGS += -I.
@@ -100,7 +100,7 @@ CFLAGS += -I.
LDFLAGS += $(LDFLAGS_DEF)
......
debian/patches/Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch
View file @ 22d448ee
......@@ -7,7 +7,7 @@ Subject: Fix shared lib flags so that the package can be built on s390x
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/util/makefile.common b/util/makefile.common
index b231685..a24d2b0 100644
index d87b750..7367c85 100644
--- a/util/makefile.common
+++ b/util/makefile.common
@@ -171,9 +171,8 @@ FLAGS_DEF += $(shell $(CCTEST))
......
debian/patches/Remove-errornous-generation-of-net-client.py.patch
View file @ 22d448ee
......@@ -7,12 +7,12 @@ Subject: Remove errornous generation of net/client.py
1 file changed, 7 deletions(-)
diff --git a/Makefile b/Makefile
index b182939..3aaa6a6 100644
index 6991d5f..ea20f78 100644
--- a/Makefile
+++ b/Makefile
@@ -160,13 +160,6 @@ install-core:
@@ -165,13 +165,6 @@ install-core:
$(MAKE) -C qfits-an install
$(MAKE) -C blind install
$(MAKE) -C solver install
$(MAKE) -C sdss install
- $(MKDIR) -p '$(PY_BASE_INSTALL_DIR)'/net/client
- @for x in net/client/client.py; do \
......
debian/patches/Use-correct-source-extractor-program-name-instead-of-sex.patch deleted 100644 → 0
View file @ 75763e28
From: Ole Streicher <olebole@debian.org>
Date: Thu, 1 Dec 2016 21:18:56 +0100
Subject: Use correct "source-extractor" program name instead of "sex"
---
blind/augment-xylist.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/blind/augment-xylist.c b/blind/augment-xylist.c
index 1b41b6b..997b28c 100644
--- a/blind/augment-xylist.c
+++ b/blind/augment-xylist.c
@@ -145,8 +145,8 @@ static an_option_t options[] = {
"Note that CATALOG_NAME and CATALOG_TYPE values will be over-ridden by command-line values. "
"This option implies --use-sextractor."},
{'*', "sextractor-path", required_argument, "filename",
- "use the given path to the SExtractor executable. Default: just 'sex', assumed to be in your PATH."
- " Note that you can give command-line args here too (but put them in quotes), eg: --sextractor-path 'sex -DETECT_TYPE CCD'. "
+ "use the given path to the SourceExtractor executable. Default: 'source-extractor', assumed to be in your PATH."
+ " Note that you can give command-line args here too (but put them in quotes), eg: --sextractor-path 'sextractor -DETECT_TYPE CCD'. "
"This option implies --use-sextractor."},
{'3', "ra", required_argument, "degrees or hh:mm:ss",
"only search in indexes within 'radius' of the field center given by 'ra' and 'dec'"},
@@ -868,7 +868,7 @@ int augment_xylist(augment_xylist_t* axy,
if (axy->sextractor_path)
sl_append(cmd, axy->sextractor_path);
else
- sl_append(cmd, "sex");
+ sl_append(cmd, "source-extractor");
if (axy->sextractor_config)
sl_appendf(cmd, "-c %s", axy->sextractor_config);
debian/patches/series
View file @ 22d448ee
Add-SONAME-to-libastrometry.so.patch
Use-correct-source-extractor-program-name-instead-of-sex.patch
Dynamically-link-to-libastrometry.so-when-possible.patch
Fix-issues-when-using-Debian-libs-instead-of-convienience.patch
Call-python-scripts-as-modules-instead-of-executables.patch
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment