Rediff patches

debian/patches/Add-SONAME-to-libastrometry.so.patch

@@ -7,10 +7,10 @@ Subject: Add SONAME to libastrometry.so
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/solver/Makefile b/solver/Makefile
-index 5e1bd09..2b9f0ac 100644
+index 6870244..08f5e35 100644
 --- a/solver/Makefile
 +++ b/solver/Makefile
-@@ -128,7 +128,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
+@@ -134,7 +134,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
  	$(RANLIB) $@
  
  $(ENGINE_SO): $(ENGINE_OBJS) $(SLIB)
@@ -20,7 +20,7 @@ index 5e1bd09..2b9f0ac 100644
  
  # old and miscellaneous executables that aren't part of the pipeline.
  OLDEXECS := checkquads
-@@ -199,8 +200,8 @@ install: $(INSTALL_EXECS) $(INSTALL_LIB)
+@@ -205,8 +206,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

@@ -11,7 +11,7 @@ call of the script by "python -m astrometry.$(MODULE)".
  2 files changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/solver/augment-xylist.c b/solver/augment-xylist.c
-index 2b2458b..14c125b 100644
+index d742a4a..75c954a 100644
 --- a/solver/augment-xylist.c
 +++ b/solver/augment-xylist.c
 @@ -727,7 +727,9 @@ int augment_xylist(augment_xylist_t* axy,

debian/patches/Don-t-copy-demo-files-to-examples.patch

@@ -7,7 +7,7 @@ Subject: Don't copy demo files to examples
  1 file changed, 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index c9a5d04..8230e44 100644
+index 73de492..27a12c4 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -157,7 +157,6 @@ install-core:

debian/patches/Don-t-fail-on-rm-during-make-clean.patch

@@ -7,7 +7,7 @@ Subject: Don't fail during 'make clean'
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index ea20f78..c9a5d04 100644
+index da6ff80..73de492 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -345,9 +345,7 @@ clean:

debian/patches/Dynamically-link-to-libastrometry.so-when-possible.patch

@@ -9,7 +9,7 @@ Subject: Dynamically link to libastrometry.so, when possible
  3 files changed, 8 insertions(+), 13 deletions(-)
 
 diff --git a/libkd/Makefile b/libkd/Makefile
-index f535986..0442518 100644
+index f535986..2a41166 100644
 --- a/libkd/Makefile
 +++ b/libkd/Makefile
 @@ -90,8 +90,7 @@ py: pyspherematch
@@ -23,10 +23,10 @@ index f535986..0442518 100644
  	CFLAGS="$(CFLAGS)" \
  	$(PYTHON) setup.py build_ext --inplace --force --build-temp .
 diff --git a/solver/Makefile b/solver/Makefile
-index 2b9f0ac..06d50b0 100644
+index 08f5e35..cdc98cd 100644
 --- a/solver/Makefile
 +++ b/solver/Makefile
-@@ -39,9 +39,7 @@ LDFLAGS := $(LDFLAGS_DEF)
+@@ -45,9 +45,7 @@ LDFLAGS := $(LDFLAGS_DEF)
  LDLIBS := $(LDLIBS_DEF)
  LDLIBS += $(ANFILES_LIB)
  
@@ -37,7 +37,7 @@ index 2b9f0ac..06d50b0 100644
  
  CFLAGS += $(CFLAGS_DEF)
  CFLAGS += $(CATS_INC)
-@@ -116,7 +114,7 @@ ENGINE_OBJS += new-wcs.o fits-guess-scale.o cut-table.o \
+@@ -122,7 +120,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 \
@@ -46,7 +46,7 @@ index 2b9f0ac..06d50b0 100644
  	unpermute-quads.o merge-index.o 
  ENGINE_OBJS += $(BUILD_INDEX_OBJS)
  
-@@ -127,8 +125,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
+@@ -133,8 +131,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
  	$(AR) rc $@ $(ENGINE_OBJS)
  	$(RANLIB) $@
  
@@ -58,7 +58,7 @@ index 2b9f0ac..06d50b0 100644
  
  # old and miscellaneous executables that aren't part of the pipeline.
 diff --git a/util/Makefile b/util/Makefile
-index 34c4628..58ad2c7 100644
+index 32912cc..84cec1e 100644
 --- a/util/Makefile
 +++ b/util/Makefile
 @@ -55,8 +55,7 @@ ANFILES_OBJ += multiindex.o index.o indexset.o \

debian/patches/Fix-issues-when-using-Debian-libs-instead-of-convienience.patch

@@ -8,7 +8,7 @@ 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 58ad2c7..25c2f8c 100644
+index 84cec1e..8f940da 100644
 --- a/util/Makefile
 +++ b/util/Makefile
 @@ -100,7 +100,7 @@ CFLAGS += -I.

debian/patches/Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch

@@ -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 d87b750..7367c85 100644
+index 3fe2cc1..8ae19d6 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

@@ -7,7 +7,7 @@ Subject: Remove errornous generation of net/client.py
  1 file changed, 7 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 6991d5f..ea20f78 100644
+index cd9badd..da6ff80 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -165,13 +165,6 @@ install-core: