Merge lp:~jelmer/pkg-libinnodb/lintian-fixes into lp:pkg-libinnodb

[Jelmer Vernooij]

Fix some issues reported by lintian
* Use versioned copyright format URI.
* Trim trailing whitespace.
* Transition to automatic debug package (from: libinnodb-dbg).
* Use secure URI in Vcs control header.

[Stewart Smith (stewart)]

While libinnodb/haildb is rather dead, the packaging updates look fine.

review: Approve

Unmerged revisions

17. By Jelmer Vernooij on 2018-10-25

Use secure URI in Vcs control header.
Fixed-Lintian-Tags: vcs-field-uses-insecure-uri

Fixes lintian: vcs-field-uses-insecure-uri
See https://lintian.debian.org/tags/vcs-field-uses-insecure-uri.html for more details.

16. By Jelmer Vernooij on 2018-10-25

Transition to automatic debug package (from: libinnodb-dbg).

15. By Jelmer Vernooij on 2018-10-25

Trim trailing whitespace.
Fixed-Lintian-Tags: file-contains-trailing-whitespace

Fixes lintian: file-contains-trailing-whitespace
See https://lintian.debian.org/tags/file-contains-trailing-whitespace.html for more details.

14. By Jelmer Vernooij on 2018-10-25

Use versioned copyright format URI.
Fixed-Lintian-Tags: unversioned-copyright-format-uri

Fixes lintian: unversioned-copyright-format-uri
See https://lintian.debian.org/tags/unversioned-copyright-format-uri.html for more details.

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-26 16:22:26 +0000
+++ debian/changelog	2018-10-25 01:46:15 +0000
@@ -1,3 +1,12 @@
+libinnodb (1.0.6.6750-2) UNRELEASED; urgency=medium
+
+  * Use versioned copyright format URI.
+  * Trim trailing whitespace.
+  * Transition to automatic debug package (from: libinnodb-dbg).
+  * Use secure URI in Vcs control header.
+
+ -- Jelmer Vernooij <[e-mail]>  Thu, 25 Oct 2018 01:30:56 +0000
+
 libinnodb (1.0.6.6750-1) unstable; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2010-02-26 16:22:26 +0000
+++ debian/control	2018-10-25 01:46:15 +0000
@@ -2,43 +2,31 @@
 Priority: extra
 Maintainer: Monty Taylor <[e-mail]>
 Uploaders: Stewart Smith <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50), autotools-dev, zlib1g-dev, quilt, automake, autoconf, libtool
+Build-Depends: debhelper (>= 9.20160114), autotools-dev, zlib1g-dev, quilt, automake, autoconf, libtool
 Standards-Version: 3.8.4
 Section: libs
 Homepage: http://www.innodb.com/products/embedded-innodb
 Vcs-Browser: http://bazaar.launchpad.net/~drizzle-developers/pkg-libinnodb/trunk/files
-Vcs-Bzr: http://bazaar.launchpad.net/~drizzle-developers/pkg-libinnodb/trunk
+Vcs-Bzr: https://code.launchpad.net/~drizzle-developers/pkg-libinnodb/trunk
 
 Package: libinnodb-dev
 Section: libdevel
 Architecture: any
 Depends: libinnodb3 (= ${binary:Version}), zlib1g-dev, ${shlibs:Depends}, ${misc:Depends}
 Description: Embedded InnoDB Library (dev files)
- Embedded InnoDB is used independently of MySQL. It is not a plugin, nor a 
- storage engine for MySQL. It is designed to be linked directly into 
+ Embedded InnoDB is used independently of MySQL. It is not a plugin, nor a
+ storage engine for MySQL. It is designed to be linked directly into
  application programs, and provides highly efficient, low-level database
  management services, not using SQL
  .
  This package contains headers and other development files.
 
-Package: libinnodb-dbg
-Section: debug
-Architecture: any
-Depends: libinnodb3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Embedded InnoDB Library (debug files)
- Embedded InnoDB is used independently of MySQL. It is not a plugin, nor a 
- storage engine for MySQL. It is designed to be linked directly into 
- application programs, and provides highly efficient, low-level database
- management services, not using SQL
- .
- This package contains debuging symbols.
-
 Package: libinnodb3
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, zlib1g
 Description: Embedded InnoDB Library
- Embedded InnoDB is used independently of MySQL. It is not a plugin, nor a 
- storage engine for MySQL. It is designed to be linked directly into 
+ Embedded InnoDB is used independently of MySQL. It is not a plugin, nor a
+ storage engine for MySQL. It is designed to be linked directly into
  application programs, and provides highly efficient, low-level database
  management services, not using SQL
  .

=== modified file 'debian/copyright'
--- debian/copyright	2010-02-06 00:11:08 +0000
+++ debian/copyright	2018-10-25 01:46:15 +0000
@@ -1,4 +1,4 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Debianized-By: Stewart Smith <[e-mail]>
 Debianized-Date: Fri, 05 Feb 2010 15:31:29 +1100
 Original-Source: http://www.innodb.com/products/embedded-innodb/

=== modified file 'debian/rules'
--- debian/rules	2010-02-26 16:22:26 +0000
+++ debian/rules	2018-10-25 01:46:15 +0000
@@ -32,7 +32,7 @@
 
 binary-arch: install
 	dh binary-arch --before strip
-	dh_strip --dbg-package=libinnodb-dbg
+	dh_strip --dbgsym-migration='libinnodb-dbg (<< 1.0.6.6750-2)'
 	dh binary-arch --after strip