Package: libgtk2.0-dev
Version: 2.24.25-1
Tags: patch
Followup-For: Bug #689097

Dear Maintainer,

I'm attaching a patch to make some gtk+ packages multiarch-compatible and get 
closer to
being able to make libgtk2.0-dev itself Multi-Arch: same.

* Mark the gtk2.0-examples package as Multi-Arch: foreign.

* Now that the GObject introspection files can be put in
  /usr/lib/<triplet>/girepository-1.0, do so in the gir1.2-gtk-2.0 package and 
mark it
  as Multi-Arch: same.

What will be left then is:
* In libgtk2.0-devi: /usr/bin/dh_gtkmodules contains some /usr/lib/<triplet> 
paths.

* In libgtk2.0-0-dbg: /usr/lib/debug/usr/bin/gtk-demo contains the debug 
information for
  this binary of the gtk2.0-examples package.


-- 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 libgtk2.0-dev depends on:
ii  gir1.2-gtk-2.0        2.24.25-1
ii  libatk1.0-dev         2.14.0-1
ii  libcairo2-dev         1.14.0-2.1
ii  libgdk-pixbuf2.0-dev  2.31.1-2+b1
ii  libglib2.0-dev        2.42.1-1
ii  libgtk2.0-0           2.24.25-1
ii  libgtk2.0-common      2.24.25-1
ii  libpango1.0-dev       1.36.8-3
ii  libx11-dev            2:1.6.2-3
ii  libxcomposite-dev     1:0.4.4-1
ii  libxcursor-dev        1:1.1.14-1+b1
ii  libxdamage-dev        1:1.1.4-2+b1
ii  libxext-dev           2:1.3.3-1
ii  libxfixes-dev         1:5.0.1-2+b2
ii  libxi-dev             2:1.7.4-1+b2
ii  libxinerama-dev       2:1.1.3-1+b1
ii  libxml2-utils         2.9.1+dfsg1-4
ii  libxrandr-dev         2:1.4.2-1+b1
ii  pkg-config            0.28-1

Versions of packages libgtk2.0-dev recommends:
ii  debhelper  9.20141022
ii  python     2.7.8-3

Versions of packages libgtk2.0-dev suggests:
pn  libgtk2.0-doc  <none>

-- no debconf information
diff -ur gtk+-2.24.25.orig/debian/control.in gtk+-2.24.25/debian/control.in
--- gtk+-2.24.25.orig/debian/control.in	2015-02-12 16:05:57.000000000 +0100
+++ gtk+-2.24.25/debian/control.in	2015-02-12 19:30:24.018571814 +0100
@@ -49,6 +49,8 @@
 
 Package: @SHARED_PKG@
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: @COMMON_PKG@,
          ${misc:Depends},
          ${shlibs:Depends},
@@ -58,8 +60,6 @@
             @BIN_PKG@
 Suggests: librsvg2-common,
           gvfs
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Description: GTK+ graphical user interface library
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -90,11 +90,11 @@
 Package: @COMMON_PKG@
 Section: misc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Recommends: @SHARED_PKG@
 Replaces: @SHARED_PKG@ (<< 2.24.8-2)
 Breaks: @SHARED_PKG@ (<< 2.24.8-2)
-Multi-Arch: foreign
 Description: common files for the GTK+ graphical user interface library
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -106,10 +106,10 @@
 Package: @BIN_PKG@
 Section: misc
 Architecture: any
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          @SHARED_PKG@ (= ${binary:Version}),
          @COMMON_PKG@
-Multi-Arch: foreign
 Description: programs for the GTK+ graphical user interface library
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -176,12 +176,12 @@
 Package: @DOC_PKG@
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Recommends: libglib2.0-doc,
             libatk1.0-doc,
             libpango1.0-doc
 Suggests: devhelp
-Multi-Arch: foreign
 Description: documentation for the GTK+ graphical user interface library
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -195,6 +195,7 @@
 Section: x11
 Priority: extra
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          @SHARED_PKG@ (= ${binary:Version})
@@ -226,6 +227,7 @@
 Package: gir1.2-gtk-2.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: @COMMON_PKG@,
          ${misc:Depends},
          ${shlibs:Depends},
@@ -244,11 +246,11 @@
 
 Package: libgail18
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          @SHARED_PKG@ (= ${binary:Version})
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Description: GNOME Accessibility Implementation Library -- shared libraries
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
  loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -259,11 +261,11 @@
 
 Package: libgail-common
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libgail18 (= ${binary:Version})
 Breaks: libgnome2-0 (<< 2.32.1-2)
-Multi-Arch: same
 Description: GNOME Accessibility Implementation Library -- common modules
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
  loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -291,12 +293,12 @@
  This package contains the development files for Gail.
 
 Package: libgail-dbg
-Architecture: any
 Section: debug
 Priority: extra
+Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, libgail18 (= ${binary:Version})
 Recommends: @DEBUG_PKG@
-Multi-Arch: same
 Description: Gail libraries and debugging symbols
  Gail is the "GNOME Accessibility Implementation Library".
  .
@@ -305,11 +307,11 @@
  Most people will not need this package.
 
 Package: libgail-doc
-Architecture: all
 Section: doc
+Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Suggests: devhelp
-Multi-Arch: foreign
 Description: documentation files of the Gail library
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
  loadable at runtime by a GTK+ application. Once loaded, those parts of
diff -ur gtk+-2.24.25.orig/debian/gir1.2-gtk-2.0.install.in gtk+-2.24.25/debian/gir1.2-gtk-2.0.install.in
--- gtk+-2.24.25.orig/debian/gir1.2-gtk-2.0.install.in	2012-10-22 19:01:19.000000000 +0200
+++ gtk+-2.24.25/debian/gir1.2-gtk-2.0.install.in	2015-02-12 19:20:33.937331827 +0100
@@ -1 +1 @@
-debian/install/shared/@LIBDIR@/girepository-1.0/ usr/lib/
+debian/install/shared/@LIBDIR@/girepository-1.0/ usr/lib/@LIBDIR@/

Reply via email to