[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#989795: marked as done (unblock: ogdi-dfsg/4.1.0+ds-5)

Your message dated Mon, 14 Jun 2021 19:38:18 +0000
with message-id <E1lssPa-0007Ym-Uz@respighi.debian.org>
and subject line unblock ogdi-dfsg
has caused the Debian Bug report #989795,
regarding unblock: ogdi-dfsg/4.1.0+ds-5
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
989795: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=989795
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package ogdi-dfsg

[ Reason ]
It fixes #989790 which should help with upgrades from 3.2.

[ Impact ]
More troublesome distribution upgrade.

[ Tests ]
N/A

[ Risks ]
Dependency of key package (gdal).

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
N/A

unblock ogdi-dfsg/4.1.0+ds-4


Kind Regards,

Bas

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-11-12 06:04:54.000000000 +0100
+++ ogdi-dfsg-4.1.0+ds/debian/changelog	2021-06-13 14:55:48.000000000 +0200
@@ -1,3 +1,14 @@
+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 <sebastic@debian.org>  Sun, 13 Jun 2021 14:55:48 +0200
+
 ogdi-dfsg (4.1.0+ds-3) unstable; urgency=medium
 
   * Team upload.
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	2020-11-12 06:04:54.000000000 +0100
+++ ogdi-dfsg-4.1.0+ds/debian/control	2021-06-13 14:12:02.000000000 +0200
@@ -8,7 +8,7 @@
                pkg-config,
                tcl-dev (>= 8.4),
                zlib1g-dev
-Standards-Version: 4.5.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/
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	2020-11-12 06:04:54.000000000 +0100
+++ ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.dirs	2021-06-13 14:17:54.000000000 +0200
@@ -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	2020-11-12 06:04:54.000000000 +0100
+++ ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.install	2021-06-13 14:12:37.000000000 +0200
@@ -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	2020-11-12 06:04:54.000000000 +0100
+++ ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.lintian-overrides	2021-06-13 14:24:33.000000000 +0200
@@ -1,3 +1,3 @@
 # False positive, string not included in the source.
-spelling-error-in-binary usr/lib/ogdi/libvrf.so "allow to" "allow one to"
+spelling-error-in-binary usr/lib/ogdi/*/libvrf.so "allow to" "allow one to"
 
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	2020-11-12 06:04:54.000000000 +0100
+++ ogdi-dfsg-4.1.0+ds/debian/patches/hardening	2020-11-12 11:50:24.000000000 +0100
@@ -1,6 +1,7 @@
 Description: Include hardening buidflags from the environment.
 Author: Bas Couwenberg <sebastic@debian.org>
 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	2020-11-12 06:04:54.000000000 +0100
+++ ogdi-dfsg-4.1.0+ds/debian/patches/hurd	2020-11-12 11:49:24.000000000 +0100
@@ -1,6 +1,7 @@
 Description: Support the GNU Hurd too.
 Author: Francesco Paolo Lovergine <frankie@debian.org>
 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/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	2020-11-12 06:04:54.000000000 +0100
+++ ogdi-dfsg-4.1.0+ds/debian/patches/modules_path.patch	2021-06-13 14:14:04.000000000 +0200
@@ -9,7 +9,7 @@
  		$(EXPAT_INCLUDE)
  
 -CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -DMODULES_PATH="\"$(INST_LIB)/ogdi/\""
-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -DMODULES_PATH="\"/usr/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/spelling-errors ogdi-dfsg-4.1.0+ds/debian/patches/spelling-errors
--- ogdi-dfsg-4.1.0+ds/debian/patches/spelling-errors	2020-11-12 06:04:54.000000000 +0100
+++ ogdi-dfsg-4.1.0+ds/debian/patches/spelling-errors	2020-11-12 11:50:40.000000000 +0100
@@ -2,6 +2,7 @@
  occured -> occurred
 Author: Bas Couwenberg <sebastic@debian.org>
 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/watch ogdi-dfsg-4.1.0+ds/debian/watch
--- ogdi-dfsg-4.1.0+ds/debian/watch	2020-11-12 06:04:54.000000000 +0100
+++ ogdi-dfsg-4.1.0+ds/debian/watch	2021-03-20 08:51:20.000000000 +0100
@@ -5,4 +5,4 @@
 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)))

--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: