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

Mirco Bauer meebey-guest at costa.debian.org
Sat Sep 23 21:12:31 UTC 2006 

Author: meebey-guest
Date: 2006-09-23 21:12:29 +0000 (Sat, 23 Sep 2006)
New Revision: 2728

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/dh_clideps
   mono/trunk/debian/rules
Log:
1.1.17.1-4 release



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2006-09-23 12:00:03 UTC (rev 2727)
+++ mono/trunk/debian/changelog	2006-09-23 21:12:29 UTC (rev 2728)
@@ -1,3 +1,17 @@
+mono (1.1.17.1-4) unstable; urgency=high
+
+  * Mirco 'meebey' Bauer:
+    + debian/control:
+      - Added zlib1g-dev to build-deps, needed by the System.IO.Compression API
+        in System.dll 2.0. (Closes: #379225)
+    + debian/dh_clideps:
+      - Synced from cli-common package, contains bugfix for libc6 dependencies,
+        makes Mono installable on ia64 again. (Closes: #388557)
+      - Also supports -l switch now for controlling the MONO_GAC_PREFIX
+        environment variable.
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sat, 23 Sep 2006 23:09:49 +0200
+
 mono (1.1.17.1-3) unstable; urgency=high
 
   * Mirco 'meebey' Bauer:

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2006-09-23 12:00:03 UTC (rev 2727)
+++ mono/trunk/debian/control	2006-09-23 21:12:29 UTC (rev 2728)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade at debian.org>, Mirco Bauer <meebey at meebey.net>, Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends: debhelper (>= 5.0.0), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxml-dom-perl, libxslt1-dev, dc, libx11-dev, libxt-dev, libgc-dev [kfreebsd-i386]
+Build-Depends: debhelper (>= 5.0.0), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxml-dom-perl, libxslt1-dev, dc, libx11-dev, libxt-dev, libgc-dev [kfreebsd-i386], zlib1g-dev
 Standards-Version: 3.7.2
 
 Package: mono-common

Modified: mono/trunk/debian/dh_clideps
===================================================================
--- mono/trunk/debian/dh_clideps	2006-09-23 12:00:03 UTC (rev 2727)
+++ mono/trunk/debian/dh_clideps	2006-09-23 21:12:29 UTC (rev 2728)
@@ -7,6 +7,7 @@
 =cut
 
 use strict;
+use Cwd;
 use File::Find;
 use File::Temp;
 use Debian::Debhelper::Dh_Lib;
@@ -54,10 +55,29 @@
 This option can be used to specify a relaxed dependency on the VM/CLR
 by-hand in the control file, eg. "mono-runtime | cli-runtime".
 
+=item B<-l>directory[:directory:directory:..]
+
+Before mondis is run, MONO_GAC_PREFIX have added to it the specified directory (or
+directories -- separate with colons). This is useful for multi-binary packages where a library is
+built in one package and another package contains binaries linked against said library. Relative
+paths will be made absolute for the benefit of monodis.
+
+Note that the directory given should be the complete or relative path to a directory that contains
+the library. See example below.
+
 =item B<internal-mono>                             
 
 Uses the mono runtime in . (used for bootstrapping mono packages)  
 
+=head1 EXAMPLES
+
+Suppose that your source package produces libfoo1.0-cil and libbar1.0-cil
+binary packages.
+In your rules file, first run dh_makeclilibs, then dh_clideps:
+
+  dh_makeclilibs -V
+  dh_clideps -l debian/libfoo1.0-cil/usr:debian/libbar1.0-cil/usr
+
 =cut
 
 init();
@@ -66,17 +86,36 @@
 my $cli = '/usr/bin/cli';
 my $cli_version = `$cli --version 2>&1`;
 my $cli_parser;
+my $cli_parser_paths;
 my $pwd = `pwd`;
 chomp $pwd;
 
+my $mono_gac_prefix = "/usr";
+if ($dh{L_PARAMS}) { 
+  my @paths=();
+  # Add to existing paths, if set.
+  push @paths, $ENV{'MONO_GAC_PREFIX'} if exists $ENV{'MONO_GAC_PREFIX'};
+  foreach (split(/:/, $dh{L_PARAMS})) {
+    # Force the path absolute.
+    if (m:^/:) {
+      push @paths, $_;
+    } else {
+      push @paths, getcwd()."/$_";
+    }
+  }
+  $mono_gac_prefix .= ":" . join(':', @paths);
+}
+
 if (defined($ARGV[0]) && $ARGV[0] eq "internal-mono") {
     $clr = "mono";
-    $cli_parser = "LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib MONO_PATH=$pwd/debian/tmp/usr/lib/mono/1.0:$pwd/debian/tmp/usr/lib/mono/2.0 $pwd/debian/tmp/usr/bin/monodis";
+    $cli_parser = "$pwd/debian/tmp/usr/bin/monodis";
+    $cli_parser_paths = "LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib MONO_PATH=$pwd/debian/tmp/usr/lib/mono/1.0:$pwd/debian/tmp/usr/lib/mono/2.0 MONO_GAC_PREFIX=$mono_gac_prefix ";
     $cli_version = `LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib $pwd/debian/tmp/usr/bin/mono --version 2>&1`;
     verbose_print("Will use built Mono (debian/tmp/usr/bin/monodis) for CIL parsing.");
 } elsif (-x "/usr/bin/monodis") {
     $clr = "mono";
     $cli_parser = "/usr/bin/monodis";
+    $cli_parser_paths = "MONO_GAC_PREFIX=$mono_gac_prefix ";
     verbose_print("Will use Mono (/usr/bin/monodis) for CIL parsing.");
 } elsif (-x "/usr/bin/ildasm") {
     $clr = "pnet";
@@ -116,6 +155,7 @@
   }
 }
 
+
 # Cleaning the paths given on the command line
 foreach (@ARGV) {
     s#/$##;
@@ -180,7 +220,8 @@
         push(@{$refs{suggests}},   @{$shlibRefs{suggests}});
         
         my (undef, $tmpfile) = File::Temp::tempfile("/tmp/".basename($0).".XXXX", UNLINK => 1);
-        my $command = "LANG=C $cli_parser --assemblyref $file 2>&1 > $tmpfile";
+        my $command = "LANG=C $cli_parser_paths MONO_GAC_PREFIX=\$MONO_GAC_PREFIX:$tmp/usr $cli_parser --assemblyref $file 2>&1 > $tmpfile";
+        verbose_print("running CLI parser command: $command");
         
         system($command);
         if ($?) {
@@ -426,6 +467,12 @@
      my $pkg = $pkgref;
      $pkgref =~ m/(\S+)(?:\s+(\(\S+\s+\S+\)))?/;
      my $pkgname = $1;
+     my $ver = $2;
+     # hack for libc6, for ia64 and alpha the package name is libc6.1
+     if ($pkgname =~ m/^libc6/) {
+       $pkg = "libc6 $ver | libc6.1 $ver";
+     }
+     
      if (defined($clideps_override{$pkgname})) {
        verbose_print("Found clideps-overidde: $pkgname for: $package");
 
@@ -461,6 +508,7 @@
 =head1 AUTHOR
 
 Mirco Bauer <meebey at meebey.net>, Eduard Bloch <blade at debian.org>,
-partialy based on code from Brendan O'Dea <bod at debian.org>.
+partialy based on code from Brendan O'Dea <bod at debian.org> and
+Joey Hess <joeyh at debian.org>.
 
 =cut

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2006-09-23 12:00:03 UTC (rev 2727)
+++ mono/trunk/debian/rules	2006-09-23 21:12:29 UTC (rev 2728)
@@ -230,7 +230,7 @@
 	  -plibmono1.0-cil \
 	  -plibmono2.0-cil \
 	  -m $(UPVERSION) internal-mono
-	debian/dh_clideps -i internal-mono
+	DH_VERBOSE=1 debian/dh_clideps -i internal-mono -l debian/tmp
 	# mono-gac needs special runtime dep, to prevent circular dep (mono-runtime <-> mono-gac)
 	debian/dh_clideps -pmono-gac -r internal-mono
 	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)

More information about the Pkg-mono-svn-commits mailing list