Merge ~ahasenack/ubuntu/+source/krb5:focal-krb5-i386-deps into ubuntu/+source/krb5:ubuntu/devel

[Andreas Hasenack]

As seen on http://autopkgtest.ubuntu.com/packages/krb5/focal/i386

specifically:
  Depends: krb5-doc:i386 but it is not installable

Make krb5-doc:i386 installable on amd64

Test on an amd64 host:

sudo dpkg --add-architecture i386
sudo apt update
sudo apt install krb5-doc:i386

Without the fix, the above fails like this:
Package krb5-doc:i386 is not available, but is referred to by another package.
This may mean that the package is missing, has been obsoleted, or
is only available from another source

E: Package 'krb5-doc:i386' has no installation candidate

With the fix it installs normally. A better test would be to apt install --install-suggests something like krb5-multidev:i386, but that will fail unless https://code.launchpad.net/~ahasenack/ubuntu/+source/kerberos-configs/+git/kerberos-configs/+merge/377110 is landed already, so the above is a simpler test case.

I'll proposed this for debian as well, and update this MP once I have that info.

For reference: https://wiki.ubuntu.com/MultiarchCross

[Christian Ehrhardt  (paelzer)]

I'd like if we could add a link to https://lists.ubuntu.com/archives/ubuntu-devel/2019-December/040859.html to the changelog or the d/control to help people finding the reasoning for this.

Since this is Ubuntu only I'm not sure if we can submit that to Debian before they remove i386.
Do you think we can?

The change itself LGTM and I'm +1 on the upload with the link above added.

review: Approve

[Christian Ehrhardt  (paelzer)]

wait - no update maintainer?

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

ups

[Andreas Hasenack (ahasenack)]

Sent to debian via https://salsa.debian.org/debian/krb5/merge_requests/4

[Andreas Hasenack (ahasenack)]

krb5 is now an ftbfs in focal due to the python2 changes:
The following packages have unmet dependencies:
 builddeps:./ : Depends: python but it is not going to be installed
                Depends: python-sphinx but it is not going to be installed
                Depends: doxygen-latex but it is not going to be installed
E: Unable to correct problems, you have held broken packages.

[Christian Ehrhardt  (paelzer)]

+1 after update-metadata was added

review: Approve

[Andreas Hasenack (ahasenack)]

krb5 builds fine now, I'll upload.

Tagging and uploading 799f547fc9df5f88de0256beb3ce292a52b53cc8

$ git push pkg upload/1.17-6ubuntu1
Enumerating objects: 17, done.
Counting objects: 100% (17/17), done.
Delta compression using up to 4 threads
Compressing objects: 100% (13/13), done.
Writing objects: 100% (13/13), 1.76 KiB | 69.00 KiB/s, done.
Total 13 (delta 9), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/krb5
 * [new tag] upload/1.17-6ubuntu1 -> upload/1.17-6ubuntu1

$ dput ubuntu ../krb5_1.17-6ubuntu1_source.changes
Checking signature on .changes
gpg: ../krb5_1.17-6ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../krb5_1.17-6ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading krb5_1.17-6ubuntu1.dsc: done.
  Uploading krb5_1.17-6ubuntu1.debian.tar.xz: done.
  Uploading krb5_1.17-6ubuntu1_source.buildinfo: done.
  Uploading krb5_1.17-6ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 81b877a..2d25e93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+krb5 (1.17-6ubuntu1) focal; urgency=medium
+
+  * d/control: add "Multi-Arch: foreign" to allow krb5-doc to be used as
+    a dependency of architecture-dependent packages. In particular, this
+    lets krb5-doc:i386 be installed on an amd64 host. See
+    https://lists.ubuntu.com/archives/ubuntu-devel/2019-December/040859.html
+    for details.
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 06 Jan 2020 16:24:39 -0300
+
 krb5 (1.17-6) unstable; urgency=medium
 
   * Stop depending on texlive-generic-extra, which is no longer built,
diff --git a/debian/control b/debian/control
index f78fa16..9e8758c 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
 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
@@ -235,6 +236,7 @@ Description: TLS plugin for MIT Kerberos
 
 Package: krb5-doc
 Architecture: all
+Multi-Arch: foreign
 Conflicts: heimdal-docs
 Section: doc
 Depends: ${misc:Depends}