diff -Nru ogdi-dfsg-4.1.0+ds/debian/changelog ogdi-dfsg-4.1.0+ds/debian/changelog --- ogdi-dfsg-4.1.0+ds/debian/changelog 2020-08-23 00:11:35.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/changelog 2022-09-21 02:05:06.000000000 +0000 @@ -1,8 +1,50 @@ -ogdi-dfsg (4.1.0+ds-1~16.04.sav0) xenial; urgency=medium +ogdi-dfsg (4.1.0+ds-5~16.04.sav0) xenial; urgency=medium * Backport to Xenial - -- Rob Savoury Sat, 22 Aug 2020 17:11:35 -0700 + -- Rob Savoury Tue, 20 Sep 2022 19:05:06 -0700 + +ogdi-dfsg (4.1.0+ds-5) unstable; urgency=medium + + * Team upload. + * Drop obsolete Breaks/Replaces on libogdi3.2. See: #989795. + + -- Bas Couwenberg Mon, 14 Jun 2021 05:48:16 +0200 + +ogdi-dfsg (4.1.0+ds-4) unstable; urgency=medium + + * Team upload. + * Bump Standards-Version to 4.5.1, no changes. + * Mark patches as Applied-Upstream. + * Update watch file for GitHub URL changes. + * Use version specific modules path. + (closes: #989790) + + -- Bas Couwenberg Sun, 13 Jun 2021 14:55:48 +0200 + +ogdi-dfsg (4.1.0+ds-3) unstable; urgency=medium + + * Team upload. + * Add patch to link libm in libvpf. + (closes: #964241) + * Bump watch file version to 4. + * Mark patches as Forwarded. + + -- Bas Couwenberg Thu, 12 Nov 2020 06:04:54 +0100 + +ogdi-dfsg (4.1.0+ds-2) unstable; urgency=medium + + * Team upload. + * Bump Standards-Version to 4.5.0, no changes. + * Drop Name field from upstream metadata. + * Bump debhelper compat to 10, changes: + - Drop --parallel option, enabled by default + - Don't explicitly enable autoreconf, enabled by default + - Drop dh-autoreconf build dependency + * Add patch to not include package build path in MODULES_PATH. + * Update lintian overrides. + + -- Bas Couwenberg Sat, 27 Jun 2020 20:20:52 +0200 ogdi-dfsg (4.1.0+ds-1) unstable; urgency=medium diff -Nru ogdi-dfsg-4.1.0+ds/debian/compat ogdi-dfsg-4.1.0+ds/debian/compat --- ogdi-dfsg-4.1.0+ds/debian/compat 2019-03-01 15:33:40.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/compat 2020-11-12 05:35:27.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru ogdi-dfsg-4.1.0+ds/debian/control ogdi-dfsg-4.1.0+ds/debian/control --- ogdi-dfsg-4.1.0+ds/debian/control 2019-04-20 12:17:50.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/control 2021-06-14 03:46:51.000000000 +0000 @@ -3,14 +3,12 @@ Uploaders: Francesco Paolo Lovergine Section: libs Priority: optional -Build-Depends: debhelper (>= 9), - dh-autoreconf, - autotools-dev, +Build-Depends: debhelper (>= 10~), libexpat1-dev, pkg-config, tcl-dev (>= 8.4), zlib1g-dev -Standards-Version: 4.3.0 +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/debian-gis-team/ogdi-dfsg Vcs-Git: https://salsa.debian.org/debian-gis-team/ogdi-dfsg.git Homepage: http://ogdi.sourceforge.net/ @@ -40,8 +38,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: ogdi-bin -Breaks: libogdi3.2 (<< 4.0.0) -Replaces: libogdi3.2 (<< 4.0.0) Description: Open Geographic Datastore Interface Library -- library OGDI is the Open Geographic Datastore Interface. OGDI is an application programming interface (API) that uses a standardized access methods to diff -Nru ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.dirs ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.dirs --- ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.dirs 2019-04-20 12:17:50.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.dirs 2021-06-13 12:17:54.000000000 +0000 @@ -1 +1 @@ -usr/lib +usr/lib/ogdi/4.1 diff -Nru ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.install ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.install --- ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.install 2019-04-20 12:17:50.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.install 2021-06-13 12:12:37.000000000 +0000 @@ -1,3 +1,3 @@ usr/lib/libogdi.so.* usr/lib/libvpf.so.* -usr/lib/ogdi/*.so usr/lib/ogdi +usr/lib/ogdi/*.so usr/lib/ogdi/4.1 diff -Nru ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.lintian-overrides ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.lintian-overrides --- ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.lintian-overrides 2019-04-20 12:17:50.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.lintian-overrides 2021-06-13 12:24:33.000000000 +0000 @@ -1,6 +1,3 @@ # False positive, string not included in the source. -spelling-error-in-binary usr/lib/ogdi/libvrf.so allow to allow one to - -# Cannot easily be fixed -file-references-package-build-path usr/lib/libogdi.so.* +spelling-error-in-binary usr/lib/ogdi/*/libvrf.so "allow to" "allow one to" diff -Nru ogdi-dfsg-4.1.0+ds/debian/patches/endianess ogdi-dfsg-4.1.0+ds/debian/patches/endianess --- ogdi-dfsg-4.1.0+ds/debian/patches/endianess 2019-03-01 15:33:40.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/patches/endianess 2020-11-12 05:36:14.000000000 +0000 @@ -2,6 +2,7 @@ This is a Linux specific patch. A better fix would check endianness at configuration time. Author: Francesco Paolo Lovergine +Forwarded: not-needed --- a/vpflib/include/machine.h +++ b/vpflib/include/machine.h diff -Nru ogdi-dfsg-4.1.0+ds/debian/patches/hardening ogdi-dfsg-4.1.0+ds/debian/patches/hardening --- ogdi-dfsg-4.1.0+ds/debian/patches/hardening 2019-03-01 16:11:46.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/patches/hardening 2020-11-12 10:50:24.000000000 +0000 @@ -1,5 +1,7 @@ Description: Include hardening buidflags from the environment. Author: Bas Couwenberg +Forwarded: https://github.com/libogdi/ogdi/pull/18 +Applied-Upstream: https://github.com/libogdi/ogdi/commit/408d7fb49de714aa0f5833ed4bb40404bee3e6bd --- a/config/unix.mak +++ b/config/unix.mak diff -Nru ogdi-dfsg-4.1.0+ds/debian/patches/hurd ogdi-dfsg-4.1.0+ds/debian/patches/hurd --- ogdi-dfsg-4.1.0+ds/debian/patches/hurd 2019-03-01 15:33:40.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/patches/hurd 2020-11-12 10:49:24.000000000 +0000 @@ -1,5 +1,7 @@ Description: Support the GNU Hurd too. Author: Francesco Paolo Lovergine +Forwarded: https://github.com/libogdi/ogdi/pull/17 +Applied-Upstream: https://github.com/libogdi/ogdi/commit/99b78f9738523d23142b36e114d2187d21255eec --- /dev/null +++ b/config/GNU.mak diff -Nru ogdi-dfsg-4.1.0+ds/debian/patches/install-so-link ogdi-dfsg-4.1.0+ds/debian/patches/install-so-link --- ogdi-dfsg-4.1.0+ds/debian/patches/install-so-link 2019-03-01 15:33:40.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/patches/install-so-link 2020-11-12 05:36:14.000000000 +0000 @@ -2,6 +2,7 @@ Disable mv commands, source and destination are the same file. Disable ln command, symlink already created in default-install target. Author: Bas Couwenberg +Forwarded: not-needed --- a/config/common.mak.in +++ b/config/common.mak.in diff -Nru ogdi-dfsg-4.1.0+ds/debian/patches/libm.patch ogdi-dfsg-4.1.0+ds/debian/patches/libm.patch --- ogdi-dfsg-4.1.0+ds/debian/patches/libm.patch 1970-01-01 00:00:00.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/patches/libm.patch 2020-11-12 05:36:14.000000000 +0000 @@ -0,0 +1,27 @@ +Description: Link to libm for sincos/cos/acos. +Author: Bas Couwenberg +Bug-Debian: https://bugs.debian.org/964241 +Forwarded: not-needed + +--- a/vpflib/makefile ++++ b/vpflib/makefile +@@ -33,6 +33,8 @@ INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_ + CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) $(UNIX_DEFINE) \ + -DSYS_BIG_ENDIAN=$(BIG_ENDIAN) + ++LINK_LIBS = $(MATH_LINKLIB) ++ + include $(TOPDIR)/config/common.mak + + ifeq ($(HAVE_ICONV),yes) +--- a/config/unix.mak ++++ b/config/unix.mak +@@ -73,7 +73,7 @@ SYSTEM_INCLUDE = $(patsubst %,$(INCL_SW) + # + + RPC_LINKLIB = +-MATH_LINKLIB = $(LIB_SW)m ++MATH_LINKLIB = -lm + DL_LINKLIB = + + LIBC_LINKLIB = -lc diff -Nru ogdi-dfsg-4.1.0+ds/debian/patches/makefile ogdi-dfsg-4.1.0+ds/debian/patches/makefile --- ogdi-dfsg-4.1.0+ds/debian/patches/makefile 2019-03-01 15:33:40.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/patches/makefile 2020-11-12 05:36:14.000000000 +0000 @@ -1,5 +1,6 @@ Description: Removing the external/ directory which is not present in dfsg tarball. Author: Francesco Paolo Lovergine +Forwarded: not-needed --- a/config/generic.mak.in +++ b/config/generic.mak.in diff -Nru ogdi-dfsg-4.1.0+ds/debian/patches/modules_path.patch ogdi-dfsg-4.1.0+ds/debian/patches/modules_path.patch --- ogdi-dfsg-4.1.0+ds/debian/patches/modules_path.patch 1970-01-01 00:00:00.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/patches/modules_path.patch 2021-06-13 12:14:04.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Don't include package build path in MODULES_PATH. +Author: Bas Couwenberg +Forwarded: not-needed + +--- a/ogdi/c-api/makefile ++++ b/ogdi/c-api/makefile +@@ -24,7 +24,7 @@ INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_ + $(GRASS_INCLUDE) $(ZLIB_INCLUDE) \ + $(EXPAT_INCLUDE) + +-CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -DMODULES_PATH="\"$(INST_LIB)/ogdi/\"" ++CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -DMODULES_PATH="\"/usr/lib/ogdi/4.1/\"" + + LINK_LIBS= $(RPC_LINKLIB) $(ZLIB_LINKLIB) $(EXPAT_LINKLIB) $(WIN_LINKLIB) \ + $(MATH_LINKLIB) diff -Nru ogdi-dfsg-4.1.0+ds/debian/patches/series ogdi-dfsg-4.1.0+ds/debian/patches/series --- ogdi-dfsg-4.1.0+ds/debian/patches/series 2019-03-01 15:33:40.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/patches/series 2020-11-12 05:35:27.000000000 +0000 @@ -5,3 +5,5 @@ hardening spelling-errors install-so-link +modules_path.patch +libm.patch diff -Nru ogdi-dfsg-4.1.0+ds/debian/patches/shared ogdi-dfsg-4.1.0+ds/debian/patches/shared --- ogdi-dfsg-4.1.0+ds/debian/patches/shared 2019-04-20 12:09:08.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/patches/shared 2020-11-12 05:36:14.000000000 +0000 @@ -4,6 +4,7 @@ Also changed a bit SHRDGEN target to generate standard sonames/solibs. Note that upstream follows a soname libogdi.so.MAJOR.MINOR scheme. Author: Francesco Paolo Lovergine +Forwarded: not-needed --- a/config/unix.mak +++ b/config/unix.mak diff -Nru ogdi-dfsg-4.1.0+ds/debian/patches/spelling-errors ogdi-dfsg-4.1.0+ds/debian/patches/spelling-errors --- ogdi-dfsg-4.1.0+ds/debian/patches/spelling-errors 2019-03-01 15:33:40.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/patches/spelling-errors 2020-11-12 10:50:40.000000000 +0000 @@ -1,6 +1,8 @@ Description: Fix spelling errors. occured -> occurred Author: Bas Couwenberg +Forwarded: https://github.com/libogdi/ogdi/pull/19 +Applied-Upstream: https://github.com/libogdi/ogdi/commit/4c8178383e851963db7685f3fd01ec7187c1aa5d --- a/ogdi/c-api/server.c +++ b/ogdi/c-api/server.c diff -Nru ogdi-dfsg-4.1.0+ds/debian/rules ogdi-dfsg-4.1.0+ds/debian/rules --- ogdi-dfsg-4.1.0+ds/debian/rules 2019-03-01 16:11:02.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/rules 2020-11-12 05:35:27.000000000 +0000 @@ -19,7 +19,7 @@ UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//') %: - dh $@ --with autoreconf --parallel + dh $@ override_dh_auto_clean: if [ -e config/common.mak ]; then \ diff -Nru ogdi-dfsg-4.1.0+ds/debian/source/lintian-overrides ogdi-dfsg-4.1.0+ds/debian/source/lintian-overrides --- ogdi-dfsg-4.1.0+ds/debian/source/lintian-overrides 2019-03-01 15:33:40.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# Not worth the effort -testsuite-autopkgtest-missing - diff -Nru ogdi-dfsg-4.1.0+ds/debian/upstream/metadata ogdi-dfsg-4.1.0+ds/debian/upstream/metadata --- ogdi-dfsg-4.1.0+ds/debian/upstream/metadata 2019-03-01 15:33:40.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/upstream/metadata 2021-06-13 10:01:40.000000000 +0000 @@ -1,6 +1,5 @@ --- Bug-Database: https://github.com/libogdi/ogdi/issues Bug-Submit: https://github.com/libogdi/ogdi/issues/new -Name: OGDI Repository: https://github.com/libogdi/ogdi.git Repository-Browse: https://github.com/libogdi/ogdi diff -Nru ogdi-dfsg-4.1.0+ds/debian/watch ogdi-dfsg-4.1.0+ds/debian/watch --- ogdi-dfsg-4.1.0+ds/debian/watch 2019-03-01 15:33:40.000000000 +0000 +++ ogdi-dfsg-4.1.0+ds/debian/watch 2021-03-20 07:51:20.000000000 +0000 @@ -1,8 +1,8 @@ -version=3 +version=4 opts=\ dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/[\-\_]/\./g,\ filenamemangle=s/(?:.*?)?(?:rel|v|ogdi)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/ogdi-$1.$2/;s/_/\./g,\ repacksuffix=+ds \ https://github.com/libogdi/ogdi/releases \ -(?:.*?/archive/)?(?:rel|v|ogdi)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +(?:.*?/archive/(?:.*?/)?)?(?:rel|v|ogdi)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))