[Git][debian-gis-team/gdal][master] 5 commits: Override dh_autoreconf to create config.rpath. (closes: #993334)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / gdal


Commits:
23ffcb03 by Bas Couwenberg at 2021-09-01T18:03:32+02:00
Override dh_autoreconf to create config.rpath. (closes: #993334)

- - - - -
f6218669 by Bas Couwenberg at 2021-09-01T18:05:18+02:00
Drop obsolete ogdi patch.

- - - - -
1e5b2307 by Bas Couwenberg at 2021-09-01T18:06:18+02:00
Drop obsolete Breaks on libgdal1h.

- - - - -
df862b63 by Bas Couwenberg at 2021-09-01T18:06:27+02:00
Drop obsolete dh_shlibdeps override.

- - - - -
f4a86261 by Bas Couwenberg at 2021-09-01T18:08:17+02:00
Set distribution to unstable.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- − debian/patches/ogdi
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+gdal (3.2.2+dfsg-3) unstable; urgency=medium
+
+  * Override dh_autoreconf to create config.rpath.
+    (closes: #993334)
+  * Drop obsolete ogdi patch.
+  * Drop obsolete Breaks on libgdal1h.
+  * Drop obsolete dh_shlibdeps override.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 01 Sep 2021 18:08:06 +0200
+
 gdal (3.2.2+dfsg-2) unstable; urgency=medium
 
   * Drop Breaks from gdal-data to make libgdal20 & libgdal28 co-installable.


=====================================
debian/control
=====================================
@@ -72,7 +72,6 @@ Depends: gdal-data (>= ${source:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Recommends: proj-bin
-Breaks: libgdal1h (<< 2.0)
 Description: Geospatial Data Abstraction Library
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the


=====================================
debian/patches/ogdi deleted
=====================================
@@ -1,16 +0,0 @@
-Description: Fix include path of ogdi library.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Last-Update: 2010-05-13
-Forwarded: not-needed
-
---- a/GDALmake.opt.in
-+++ b/GDALmake.opt.in
-@@ -420,7 +420,7 @@ PCRASTER_SETTING	=	@PCRASTER_SETTING@
- #
- HAVE_LERC =	@HAVE_LERC@
- 
--OGDI_INCLUDE	=	@OGDI_INCLUDE@
-+OGDI_INCLUDE	=	-I/usr/include/ogdi
- 
- PNG_SETTING     =	@PNG_SETTING@
- JPEG_SETTING	=	@JPEG_SETTING@


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
-ogdi
 hdf4
 gdal-grass
 ecw-plugin


=====================================
debian/rules
=====================================
@@ -101,8 +101,13 @@ gdal-mrsid-dist:
 		dh $@ --with python3 ; \
 	fi
 
+override_dh_autoreconf:
+	touch config.rpath
+
+	dh_autoreconf
+
 override_dh_clean:
-	dh_clean config.log
+	dh_clean config.log config.rpath
 
 override_dh_auto_clean:
 	[ ! -f GDALmake.opt ] || $(MAKE) distclean
@@ -229,6 +234,3 @@ override_dh_makeshlibs:
 	dh_makeshlibs -- -v$(UPSTREAM_VERSION) -c0
 	# Forces failure when symbols change
 	#dh_makeshlibs -- -v$(UPSTREAM_VERSION)
-
-override_dh_shlibdeps:
-	dh_shlibdeps -L libgdal26 -l debian/libgdal26/usr/lib



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/compare/9941c85fefbae9237b787347ef2f4ac7a93e510f...f4a86261a23bf7017de3f996066eaac2080277d1

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/compare/9941c85fefbae9237b787347ef2f4ac7a93e510f...f4a86261a23bf7017de3f996066eaac2080277d1
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210901/64adaaca/attachment-0001.htm>