[Pkg-mono-svn-commits] rev 3891 - mono/trunk/debian
Mirco Bauer
meebey at alioth.debian.org
Wed Jan 21 23:35:27 UTC 2009
Author: meebey
Date: 2009-01-21 23:35:27 +0000 (Wed, 21 Jan 2009)
New Revision: 3891
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/control
mono/trunk/debian/dh_clideps
mono/trunk/debian/dh_makeclilibs
mono/trunk/debian/rules
Log:
* debian/control:
+ Made dependency on libmono0, libmono-corlib2.0-cil and
libmono-corlib1.0-cil strong for mono-utils to ensure that the correct
versions are pulled in (else we might confuse APT or funny buildds).
+ Bumped debhelper build-dep to >= 7.1, as needed for the bundled
debian/dh_* scripts.
* debian/dh_clideps
debian/dh_makeclilibs:
+ Synced from cli-common 0.6.0, needed for dh 7.1 support.
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2009-01-21 22:49:47 UTC (rev 3890)
+++ mono/trunk/debian/changelog 2009-01-21 23:35:27 UTC (rev 3891)
@@ -22,17 +22,25 @@
* debian/control:
+ Moved cli-* Provides from mono-1.0-devel, mono-mcs and mono-gmcs to
mono-devel, as thats where the cli-* alternatives now lives.
- + Added many stronged versioned binary dependencies to mono-devel as hack
+ + Added many strong versioned binary dependencies to mono-devel as hack
to make experimental buildds happy, else everything needing
mono-devel >= 2.0 will FTBFS in experimental (e.g. KDE4).
(thanks goes to Modestas Vainius for the investigation)
+ + Made dependency on libmono0, libmono-corlib2.0-cil and
+ libmono-corlib1.0-cil strong for mono-utils to ensure that the correct
+ versions are pulled in (else we might confuse APT or funny buildds).
+ + Bumped debhelper build-dep to >= 7.1, as needed for the bundled
+ debian/dh_* scripts.
+ * debian/dh_clideps
+ debian/dh_makeclilibs:
+ + Synced from cli-common 0.6.0, needed for dh 7.1 support.
[ David Paleino ]
* debian/patches/fix_TcpClient_IPv6_r122598.dpatch:
+ Fix bug in TcpClient() implementation preventing IPv6 connections
from working
- -- Mirco Bauer <meebey at debian.org> Tue, 20 Jan 2009 21:53:21 +0100
+ -- Mirco Bauer <meebey at debian.org> Wed, 21 Jan 2009 23:39:02 +0100
mono (2.0.1-1) experimental; urgency=low
Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control 2009-01-21 22:49:47 UTC (rev 3890)
+++ mono/trunk/debian/control 2009-01-21 23:35:27 UTC (rev 3891)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>, Jo Shields <directhex at apebox.org>
-Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxml-dom-perl, libxslt1-dev, dc, libx11-dev, libxt-dev, zlib1g-dev
+Build-Depends: debhelper (>= 7.1), dpkg-dev (>= 1.13.19), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxml-dom-perl, libxslt1-dev, dc, libx11-dev, libxt-dev, zlib1g-dev
Build-Depends-Indep: libgamin-dev, libcups2-dev, librsvg2-dev, libgtk2.0-dev, libgnomeui-dev
Standards-Version: 3.8.0
Homepage: http://www.mono-project.com/
@@ -105,8 +105,7 @@
Section: devel
Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
Replaces: mono-mcs (<= 1.1.6-4)
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmono0 (<< ${mono:next-upversion}), libmono-corlib2.0-cil
-Suggests: libmono-corlib1.0-cil
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmono0 (= ${binary:Version}), libmono-corlib2.0-cil (= ${source:Version}) | libmono-corlib1.0-cil (= ${source:Version})
Description: Mono utilities
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
Modified: mono/trunk/debian/dh_clideps
===================================================================
--- mono/trunk/debian/dh_clideps 2009-01-21 22:49:47 UTC (rev 3890)
+++ mono/trunk/debian/dh_clideps 2009-01-21 23:35:27 UTC (rev 3891)
@@ -28,8 +28,8 @@
will use the embedded dependency information to generate a dependency
string on assembly and shared libs packages, including the setting of
version ranges (as declared by the shlibs/clilibs files of the used
-packages). The dependency on a certain CLR (.NET runtime) version will be
-also added to the final variable.
+packages). The dependency on a certain CLR (Common Language Runtime)
+version will be also added to the final variable.
Note: the dependencies on shared libraries may be not resolved correctly
if there are no .config files associated with the the .exe/.dll file
@@ -86,7 +86,12 @@
=cut
-init();
+init(options => {
+# "d" => \$dh{D_FLAG},
+ "r" => \$dh{R_FLAG},
+ "l=s", => \$dh{L_PARAMS},
+ "internal-mono" => \$dh{INTERNAL_MONO_FLAG},
+});
my $clr;
my $cli = '/usr/bin/cli';
@@ -127,7 +132,7 @@
$mono_path = $ENV{'MONO_PATH'} if exists $ENV{'MONO_PATH'};
}
-if (defined($ARGV[0]) && $ARGV[0] eq "internal-mono") {
+if (defined($dh{INTERNAL_MONO_FLAG})) {
$clr = "mono";
$cli_parser = "$pwd/debian/tmp/usr/bin/monodis";
$cli_parser_paths = "LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib MONO_PATH=$mono_path:$pwd/debian/tmp/usr/lib/mono/1.0:$pwd/debian/tmp/usr/lib/mono/2.0 MONO_GAC_PREFIX=$mono_gac_prefix ";
@@ -270,11 +275,21 @@
$vm_ref = "pnet-interpreter (>= $cli_version), ";
}
}
-
+
+ my $dh_ref = "";
if (-f "$tmp/usr/share/cli-common/packages.d/$package.installcligac") {
- $vm_ref .= "cli-common (>= 0.5.1), ";
+ # this package uses late GAC install, thus we need cli-common at package install time
+ if (-f "debian/cligacpolicy" || -f "debian/$package.cligacpolicy") {
+ # if this package uses dh_cligacpolicy then we need 0.5.4 for the policy-remove script in .postrm
+ # and 0.5.6 to get a working .postrm script (tried also to remove on purge)
+ $dh_ref = "cli-common (>= 0.5.6), ";
+ } else {
+ # we still need at least 0.5.1, as older versions silently missed installing policy files
+ $dh_ref = "cli-common (>= 0.5.1), ";
+ }
}
-
+ $vm_ref .= $dh_ref;
+
#$deps .= join(", ", "",
# sort {
# # beautify the sort order, requested by meebey
Modified: mono/trunk/debian/dh_makeclilibs
===================================================================
--- mono/trunk/debian/dh_makeclilibs 2009-01-21 22:49:47 UTC (rev 3890)
+++ mono/trunk/debian/dh_makeclilibs 2009-01-21 23:35:27 UTC (rev 3891)
@@ -75,7 +75,7 @@
Exclude files that contain "item" anywhere in their filename or directory
from being treated as shared libraries.
-=item B<internal-mono>
+=item B<--internal-mono>
Uses the Mono runtime in . (used for bootstrapping Mono packages)
@@ -116,7 +116,13 @@
=cut
-init();
+init(options => {
+# "V", => \$dh{V_FLAG},
+ "r" => \$dh{R_FLAG},
+ "m=s" => \$dh{M_PARAMS},
+ "l=s" => \$dh{L_PARAMS},
+ "internal-mono" => \$dh{INTERNAL_MONO_FLAG},
+});
my $clr;
my $cli = '/usr/bin/cli';
@@ -124,7 +130,7 @@
my $cli_parser;
my $sn = 'sn';
-if (defined($ARGV[0]) && $ARGV[0] eq "internal-mono") {
+if (defined($dh{INTERNAL_MONO_FLAG})) {
$clr = "mono";
my $mono_path = "LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/1.0:debian/tmp/usr/lib/mono/2.0";
$cli_parser = "$mono_path debian/tmp/usr/bin/monodis";
@@ -233,22 +239,22 @@
$version = $dh{M_PARAMS};
}
if ($dh{V_FLAG_SET}) {
- if ( $dh{V_FLAG} ne '' ) {
+ if ($dh{V_FLAG} ne '' ) {
$deps = $dh{V_FLAG};
} else {
$deps = "$package (>= $version)";
}
}
- if (defined( $dh{R_FLAG})) {
+ if (defined($dh{R_FLAG})) {
$version =~ s/-[^-]+$//;
my @uvers = split ( /\./, $version );
$uvers[1]++;
$deps = "$package (>= $version), $package (<< ".join(".", @uvers).")";
}
- if (defined( $dh{M_PARAMS})) {
+ if (defined($dh{M_PARAMS})) {
$deps = "$package (>= ".$dh{M_PARAMS}.")";
}
- if (defined( $dh{L_PARAMS})) {
+ if (defined($dh{L_PARAMS})) {
$deps .= ", $package (<< ".$dh{L_PARAMS}.")";
}
if (defined($library) &&
Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules 2009-01-21 22:49:47 UTC (rev 3890)
+++ mono/trunk/debian/rules 2009-01-21 23:35:27 UTC (rev 3891)
@@ -281,42 +281,42 @@
debian/dh_clifixperms -i
dh_installdeb -i
#DH_VERBOSE=1 DH_AUTOSCRIPTDIR=$(CURDIR)/debian debian/dh_monoaot -i
- debian/dh_makeclilibs -i -m 1.0 internal-mono
- debian/dh_makeclilibs -p libmono1.0-cil -m 2.0 internal-mono
- debian/dh_makeclilibs -p libmono2.0-cil -m 2.0 internal-mono
- debian/dh_makeclilibs -p libmono-cairo1.0-cil -m 2.0 internal-mono
- debian/dh_makeclilibs -p libmono-cairo2.0-cil -m 2.0 internal-mono
- debian/dh_makeclilibs -p libmono-corlib1.0-cil -m 1.2.2.1 internal-mono
- debian/dh_makeclilibs -p libmono-corlib2.0-cil -m 1.2.2.1 internal-mono
- debian/dh_makeclilibs -p libmono-data-tds1.0-cil -m 2.0 internal-mono
- debian/dh_makeclilibs -p libmono-data-tds2.0-cil -m 2.0 internal-mono
- debian/dh_makeclilibs -p libmono-ldap1.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-ldap2.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-oracle2.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-microsoft-build2.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-system1.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-system2.0-cil -m 2.0 internal-mono
- debian/dh_makeclilibs -p libmono-system-data1.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-system-data2.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-system-ldap2.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-system-runtime2.0-cil -m 2.0 internal-mono
- debian/dh_makeclilibs -p libmono-system-web2.0-cil -m 1.9.1 internal-mono
- debian/dh_makeclilibs -p libmono-security1.0-cil -m 2.0 internal-mono
- debian/dh_makeclilibs -p libmono-security2.0-cil -m 2.0 internal-mono
- debian/dh_makeclilibs -p libmono-sqlite1.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-sqlite2.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-web1.0-cil -m 1.9 internal-mono
- debian/dh_makeclilibs -p libmono-web2.0-cil -m 2.0 internal-mono
- debian/dh_makeclilibs -p libmono-winforms1.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-winforms2.0-cil -m 2.0 internal-mono
- debian/dh_makeclilibs -p libmono-relaxng1.0-cil -m 1.9 internal-mono
- debian/dh_makeclilibs -p libmono-relaxng2.0-cil -m 1.9 internal-mono
+ debian/dh_makeclilibs -i -m 1.0 --internal-mono
+ debian/dh_makeclilibs -p libmono1.0-cil -m 2.0 --internal-mono
+ debian/dh_makeclilibs -p libmono2.0-cil -m 2.0 --internal-mono
+ debian/dh_makeclilibs -p libmono-cairo1.0-cil -m 2.0 --internal-mono
+ debian/dh_makeclilibs -p libmono-cairo2.0-cil -m 2.0 --internal-mono
+ debian/dh_makeclilibs -p libmono-corlib1.0-cil -m 1.2.2.1 --internal-mono
+ debian/dh_makeclilibs -p libmono-corlib2.0-cil -m 1.2.2.1 --internal-mono
+ debian/dh_makeclilibs -p libmono-data-tds1.0-cil -m 2.0 --internal-mono
+ debian/dh_makeclilibs -p libmono-data-tds2.0-cil -m 2.0 --internal-mono
+ debian/dh_makeclilibs -p libmono-ldap1.0-cil -m 1.2.6 --internal-mono
+ debian/dh_makeclilibs -p libmono-ldap2.0-cil -m 1.2.6 --internal-mono
+ debian/dh_makeclilibs -p libmono-oracle2.0-cil -m 1.2.6 --internal-mono
+ debian/dh_makeclilibs -p libmono-microsoft-build2.0-cil -m 1.2.6 --internal-mono
+ debian/dh_makeclilibs -p libmono-system1.0-cil -m 1.2.6 --internal-mono
+ debian/dh_makeclilibs -p libmono-system2.0-cil -m 2.0 --internal-mono
+ debian/dh_makeclilibs -p libmono-system-data1.0-cil -m 1.2.6 --internal-mono
+ debian/dh_makeclilibs -p libmono-system-data2.0-cil -m 1.2.6 --internal-mono
+ debian/dh_makeclilibs -p libmono-system-ldap2.0-cil -m 1.2.6 --internal-mono
+ debian/dh_makeclilibs -p libmono-system-runtime2.0-cil -m 2.0 --internal-mono
+ debian/dh_makeclilibs -p libmono-system-web2.0-cil -m 1.9.1 --internal-mono
+ debian/dh_makeclilibs -p libmono-security1.0-cil -m 2.0 --internal-mono
+ debian/dh_makeclilibs -p libmono-security2.0-cil -m 2.0 --internal-mono
+ debian/dh_makeclilibs -p libmono-sqlite1.0-cil -m 1.2.6 --internal-mono
+ debian/dh_makeclilibs -p libmono-sqlite2.0-cil -m 1.2.6 --internal-mono
+ debian/dh_makeclilibs -p libmono-web1.0-cil -m 1.9 --internal-mono
+ debian/dh_makeclilibs -p libmono-web2.0-cil -m 2.0 --internal-mono
+ debian/dh_makeclilibs -p libmono-winforms1.0-cil -m 1.2.6 --internal-mono
+ debian/dh_makeclilibs -p libmono-winforms2.0-cil -m 2.0 --internal-mono
+ debian/dh_makeclilibs -p libmono-relaxng1.0-cil -m 1.9 --internal-mono
+ debian/dh_makeclilibs -p libmono-relaxng2.0-cil -m 1.9 --internal-mono
# preview APIs get tighter clilibs
- debian/dh_makeclilibs -p libmono-system2.1-cil -m 2.0 internal-mono
- debian/dh_clideps -i -l debian/tmp internal-mono
- #DH_VERBOSE=1 debian/dh_clideps -i -l debian/tmp internal-mono
+ debian/dh_makeclilibs -p libmono-system2.1-cil -m 2.0 --internal-mono
+ debian/dh_clideps -i -l debian/tmp --internal-mono
+ #DH_VERBOSE=1 debian/dh_clideps -i -l debian/tmp --internal-mono
# mono-gac needs special runtime dep, to prevent circular dep (mono-runtime <-> mono-gac)
- debian/dh_clideps -p mono-gac -r internal-mono
+ debian/dh_clideps -p mono-gac -r --internal-mono
dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)
dh_md5sums -i
dh_builddeb -i
More information about the Pkg-mono-svn-commits
mailing list