Bug#856159: libidn: diff for NMU version 1.33-2.2

[Emilio Pozuelo Monfort]

Control: tags 856159 + patch
Control: tags 856159 + pending
Control: tags 892540 + pending

Dear maintainer,

I've prepared an NMU for libidn (versioned as 1.33-2.2) and
uploaded it. Here's the diff.

Cheers,
Emilio

diff -Nru libidn-1.33/debian/changelog libidn-1.33/debian/changelog
--- libidn-1.33/debian/changelog        2017-12-17 00:04:41.000000000 +0100
+++ libidn-1.33/debian/changelog        2018-04-10 18:03:08.000000000 +0200
@@ -1,3 +1,16 @@
+libidn (1.33-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Matthias Klose ]
+  * Build using default-jdk instead of gcj-jdk (Closes: #892540)
+
+  [ Emilio Pozuelo Monfort ]
+  * Set libidn11 priority to optional rather than standard.
+  * Mark libidn11-dev as Multi-Arch same. (Closes: #856159)
+
+ -- Emilio Pozuelo Monfort <address@hidden>  Tue, 10 Apr 2018 18:03:08 +0200
+
 libidn (1.33-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru libidn-1.33/debian/control libidn-1.33/debian/control
--- libidn-1.33/debian/control  2017-12-16 23:00:02.000000000 +0100
+++ libidn-1.33/debian/control  2018-04-10 17:23:25.000000000 +0200
@@ -5,7 +5,7 @@
 Uploaders: Simon Josefsson <address@hidden>, Ondřej Surý <address@hidden>
 Standards-Version: 3.9.8
 Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint (>= 0.19.3), 
help2man, texinfo
-Build-Depends-Indep: gcj-jdk, fastjar
+Build-Depends-Indep: default-jdk
 Homepage: https://www.gnu.org/software/libidn/
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libidn.git
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/libidn.git
@@ -28,6 +28,7 @@
 Architecture: any
 Depends: libidn11 (= ${binary:Version}), pkg-config, ${misc:Depends}
 Conflicts: libidn9-dev
+Multi-Arch: same
 Description: Development files for GNU Libidn, an IDN library
  GNU Libidn is a fully documented implementation of the Stringprep,
  Punycode and IDNA specifications.  Libidn's purpose is to encode and
@@ -38,7 +39,6 @@
  information, API man pages, and the Libidn manual.
 
 Package: libidn11
-Priority: standard
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libidn9-dev