[Pkg-mono-svn-commits] rev 1016 - mono/trunk/debian

[Eduard Bloch]

Author: blade
Date: 2004-06-15 15:59:21 -0600 (Tue, 15 Jun 2004)
New Revision: 1016

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/dh_netdeps
Log:
Actually enable the extra .config checks


Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2004-06-15 21:02:29 UTC (rev 1015)
+++ mono/trunk/debian/changelog	2004-06-15 21:59:21 UTC (rev 1016)
@@ -1,17 +1,17 @@
-mono (0.95-0pre1v3) unstable; urgency=low
+mono (0.95-0pre1v4) unstable; urgency=low
 
   * (NOT RELEASED YET) New upstream release
   * Eduard Bloch
     + setting virtual ".shlibs" for libmono via provides, currently
       libmono-0.95
-    + dh_makenetlibs and dh_netdeps tools to manage assembly dependencies in
-      the Perl/Python way
+    + created new dh_makenetlibs and dh_netdeps tools to manage assembly
+      dependencies in the Perl/Python way
     + Moved Pablo's dh_installxsp script to mono-utils to mono-utils
     + mono-common.preinst now moves /usr/lib/mono directory (if exists) to
       /usr/share/dotnet
     + moved the check for mono-vs.-mint priority to debian/rules
   * Mirco 'meebey' Bauer
-    + New upstream release
+    + New upstream release updates
     + enabled preview features (.NET 1.2, generics)
   * Michael Schiansky
     + Since beta1 (0.91) dllmaps are handled cleanly (Closes: #241686)

Modified: mono/trunk/debian/dh_netdeps
===================================================================
--- mono/trunk/debian/dh_netdeps	2004-06-15 21:02:29 UTC (rev 1015)
+++ mono/trunk/debian/dh_netdeps	2004-06-15 21:59:21 UTC (rev 1016)
@@ -138,6 +138,7 @@
 
 sub extraDeps {
    my $config=$_[0].".config";
+   return undef if (! -r $config);
    my $ret=undef;
 
    if(!%shlibdata) {
@@ -148,11 +149,9 @@
       }
    }
 
-   if( -r $config) {
-      $config=`cat $config`;
-      while($config=~s/\Wtarget\W*=\W*(\w[\w.\-\d]+)//) {
-         $ret.= (", ".$shlibdata{$1}) if(defined($shlibdata{$1}));
-      }
+   $config=`cat $config`;
+   while($config=~s/\Wtarget\W*=\W*(\w[\w.\-\d]+)//) {
+      $ret.= (", ".$shlibdata{$1}) if(defined($shlibdata{$1}));
    }
    $ret=~s/^, // if $ret;
    return $ret;
@@ -171,9 +170,9 @@
         local *F;
         my $file = $_;
         return unless open F, "monodis --assemblyref $file |";
-#        if ( my $extra = extraDeps ($file) ) {
-#           push ( @depkgs, $extra );
-#        }
+        if ( my $extra = extraDeps ($file) ) {
+           push ( @depkgs, $extra );
+        }
         our( $vers, $name, $key );
         while (<F>) {
             $vers = $1 if /Version=(.*)\n/;