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

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Dec  1 21:22:10 2011
New Revision: 31912

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31912
Log:
dh_girepository: don't override LD_LIBRARY_PATH completely; fakeroot needs
it.

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=31912&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/changelog [utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/changelog [utf-8] Thu Dec  1 21:22:10 2011
@@ -5,6 +5,10 @@
 
   [ Josselin Mouette ]
   * Make the -dev package depend on g-i. Closes: #649859.
+
+  [ Loïc Minier ]
+  * dh_girepository: don't override LD_LIBRARY_PATH completely; fakeroot needs
+    it.
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 20 Nov 2011 15:54:11 +0000
 

Modified: desktop/unstable/gobject-introspection/debian/dh_girepository
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/dh_girepository?rev=31912&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/dh_girepository [utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/dh_girepository [utf-8] Thu Dec  1 21:22:10 2011
@@ -328,7 +328,9 @@
 
         # Let dpkg-shlibdeps generate the corresponding dependencies
         # It must run first since otherwise it overwrites the variable
-        complex_doit ("LD_LIBRARY_PATH=" . join (':', @privlibdirs) . " dpkg-shlibdeps -pgir -Tdebian/${ext}substvars -xlibc6 -xlibc0 @bin_files");
+        push @privlibdirs, $ENV{"LD_LIBRARY_PATH"} if $ENV{"LD_LIBRARY_PATH"};
+        my $llp = join (":", @privlibdirs);
+        complex_doit ("LD_LIBRARY_PATH=$llp dpkg-shlibdeps -pgir -Tdebian/${ext}substvars -xlibc6 -xlibc0 @bin_files");
     }
     doit (("rm", "-f", @c_files, @bin_files));