Rediff patches

Drop Don-t-fail-on-rm-during-make-clean.patch: <REASON>

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

@@ -7,7 +7,7 @@ Subject: Add SONAME to libastrometry.so
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/solver/Makefile b/solver/Makefile
-index 6870244..08f5e35 100644
+index f225256..42b1eeb 100644
 --- a/solver/Makefile
 +++ b/solver/Makefile
 @@ -134,7 +134,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)

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

@@ -48,10 +48,10 @@ index b5dbe91..6eda20f 100644
          if (axy->xcol)
              sl_appendf(cmd, "-X %s", axy->xcol);
 diff --git a/util/image2pnm.py b/util/image2pnm.py
-index 5cdf656..b663c3a 100755
+index 9c275af..3ee8fa6 100755
 --- a/util/image2pnm.py
 +++ b/util/image2pnm.py
-@@ -187,7 +187,7 @@ def image2pnm(infile, outfile, force_ppm=False, extension=None, mydir=None):
+@@ -190,7 +190,7 @@ def image2pnm(infile, outfile, force_ppm=False, extension=None, mydir=None):
      if ext == fitsext and extension:
          cmd = an_fitstopnm_ext_cmd % extension
  

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 a8878f2..391c2d5 100644
+index 8ce944e..baa0f0f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -157,7 +157,6 @@ install-core:

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

-From: Ole Streicher <olebole@debian.org>
-Date: Tue, 28 Apr 2020 09:21:11 +0200
-Subject: Don't fail during 'make clean'
-
----
- Makefile | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index add4fd8..a8878f2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -345,9 +345,7 @@ clean:
- 	$(MAKE) -C util clean
- 	$(MAKE) -C catalogs clean
- 	-$(MAKE) -C qfits-an clean
--	-rm __init__.pyc
--	$(MAKE) -C gsl-an clean
--	-rm gsl-an/config.h
-+	-rm -f __init__.pyc
- 	$(MAKE) -C libkd clean
- 	$(MAKE) -C solver clean
- 	$(MAKE) -C sdss clean

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

@@ -23,7 +23,7 @@ index d8de18e..77c0f3d 100644
  	CFLAGS="$(CFLAGS)" \
  	$(PYTHON) setup.py build_ext --inplace --force --build-temp .
 diff --git a/solver/Makefile b/solver/Makefile
-index 08f5e35..cdc98cd 100644
+index 42b1eeb..57cbca9 100644
 --- a/solver/Makefile
 +++ b/solver/Makefile
 @@ -45,9 +45,7 @@ LDFLAGS := $(LDFLAGS_DEF)
@@ -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 1909bf4..db92966 100644
+index c35a8da..a8e7010 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 db92966..dc4562d 100644
+index a8e7010..7057712 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

@@ -3,11 +3,11 @@ Date: Thu, 1 Dec 2016 21:18:56 +0100
 Subject: Fix shared lib flags so that the package can be built on s390x
 
 ---
- util/makefile.common | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
+ util/makefile.common | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/util/makefile.common b/util/makefile.common
-index 76adf8f..35116e1 100644
+index 0878497..2d3379e 100644
 --- a/util/makefile.common
 +++ b/util/makefile.common
 @@ -171,9 +171,8 @@ FLAGS_DEF += $(shell $(CCTEST))
@@ -22,12 +22,3 @@ index 76adf8f..35116e1 100644
    # Try to guess some good compiler flags for this CPU.
  
    # Use -march=native if it's available (gcc 4.2 and above)
-@@ -281,7 +280,7 @@ endif
- endif
- 
- ifneq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
--FLAGS_DEF += -fpic
-+FLAGS_DEF += -fpic -fPIC
- endif
- 
- # profily!

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 aa17acb..add4fd8 100644
+index 4c30881..8ce944e 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -165,13 +165,6 @@ install-core:

debian/patches/series

@@ -4,5 +4,4 @@ Fix-issues-when-using-Debian-libs-instead-of-convienience.patch
 Call-python-scripts-as-modules-instead-of-executables.patch
 Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch
 Remove-errornous-generation-of-net-client.py.patch
-Don-t-fail-on-rm-during-make-clean.patch
 Don-t-copy-demo-files-to-examples.patch