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

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Feb 10 00:18:11 2011
New Revision: 26515

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26515
Log:
* debian/dh_girepository:
  + Look for libraries in private directories. Closes: #612148.

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=26515&op=diff
==============================================================================
--- packages/experimental/gobject-introspection/debian/changelog [utf-8] (original)
+++ packages/experimental/gobject-introspection/debian/changelog [utf-8] Thu Feb 10 00:18:11 2011
@@ -6,6 +6,8 @@
     + debian/rules:
       - Fail the build if the symbols file is outdated.
       - Make the shlibs file always depend on the latest upstream version.
+  * debian/dh_girepository:
+    + Look for libraries in private directories. Closes: #612148.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 09 Feb 2011 21:51:34 +0000
 

Modified: packages/experimental/gobject-introspection/debian/dh_girepository
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gobject-introspection/debian/dh_girepository?rev=26515&op=diff
==============================================================================
--- packages/experimental/gobject-introspection/debian/dh_girepository [utf-8] (original)
+++ packages/experimental/gobject-introspection/debian/dh_girepository [utf-8] Thu Feb 10 00:18:11 2011
@@ -46,7 +46,9 @@
 =item I<private [...]>
 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>.
+directory, such as /usr/lib/<package>. Library dependencies are also looked
+there, in case your typelib depends on a library that you ship on a private
+directory.
 
 =back
 
@@ -79,7 +81,8 @@
 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");
+my @privlibdirs = (@ARGV);
+my @libdirs = ("/lib/$arch_triplet", "/lib", "/usr/lib/$arch_triplet", "/usr/lib", @privlibdirs);
 my $format;
 
 # Get Build-Depends in an array
@@ -325,7 +328,7 @@
 
         # Let dpkg-shlibdeps generate the corresponding dependencies
         # It must run first since otherwise it overwrites the variable
-        doit (("dpkg-shlibdeps", "-pgir", "-Tdebian/${ext}substvars", "-xlibc6", "-xlibc0", @bin_files));
+        complex_doit ("LD_LIBRARY_PATH=" . join (':', @privlibdirs) . " dpkg-shlibdeps -pgir -Tdebian/${ext}substvars -xlibc6 -xlibc0 @bin_files");
     }
     doit (("rm", "-f", @c_files, @bin_files));