Bug#689124: libatk1.0-dev is not Multi-Arch compatible

[Francois Gouget]

Package: libatk1.0-dev
Version: 2.14.0-1
Followup-For: Bug #689124

Dear Maintainer,

Here's a patch proposal to fix this issue:
* This moves the GIR typelib files to the /usr/lib/<triplet>/girepository-1.0 directory.
  This matches what gir1.2-pango-1.0:amd64 does.

* Then it simply marks the gir1.2-atk-1.0 and libatk1.0-dev packages as Multi-Arch: same.

* Ok, I also think that it would make a lot of sense to have the Architecture and
  Multi-Arch lines together, and the Pre-Depends line right before the Depends one so the
  patch moves around a couple more lines. But those parts are optional, feel free to
  ignore them.

So would that work?


diff -ur atk-2.14.0.orig/debian/control atk-2.14.0/debian/control
--- atk-2.14.0.orig/debian/control	2015-02-10 20:36:42.000000000 +0100
+++ atk-2.14.0/debian/control	2015-02-11 00:27:44.015378230 +0100
@@ -26,11 +26,11 @@
 
 Package: libatk1.0-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libatk1.0-data (= ${source:Version})
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Description: ATK accessibility toolkit
  ATK is a toolkit providing accessibility interfaces for applications or
  other toolkits. By implementing these interfaces, those other toolkits or
@@ -58,8 +58,8 @@
 Package: libatk1.0-data
 Section: misc
 Architecture: all
-Depends: ${misc:Depends}
 Multi-Arch: foreign
+Depends: ${misc:Depends}
 Description: Common files for the ATK accessibility toolkit
  ATK is a toolkit providing accessibility interfaces for applications or
  other toolkits. By implementing these interfaces, those other toolkits or
@@ -71,6 +71,7 @@
 Package: libatk1.0-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          libatk1.0-0 (= ${binary:Version}),
          gir1.2-atk-1.0 (= ${binary:Version}),
@@ -90,9 +91,9 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          libatk1.0-0 (= ${binary:Version})
-Multi-Arch: same
 Description: ATK libraries and debugging symbols
  ATK is a toolkit providing accessibility interfaces for applications or
  other toolkits. By implementing these interfaces, those other toolkits or
@@ -122,6 +123,7 @@
 Package: gir1.2-atk-1.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          ${gir:Depends}
diff -ur atk-2.14.0.orig/debian/gir1.2-atk-1.0.install atk-2.14.0/debian/gir1.2-atk-1.0.install
--- atk-2.14.0.orig/debian/gir1.2-atk-1.0.install	2011-06-27 16:14:09.000000000 +0200
+++ atk-2.14.0/debian/gir1.2-atk-1.0.install	2015-02-11 00:15:37.488551453 +0100
@@ -1,1 +1,1 @@
-usr/lib/*/girepository-1.0/ usr/lib
+usr/lib/*/girepository-1.0/



-- System Information:
Debian Release: 8.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages libatk1.0-dev depends on:
ii  gir1.2-atk-1.0  2.14.0-1
ii  libatk1.0-0     2.14.0-1
ii  libglib2.0-dev  2.42.1-1
ii  pkg-config      0.28-1

libatk1.0-dev recommends no packages.

libatk1.0-dev suggests no packages.

-- no debconf information