Merge ~ahasenack/ubuntu/+source/krb5:disco-krb5-merge into ubuntu/+source/krb5:debian/sid

[Andreas Hasenack]

Merge from debian. This would have dropped all our delta and become a sync, were it not for a small typo in the dep8 tests that makes them fail. This was fixed in debian (https://salsa.debian.org/debian/krb5/merge_requests/3) and there is a good chance this package can become a sync the next time.

Bileto ticket: https://bileto.ubuntu.com/#/ticket/3513

The only red is in postgresql, which is unrelated and afaik being fixed by foundations.

[Christian Ehrhardt  (paelzer)]

LGTM and looking forward to see it being a sync soon.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, tagged and uploaded.

diff --git a/debian/changelog b/debian/changelog
index 80bbac9..5617e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+krb5 (1.16.1-1ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable.
+  * Dropped:
+    - Add DEP8 tests (LP #1677881):
+      + d/t/util: common functions used in the tests
+      + d/t/control, d/t/kinit: simple kinit test
+      + d/t/control, d/t/slapd-gssapi: DEP8 test for service principals
+      [Adopted in 1.16.1-1]
+  * Added:
+    - d/t/util: fix typo
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 12 Nov 2018 17:37:06 -0200
+
 krb5 (1.16.1-1) unstable; urgency=medium
 
   * New upstream release
@@ -14,6 +28,21 @@ krb5 (1.16.1-1) unstable; urgency=medium
 
  -- Sam Hartman <[e-mail]>  Mon, 16 Jul 2018 20:09:54 -0400
 
+krb5 (1.16-2ubuntu1) cosmic; urgency=medium
+
+  * Add DEP8 tests (LP: #1677881):
+    - d/t/util: common functions used in the tests
+    - d/t/control, d/t/kinit: simple kinit test
+    - d/t/control, d/t/slapd-gssapi: DEP8 test for service principals
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 06 Jul 2018 15:39:44 -0300
+
+krb5 (1.16-2build1) bionic; urgency=high
+
+  * No change rebuild against openssl1.1.
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 05 Feb 2018 16:50:17 +0000
+
 krb5 (1.16-2) unstable; urgency=medium
 
   * Update location of packaging GIT repository
diff --git a/debian/control b/debian/control
index 263a520..6dd35c5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 10), byacc | bison,
  libverto-dev (>= 0.2.4), pkg-config
 Build-Depends-Indep: python, python-cheetah, python-lxml, python-sphinx, doxygen, doxygen-latex, texlive-generic-extra
 Standards-Version: 4.1.1
-Maintainer: Sam Hartman <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Sam Hartman <[e-mail]>
 Uploaders: Russ Allbery <[e-mail]>, Benjamin Kaduk <[e-mail]>
 Homepage: http://web.mit.edu/kerberos/
 VCS-Git: https://salsa.debian.org/debian/krb5
diff --git a/debian/tests/util b/debian/tests/util
index 6d6c584..4dbf029 100644
--- a/debian/tests/util
+++ b/debian/tests/util
@@ -3,7 +3,7 @@
 # Copyright 2018 Canonical Ltd.
 # This code is licensed under the same terms as MIT Kerberos.
 
-Set-ex
+set -ex
 
 adjust_hostname() {
     local myhostname="$1"