r43337 - in /desktop/unstable/gobject-introspection/debian: changelog dh_girepository

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Oct  1 21:44:59 2014
New Revision: 43337

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43337
Log:
If gir packages install typelib files in multiarch libdir, dh_girepository
will add a versioned dependency on libgirepository-1.0-1 (>= 1.41.4-1) to
ensure a multiarch capable version of libgirepository-1.0-1 is installed.

Modified:
    desktop/unstable/gobject-introspection/debian/changelog
    desktop/unstable/gobject-introspection/debian/dh_girepository

Modified: desktop/unstable/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/changelog?rev=43337&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/changelog	[utf-8] Wed Oct  1 21:44:59 2014
@@ -1,3 +1,11 @@
+gobject-introspection (1.42.0-2) UNRELEASED; urgency=medium
+
+  * If gir packages install typelib files in multiarch libdir, dh_girepository
+    will add a versioned dependency on libgirepository-1.0-1 (>= 1.41.4-1) to
+    ensure a multiarch capable version of libgirepository-1.0-1 is installed.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 01 Oct 2014 23:41:42 +0200
+
 gobject-introspection (1.42.0-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gobject-introspection/debian/dh_girepository
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/dh_girepository?rev=43337&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/dh_girepository	[utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/dh_girepository	[utf-8] Wed Oct  1 21:44:59 2014
@@ -258,6 +258,8 @@
     my @bin_files = ();
     my @c_files = ();
     my @typelib_deps = ();
+    my $multiarch_required = 0;
+
     foreach my $dir (@typelibdirs) {
         my $typelibdir = "$tmp$dir";
         next unless -d $typelibdir;
@@ -331,6 +333,9 @@
                 doit (("gcc", "-shared", "-fPIC", "-o", $bin_file, $c_file, @libraries));
                 push @bin_files, $bin_file;
             }
+            if ($typelibdir =~ $typelib_multiarch_path) {
+                $multiarch_required = 1;
+            }
         }
     }
     if (@bin_files) {
@@ -351,6 +356,12 @@
     foreach my $dep (@typelib_deps) {
         require_typelib ($dep, $package);
     }
+    # If the typelib file is in a multiarch location, add a versioned
+    # dependency on libgirepository-1.0-1, which is multiarch capable.
+    # This can be dropped again in jessie+1.
+    if ($multiarch_required) {
+        addsubstvar ($package, "gir:Depends", "libgirepository-1.0-1", ">= 1.41.4-1");
+    }
 }
 
 =head1 SEE ALSO