[Pkg-mono-svn-commits] rev 4038 - in cli-common/trunk: . debian

[Mirco Bauer]

Author: meebey
Date: 2009-08-01 13:47:03 +0000 (Sat, 01 Aug 2009)
New Revision: 4038

Modified:
   cli-common/trunk/debian/changelog
   cli-common/trunk/dh_clideps
Log:
Patch from Sam Hocevar <sho at debian.org>:

  * debian/dh_clideps:
    + Add support for the "os" attribute in <dllmap> entries
      (http://www.mono-project.com/Config_DllMap).



Modified: cli-common/trunk/debian/changelog
===================================================================
--- cli-common/trunk/debian/changelog	2009-07-20 19:12:15 UTC (rev 4037)
+++ cli-common/trunk/debian/changelog	2009-08-01 13:47:03 UTC (rev 4038)
@@ -1,3 +1,11 @@
+cli-common (0.6.3) UNRELEASED; urgency=low
+
+  * debian/dh_clideps:
+    + Add support for the "os" attribute in <dllmap> entries
+      (http://www.mono-project.com/Config_DllMap).
+
+ -- Sam Hocevar <sho at debian.org>  Sat, 01 Aug 2009 11:22:34 +0000
+
 cli-common (0.6.2) unstable; urgency=low
 
   * cli-nant.make

Modified: cli-common/trunk/dh_clideps
===================================================================
--- cli-common/trunk/dh_clideps	2009-07-20 19:12:15 UTC (rev 4037)
+++ cli-common/trunk/dh_clideps	2009-08-01 13:47:03 UTC (rev 4038)
@@ -370,8 +370,22 @@
    foreach my $mapentry (@mapentries) {
      my $dll = $mapentry->getAttribute("dll");
      my $target = $mapentry->getAttribute("target");
-     #verbose_print("DLL map: '$dll' target: '$target'");
-     $dllmapdata->{$dll} = $target;
+     my $os = $mapentry->getAttribute("os");
+     my $valid = 1;
+     if ($os) {
+       $valid = ($os =~ m/^!/);
+       $os =~ s/^!//;
+       foreach (split(/,/, $os)) {
+         if ($_ eq "linux") {
+           $valid = !$valid;
+           last;
+         }
+       }
+     }
+     if ($valid) {
+       verbose_print("DLL map: '$dll' target: '$target'");
+       $dllmapdata->{$dll} = $target;
+     }
    }
 }