r25932 - in /packages/experimental/gobject-introspection/debian: changelog dh_girepository

[pochu at users.alioth.debian.org]

Author: pochu
Date: Mon Dec 13 22:53:13 2010
New Revision: 25932

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25932
Log:
* debian/dh_girepository:
  - Also use the extra dirs to look for the corresponding girs.

Modified:
    packages/experimental/gobject-introspection/debian/changelog
    packages/experimental/gobject-introspection/debian/dh_girepository

Modified: packages/experimental/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gobject-introspection/debian/changelog?rev=25932&op=diff
==============================================================================
--- packages/experimental/gobject-introspection/debian/changelog [utf-8] (original)
+++ packages/experimental/gobject-introspection/debian/changelog [utf-8] Mon Dec 13 22:53:13 2010
@@ -1,3 +1,10 @@
+gobject-introspection (0.9.12-5) UNRELEASED; urgency=low
+
+  * debian/dh_girepository:
+    - Also use the extra dirs to look for the corresponding girs.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 13 Dec 2010 23:39:20 +0100
+
 gobject-introspection (0.9.12-4) experimental; urgency=low
 
   * debian/policy:

Modified: packages/experimental/gobject-introspection/debian/dh_girepository
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gobject-introspection/debian/dh_girepository?rev=25932&op=diff
==============================================================================
--- packages/experimental/gobject-introspection/debian/dh_girepository [utf-8] (original)
+++ packages/experimental/gobject-introspection/debian/dh_girepository [utf-8] Mon Dec 13 22:53:13 2010
@@ -44,8 +44,9 @@
 analyzed.
 
 =item I<private [...]>
-List of directories where to look for typelibs. Useful when the package
-installs its typelibs in a private directory, such as /usr/lib/<package>.
+List of directories where to look for typelibs and the corresponding .gir
+files. Useful when the package installs its typelibs in a private
+directory, such as /usr/lib/<package>.
 
 =back
 
@@ -73,7 +74,9 @@
 my @archpackages = getpackages("arch");
 
 my $typelib_path = "/usr/lib/girepository-1.0";
+my @typelibdirs = (@ARGV, $typelib_path);
 my $gir_path = "/usr/share/gir-1.0";
+my @girdirs = (@ARGV, $gir_path);
 my $arch_triplet = `dpkg-architecture -qDEB_BUILD_GNU_TYPE`;
 chomp $arch_triplet;
 my @libdirs = ("/lib/$arch_triplet", "/lib", "/usr/lib/$arch_triplet", "/usr/lib");
@@ -123,10 +126,12 @@
         }
     }
     foreach my $otherpkg (@archpackages) {
-        $f = tmpdir($otherpkg)."$gir_path/$req.gir";
-        if (-f $f) {
-            verbose_print ("Found $req.gir in $otherpkg package");
-            return $f;
+        foreach my $girdir (@girdirs) {
+            $f = tmpdir($otherpkg)."$girdir/$req.gir";
+            if (-f $f) {
+                verbose_print ("Found $req.gir in $otherpkg package");
+                return $f;
+            }
         }
     }
     error("Could not find gir file for $req.typelib");
@@ -235,8 +240,7 @@
     my @bin_files = ();
     my @c_files = ();
     my @typelib_deps = ();
-    push (@ARGV, $typelib_path);
-    foreach my $dir (@ARGV) {
+    foreach my $dir (@typelibdirs) {
       my $typelibdir = "$tmp$dir";
       next unless -d $typelibdir;
       opendir(DIRHANDLE, $typelibdir);