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

[pochu at users.alioth.debian.org]

Author: pochu
Date: Mon Dec 13 23:19:28 2010
New Revision: 25935

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25935
Log:
  - Use the extra dirs to look for the corresponding girs.
  - Also use them to look for the dependencies in the same package.

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=25935&op=diff
==============================================================================
--- packages/experimental/gobject-introspection/debian/changelog [utf-8] (original)
+++ packages/experimental/gobject-introspection/debian/changelog [utf-8] Mon Dec 13 23:19:28 2010
@@ -1,7 +1,8 @@
 gobject-introspection (0.9.12-5) UNRELEASED; urgency=low
 
   * debian/dh_girepository:
-    - Also use the extra dirs to look for the corresponding girs.
+    - Use the extra dirs to look for the corresponding girs.
+    - Also use them to look for the dependencies in the same package.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 13 Dec 2010 23:39:20 +0100
 

Modified: packages/experimental/gobject-introspection/debian/dh_girepository
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gobject-introspection/debian/dh_girepository?rev=25935&op=diff
==============================================================================
--- packages/experimental/gobject-introspection/debian/dh_girepository [utf-8] (original)
+++ packages/experimental/gobject-introspection/debian/dh_girepository [utf-8] Mon Dec 13 23:19:28 2010
@@ -146,9 +146,11 @@
     my $fullpath = "$typelib_path/$req";
 
     verbose_print ("Dependency: $req");
-    if (-f tmpdir($package)."$fullpath") {
-        verbose_print("  found in the same package");
-        return;
+    foreach my $girdir (@girdirs) {
+        if (-f tmpdir($package)."$girdir/$req") {
+            verbose_print("  found in the same package");
+            return;
+        }
     }
     foreach my $otherpkg (@archpackages) {
         if (-f tmpdir($otherpkg)."$fullpath") {