Rediff patches

debian/patches/Call-python-scripts-as-modules-instead-of-executables.patch

@@ -11,10 +11,10 @@ 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 d742a4a..75c954a 100644
+index b5dbe91..6eda20f 100644
 --- a/solver/augment-xylist.c
 +++ b/solver/augment-xylist.c
-@@ -727,7 +727,9 @@ int augment_xylist(augment_xylist_t* axy,
+@@ -728,7 +728,9 @@ int augment_xylist(augment_xylist_t* axy,
                  sl_append_nocopy(tempfiles, pnmfn);
              }
  
@@ -25,7 +25,7 @@ index d742a4a..75c954a 100644
              if (axy->extension) {
                  sl_append(cmd, "--extension");
                  sl_appendf(cmd, "%i", axy->extension);
-@@ -1052,7 +1054,9 @@ int augment_xylist(augment_xylist_t* axy,
+@@ -1053,7 +1055,9 @@ int augment_xylist(augment_xylist_t* axy,
          }
          logverb("Removing lines of (spurious) sources from xylist \"%s\", writing to \"%s\"\n",
                  xylsfn, nolinesfn);
@@ -36,7 +36,7 @@ index d742a4a..75c954a 100644
          if (axy->xcol)
              sl_appendf(cmd, "-X %s", axy->xcol);
          if (axy->ycol)
-@@ -1111,7 +1115,9 @@ int augment_xylist(augment_xylist_t* axy,
+@@ -1112,7 +1116,9 @@ int augment_xylist(augment_xylist_t* axy,
              unixylsfn = create_temp_file("uniform", axy->tempdir);
              sl_append_nocopy(tempfiles, unixylsfn);
          }

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 73de492..27a12c4 100644
+index a54fcff..e258119 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 da6ff80..73de492 100644
+index 2e00d91..a54fcff 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -345,9 +345,7 @@ clean:

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

@@ -9,10 +9,10 @@ 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..2a41166 100644
+index d8de18e..77c0f3d 100644
 --- a/libkd/Makefile
 +++ b/libkd/Makefile
-@@ -90,8 +90,7 @@ py: pyspherematch
+@@ -92,8 +92,7 @@ py: pyspherematch
  PYSPHEREMATCH_OBJ := pyspherematch.o
  
  spherematch_c$(PYTHON_SO_EXT): pyspherematch.c setup.py $(SLIB)
@@ -58,7 +58,7 @@ index 08f5e35..cdc98cd 100644
  
  # old and miscellaneous executables that aren't part of the pipeline.
 diff --git a/util/Makefile b/util/Makefile
-index 32912cc..84cec1e 100644
+index 1909bf4..db92966 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 84cec1e..8f940da 100644
+index db92966..dc4562d 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 3fe2cc1..8ae19d6 100644
+index 5837c49..e65c38f 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 cd9badd..da6ff80 100644
+index dcf7a59..2e00d91 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -165,13 +165,6 @@ install-core: