[Pkg-mono-svn-commits] rev 1883 - in cli-common/trunk: . debian
Mirco Bauer
meebey-guest@costa.debian.org
Sun, 10 Jul 2005 20:37:43 +0000
Author: meebey-guest
Date: 2005-07-10 20:37:43 +0000 (Sun, 10 Jul 2005)
New Revision: 1883
Added:
cli-common/trunk/debian/compat
Modified:
cli-common/trunk/debian/changelog
cli-common/trunk/dh_clideps
cli-common/trunk/dh_makeclilibs
Log:
- applied patch by Ingo Saitz which allows now to use the built Mono (in debian/).
Modified: cli-common/trunk/debian/changelog
===================================================================
--- cli-common/trunk/debian/changelog 2005-07-10 20:36:50 UTC (rev 1882)
+++ cli-common/trunk/debian/changelog 2005-07-10 20:37:43 UTC (rev 1883)
@@ -2,9 +2,12 @@
* NOT RELEASED YET
* Mirco 'meebey' Bauer
- + changed title of generated manpages (Closes: #288198)
+ + Changed title of generated manpages. (Closes: #288198)
+ + Applied patch by Ingo Saitz that allows to use a built mono in debian/
+ (using internal-mono switch).
+ + Added debian/compat.
- -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org> Sun, 29 May 2005 19:52:32 +0200
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org> Sun, 10 Jul 2005 19:46:23 +0200
cli-common (0.1.3.0) unstable; urgency=low
Added: cli-common/trunk/debian/compat
===================================================================
--- cli-common/trunk/debian/compat 2005-07-10 20:36:50 UTC (rev 1882)
+++ cli-common/trunk/debian/compat 2005-07-10 20:37:43 UTC (rev 1883)
@@ -0,0 +1 @@
+4
\ No newline at end of file
Modified: cli-common/trunk/dh_clideps
===================================================================
--- cli-common/trunk/dh_clideps 2005-07-10 20:36:50 UTC (rev 1882)
+++ cli-common/trunk/dh_clideps 2005-07-10 20:37:43 UTC (rev 1883)
@@ -34,7 +34,7 @@
which refers to the particular shared library (by its SONAME).
If you use this program, your package should build-depend on cli-common
-(>= 0.1).
+(>= 0.1.3).
=head1 OPTIONS
@@ -53,7 +53,7 @@
This option can be used to specify a relaxed dependency on the VM
by-hand in the control file, eg. "mono-jit | cli-virtual-machine".
-=item B<--internal-mono>
+=item B<internal-mono>
Uses the mono runtime in . (used for bootstrapping mono packages)
@@ -66,8 +66,13 @@
my $cli_version = `$cli --version 2>&1`;
my $cli_parser;
-if (-x "/usr/bin/monodis") {
+if (defined($ARGV[0]) && $ARGV[0] eq "internal-mono") {
$clr = "mono";
+ $cli_parser = "MONO_PATH=debian/tmp/usr/lib/mono debian/tmp/usr/bin/monodis";
+ $cli_version = `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";
verbose_print("Will use Mono (/usr/bin/monodis) for CIL parsing.");
} elsif (-x "/usr/bin/ildasm") {
@@ -116,7 +121,7 @@
my $fh;
my %libdata;
-open($fh, "cat /var/lib/dpkg/info/*.clilibs debian/*/DEBIAN/clilibs 2>/dev/null |");
+open($fh, "cat /var/lib/dpkg/info/*.clilibs debian/*/DEBIAN/clilibs 2> /dev/null |");
while (<$fh>) {
/(\S+)\s+(\S+)\s+(\w.*)\n?/;
$libdata{"$1/$2"} = $3;
@@ -156,14 +161,7 @@
$key = $vers . "__" . lc($key);
my $compat = "$name/$key";
if (!defined($libdata{$compat})) {
- # reuse the key variable
- #if ( resolveShlib( $file, $name, \$key ) ) {
- # push ( @depkgs, $key );
- #}
- #else
- {
- warning("Warning! No Debian dependency data for $name ($key)!");
- }
+ warning("Warning! No Debian dependency data for $name ($key)!");
} else {
push(@depkgs, $libdata{$compat});
}
@@ -178,12 +176,14 @@
for (split(/\s*,\s*/, $_ )) {
# filter dupes and don't depend on this package
/^(\S+)/;
- $depkgsFiltered{$_} = 1 if($1 ne $package);
+ if ($1 ne $package) {
+ $depkgsFiltered{$_} = 1;
+ }
}
}
# now filter the dupes coming from shlibs
if (defined($dh{D_FLAG})) {
- if(open($fh, "<debian/$package.substvars" )) {
+ if (open($fh, "< debian/$package.substvars" )) {
while (<$fh>) {
if (/^shlibs:Depends=(.*)\n?/) {
for (split(/\s*,\s*/, $1)) {
Modified: cli-common/trunk/dh_makeclilibs
===================================================================
--- cli-common/trunk/dh_makeclilibs 2005-07-10 20:36:50 UTC (rev 1882)
+++ cli-common/trunk/dh_makeclilibs 2005-07-10 20:37:43 UTC (rev 1883)
@@ -122,14 +122,17 @@
my $cli = '/usr/bin/cli';
my $cli_version = `$cli --version 2>&1`;
my $cli_parser;
+my $sn = 'sn';
-if (-x "/usr/bin/monodis") {
+if (defined($ARGV[0]) && $ARGV[0] eq "internal-mono") {
$clr = "mono";
- if (defined($dh{INTERNAL_MONO_FLAG})) {
- $cli_parser = "";
- } else {
- $cli_parser = "/usr/bin/monodis";
- }
+ my $mono_path = "MONO_PATH=debian/tmp/usr/lib/mono/1.0:debian/tmp/usr/lib/mono/2.0";
+ $cli_parser = "$mono_path mono/dis/.libs/monodis";
+ $sn = "$mono_path debian/tmp/usr/bin/mono debian/tmp/usr/lib/mono/1.0/sn.exe";
+ verbose_print("Will use build Mono (debian/tmp/usr/bin/monodis) for CIL parsing.");
+} elsif (-x "/usr/bin/monodis") {
+ $clr = "mono";
+ $cli_parser = "/usr/bin/monodis";
verbose_print("Will use Mono (/usr/bin/monodis) for CIL parsing.");
} elsif (-x "/usr/bin/ildasm") {
$clr = "pnet";
@@ -182,7 +185,7 @@
chomp;
my ($library, $ver, $libfile);
$libfile = $_;
- my $sig = `sn -T $_ 2>/dev/null`;
+ my $sig = `$sn -T $_ 2> /dev/null`;
$sig =~ s/.*key token: (\w+).*/$1/is;
if ($sig=~/\s/) {
warning "$libfile has no valid signature, ignoring";