New upstream version 2.0.1.

debian/changelog

+postgresql-q3c (2.0.1-1) unstable; urgency=medium
+
+  * New upstream version 2.0.1.
+
+ -- Christoph Berg <myon@debian.org>  Fri, 05 Jan 2024 14:34:58 +0100
+
 postgresql-q3c (2.0.0-8) unstable; urgency=medium
 
   * Upload for PostgreSQL 16.

debian/patches/Dont-rebuild-all-during-CI-tests.patch

-From: Ole Streicher <olebole@debian.org>
-Date: Mon, 7 Aug 2017 14:07:23 +0200
-Subject: Don't rebuild all during CI tests
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -42,7 +42,7 @@ prepare: prepare.o q3cube.o q3c_poly.o
- gen_data: gen_data.c
- 	$(CC) $< $(CPPFLAGS) $(PG_LFGLAGS) $(LDFLAGS) $(MYBINLIBS) -o $@
- 
--test: gen_data all
-+test: gen_data
- 	createdb q3c_test
- 	psql q3c_test -c "CREATE TABLE test (ra double precision, dec double precision)"
- 	psql q3c_test -c "CREATE TABLE test1 (ra double precision, dec double precision)"

debian/patches/gen_data-no-postgres.h

---- a/gen_data.c
-+++ b/gen_data.c
-@@ -24,9 +24,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
--#include "postgres.h"
-+#include <stdbool.h>
-+#include <string.h>
- 
- 
-+typedef long long int64;
- 
- static int64 rand_state = 1;
- static const int64 c = 12345;
---- a/Makefile
-+++ b/Makefile
-@@ -33,7 +33,7 @@ prepare: prepare.o q3cube.o q3c_poly.o
- 	$(CC) prepare.o q3cube.o q3c_poly.o $(PG_LDFLAGS) $(LDFLAGS) $(MYBINLIBS) -o $@
- 
- gen_data: gen_data.c
--	$(CC) $< $(CPPFLAGS) $(PG_LFGLAGS) $(LDFLAGS) $(MYBINLIBS) -o $@
-+	$(CC) $< $(CPPFLAGS) $(PG_LFGLAGS) $(LDFLAGS) -lm -o $@
- 
- test: gen_data
- 	createdb q3c_test

debian/patches/ldflags

@@ -2,13 +2,13 @@ Remove PG_LIBS from prepare linking
 
 --- a/Makefile
 +++ b/Makefile
-@@ -24,13 +24,7 @@ PGXS := $(shell $(PG_CONFIG) --pgxs)
+@@ -34,13 +34,7 @@ endif
  include $(PGXS)
  PGVERNEW := $(shell if [ $(MAJORVERSION) -ge 12 ] ; then echo N ; else echo O ; fi )
  
 -ifeq ($(PGVERNEW), N)
 -	PG_LIBS += -L$(shell $(PG_CONFIG) --pkglibdir)
--	LIBS := $(filter-out -lpam -lxml2 -lxslt -lselinux -ledit, $(LIBS))
+-	LIBS := $(filter-out -lpam -lxml2 -lxslt -lselinux -ledit -lgssapi_krb5, $(LIBS))
 -	MYBINLIBS := $(LIBS) $(PG_LIBS) -lm
 -else
 -	MYBINLIBS := $(PG_LIBS) -lm

debian/patches/series

-Dont-rebuild-all-during-CI-tests.patch
 ldflags
 skip-slow-tests
-gen_data-no-postgres.h

debian/patches/skip-slow-tests

 --- a/Makefile
 +++ b/Makefile
-@@ -64,22 +64,23 @@ test: gen_data
- 	mkdir -p results
- 	cat sql/ang2ipix.sql | psql q3c_test > results/ang2ipix.out
+@@ -77,24 +77,25 @@ test: gen_data
+ 	diff results/misc.out expected/misc.expected
+ 	cat sql/ang2ipix.sql | psql q3c_test > results/ang2ipix.out 2>&1
  	diff results/ang2ipix.out expected/ang2ipix.expected
--	cat sql/cone.sql | psql q3c_test > results/cone.out
+-	cat sql/cone.sql | psql q3c_test > results/cone.out 2>&1
 -	diff results/cone.out expected/cone.expected
 +	# Debian: Skip the tests that are very slow (> 20s)
-+	#cat sql/cone.sql | psql q3c_test > results/cone.out
++	#cat sql/cone.sql | psql q3c_test > results/cone.out 2>&1
 +	#diff results/cone.out expected/cone.expected
  	cat sql/cone_join_rev.sql | psql q3c_test > results/cone.out
  	diff results/cone.out expected/cone.expected
@@ -15,6 +15,8 @@
  	diff results/ellipse.out expected/ellipse.expected
 -	cat sql/join.sql | psql q3c_test > results/join.out
 -	diff results/join.out expected/join.expected
+-	cat sql/join_ellipse.sql | psql q3c_test > results/join_ellipse.out
+-	diff results/join_ellipse.out expected/join.expected
 -	cat sql/join_pm1.sql | psql q3c_test > results/join_pm1.out
 -	diff results/join_pm1.out expected/join_pm1.expected
 -	cat sql/join_pm2.sql | psql q3c_test > results/join_pm2.out
@@ -25,6 +27,8 @@
 -	diff results/poly1.out expected/poly.expected
 +	#cat sql/join.sql | psql q3c_test > results/join.out
 +	#diff results/join.out expected/join.expected
++	#cat sql/join_ellipse.sql | psql q3c_test > results/join_ellipse.out
++	#diff results/join_ellipse.out expected/join.expected
 +	#cat sql/join_pm1.sql | psql q3c_test > results/join_pm1.out
 +	#diff results/join_pm1.out expected/join_pm1.expected
 +	#cat sql/join_pm2.sql | psql q3c_test > results/join_pm2.out
@@ -35,4 +39,4 @@
 +	#diff results/poly1.out expected/poly.expected
  	cat sql/version.sql | psql q3c_test > results/version.out
  	diff results/version.out expected/version.expected
- 	cat sql/area.sql | psql q3c_test > results/area.out
+ 	cat sql/area.sql | psql q3c_test > results/area.out 2>&1