Lintian Fixes - apr

Ready changes

Merge these changes:

git pull https://janitor.debian.net/git/apr lintian-fixes

Summary

Diff

=== modified file 'debian/changelog'
--- a/debian/changelog	2018-11-19 12:28:08 +0000
+++ b/debian/changelog	2020-06-03 15:10:46 +0000
@@ -1,3 +1,15 @@
+apr (1.6.5-2) UNRELEASED; urgency=low
+
+  * Trim trailing whitespace.
+  * Transition to automatic debug package (from: libapr1-dbg).
+  * Use secure URI in debian/watch.
+  * Use secure URI in Homepage field.
+  * Bump debhelper from old 11 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Rely on pre-initialized dpkg-architecture variables.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 03 Jun 2020 15:06:30 -0000
+
 apr (1.6.5-1) unstable; urgency=medium
 
   * New upstream release
@@ -222,7 +234,7 @@
     - Fix regression introduced by fix for CVE-2011-0419: apr_fnmatch may
       consume 100% CPU. CVE-2011-1928. Closes: #627182
   * Fix allocator using mmap crashing on non-4k-page platforms. Thanks to
-    Lifeng Sun for the patch. Closes: #627532 
+    Lifeng Sun for the patch. Closes: #627532
 
  -- Stefan Fritsch <sf@debian.org>  Sat, 21 May 2011 20:49:17 +0200
 
@@ -350,7 +362,7 @@
     - define _GNU_SOURCE earlier
     - disable tests on hurd for now
     - Deactivate missing multicast support on Hurd (by removing
-      HAVE_STRUCT_IPMREQ manually). 
+      HAVE_STRUCT_IPMREQ manually).
   * Omit spurious libs from apr-1-config --libs output (closes: #463399)
 
  -- Stefan Fritsch <sf@debian.org>  Sun, 07 Jun 2009 21:15:32 +0200

=== removed file 'debian/compat'
--- a/debian/compat	2018-02-25 15:28:42 +0000
+++ b/debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-11

=== modified file 'debian/control'
--- a/debian/control	2018-11-19 12:27:31 +0000
+++ b/debian/control	2020-06-03 15:10:06 +0000
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
 Uploaders: Stefan Fritsch <sf@debian.org>
-Build-Depends: debhelper (>= 11), autoconf, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python:any, libsctp-dev [linux-any]
+Build-Depends: debhelper-compat (= 12), autoconf, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python:any, libsctp-dev [linux-any]
 Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/apache-team/apr
 Vcs-Git: https://salsa.debian.org/apache-team/apr.git
-Homepage: http://apr.apache.org/
+Homepage: https://apr.apache.org/
 
 Package: libapr1
 Architecture: any
@@ -16,9 +16,9 @@
 Multi-Arch: same
 Conflicts: libapr1.0
 Description: Apache Portable Runtime Library
- APR is Apache's Portable Runtime Library, designed to be a support library 
- that provides a predictable and consistent interface to underlying 
- platform-specific implementations. 
+ APR is Apache's Portable Runtime Library, designed to be a support library
+ that provides a predictable and consistent interface to underlying
+ platform-specific implementations.
 
 Package: libapr1-dev
 Architecture: any
@@ -27,20 +27,8 @@
 Suggests: python
 Conflicts: libapr1.0-dev, libapr0-dev
 Description: Apache Portable Runtime Library - Development Headers
- APR is Apache's Portable Runtime Library, designed to be a support library 
- that provides a predictable and consistent interface to underlying 
- platform-specific implementations. 
+ APR is Apache's Portable Runtime Library, designed to be a support library
+ that provides a predictable and consistent interface to underlying
+ platform-specific implementations.
  .
  This package contains development headers for APR.
-
-Package: libapr1-dbg
-Architecture: any
-Section: debug
-Multi-Arch: same
-Depends: libapr1 (= ${binary:Version}), ${misc:Depends}
-Description: Apache Portable Runtime Library - Debugging Symbols
- APR is Apache's Portable Runtime Library, designed to be a support library 
- that provides a predictable and consistent interface to underlying 
- platform-specific implementations. 
- .
- This package contains the debugging symbols for APR.

=== modified file 'debian/rules'
--- a/debian/rules	2018-02-25 15:28:42 +0000
+++ b/debian/rules	2020-06-03 15:10:46 +0000
@@ -4,12 +4,7 @@
 SHELL=/bin/bash
 BUILDDIR := debian/build
 
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_HOST_ARCH_BITS  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
-DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 
 # The 'build' target needs special handling because there there is a directory
 # named 'build'.
@@ -148,7 +143,7 @@
 	fi
 
 override_dh_strip:
-	dh_strip --dbg-package=libapr1-dbg
+	dh_strip --dbgsym-migration='libapr1-dbg (<< 1.6.5-2~)'
 
 override_dh_makeshlibs:
 	dh_makeshlibs -- -Idebian/symbols.$(DEB_HOST_ARCH_OS)

=== modified file 'debian/watch'
--- a/debian/watch	2015-08-21 18:01:14 +0000
+++ b/debian/watch	2020-06-03 15:08:07 +0000
@@ -1,3 +1,3 @@
 version=3
 opts=pgpsigurlmangle=s/$/.asc/ \
-http://www.apache.org/dist/apr/apr-(1\..*)\.tar\.gz
+https://www.apache.org/dist/apr/apr-(1\..*)\.tar\.gz

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/ea/05291a82c5ea99b8934a124276dcd58cedef60.debug
lrwxrwxrwx  root/root   /usr/share/doc/libapr1-dbgsym -> libapr1

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/7c/732ef824e730d40155a13e450ea52b20dd98e6.debug
-rw-r--r--  root/root   /usr/share/doc/libapr1-dbg/NOTICE
-rw-r--r--  root/root   /usr/share/doc/libapr1-dbg/changelog.Debian.gz
-rw-r--r--  root/root   /usr/share/doc/libapr1-dbg/changelog.gz
-rw-r--r--  root/root   /usr/share/doc/libapr1-dbg/copyright

Control files of package libapr1: lines which differ (wdiff format)

  • Homepage: http://apr.apache.org/ https://apr.apache.org/

Control files of package libapr1-dev: lines which differ (wdiff format)

  • Homepage: http://apr.apache.org/ https://apr.apache.org/

Run locally

Try this locally (using the lintian-brush package):

debcheckout apr
cd apr
lintian-brush

More details

Full run details