[Pkg-mono-svn-commits] rev 3169 - in mono/trunk/debian: . patches
Mirco Bauer
meebey-guest at alioth.debian.org
Sun May 20 22:12:35 UTC 2007
Author: meebey-guest
Date: 2007-05-20 22:12:34 +0000 (Sun, 20 May 2007)
New Revision: 3169
Added:
mono/trunk/debian/Mono.Data.Sqlite.dll.config
mono/trunk/debian/dh_clifixperms
mono/trunk/debian/dh_clistrip
mono/trunk/debian/patches/dont_remap_non-runtime_libs.dpatch
mono/trunk/debian/patches/fix-mono-cairo.pc.in.dpatch
mono/trunk/debian/patches/fix-mono.pc.in.dpatch
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/control
mono/trunk/debian/libmono-dev.install
mono/trunk/debian/libmono-sqlite1.0-cil.install
mono/trunk/debian/libmono-sqlite2.0-cil.install
mono/trunk/debian/libmono-system-data1.0-cil.clideps-override
mono/trunk/debian/libmono-system-data2.0-cil.clideps-override
mono/trunk/debian/libmono-system1.0-cil.clideps-override
mono/trunk/debian/libmono-winforms1.0-cil.clideps-override
mono/trunk/debian/libmono-winforms2.0-cil.clideps-override
mono/trunk/debian/mono-gmcs.install
mono/trunk/debian/mono-gmcs.manpages
mono/trunk/debian/patches/00list
mono/trunk/debian/rules
mono/trunk/debian/shlibs.local
Log:
- clean it good, almost at 1.2.4-1
Added: mono/trunk/debian/Mono.Data.Sqlite.dll.config
===================================================================
--- mono/trunk/debian/Mono.Data.Sqlite.dll.config (rev 0)
+++ mono/trunk/debian/Mono.Data.Sqlite.dll.config 2007-05-20 22:12:34 UTC (rev 3169)
@@ -0,0 +1,4 @@
+<configuration>
+ <dllmap dll="sqlite" target="libsqlite.so.0"/>
+ <dllmap dll="sqlite3" target="libsqlite3.so.0"/>
+</configuration>
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/changelog 2007-05-20 22:12:34 UTC (rev 3169)
@@ -1,3 +1,58 @@
+mono (1.2.4-1~pre4) UNRELEASED; urgency=medium
+
+ * The clean me harder and be nicer to embedded devices upload
+ * Mirco 'meebey' Bauer:
+ + New upstream release
+ - Fixes endian problem with UDP multicasts (Closes: #406909)
+ + debian/patches/dont_remap_non-runtime_libs.dpatch:
+ - Don't remap referenced versions for libraries that are not part of the
+ runtime (like Npgsql, Novell.Directory.Ldap and Mono.* specially
+ Mono.Cairo) because that makes predictable dependency tracking
+ impossible for such libraries and is pretty insane as the remapped
+ version must be 100% ABI compatible.
+ This caused FTBFS for applications using Gtk# (which uses Mono.Cairo
+ version 1.0) but runs and compiles (gmcs) under CLR 2.0.
+ (Closes: #425194)
+ + debian/control:
+ - New package mono-dbg, containing all debug sybols (*.mdb), which is
+ 27 MB for all libraries and applications of the mono source package.
+ This new package should make specially embedded device users happy.
+ - New package mono-jit-dbg, unstripped mono-jit
+ - New package libmono0-dbg, unstripped libmono0
+ - Add libgdiplus dependency to libmono-winforms{1,2}.0-cil, as it's only
+ indirectly used via System.Drawing of libmono-system{1,2}.0-cil, which
+ only suggests libgdiplus.
+ + debian/rules:
+ - Bumped MONO_API to 1.2.4
+ - Install Mono.Data.Sqlite.dll.config
+ - Enabled sigaltstack in ./configure call, since we use __thread / NPTL.
+ - Call debian/dh_clifixperms in binary-indep target
+ - Call debian/dh_clistrip in binary-indep target
+ + debian/libmono-sqlite{1,2}.0-cil.install:
+ - Added Mono.Data.Sqlite.dll
+ + debian/libmono-dev.install:
+ - Added dotnet.pc
+ + debian/patches/fix-mono.pc.in.dpatch
+ debian/patches/fix-mono-cairo.pc.in.dpatch:
+ - Replace ../../ with @prefix@
+ + debian/mono-gmcs.install:
+ - Added httpcfg and mono-api-info2
+ + debian/libmono-system1.0-cil.clideps-override:
+ - Move libcupsys2 to Suggests.
+ - Move libgdiplus to Suggests.
+ + debian/libmono-system-data{1,2}.0-cil.clideps-override:
+ - Move libglib2.0-0 to Suggests.
+ + debian/libmono-winforms{1,2}.0-cil.clideps-override:
+ - Move libglib2.0-0 to Suggests.
+ + debian/dh_clifixperms:
+ - Copied from cli-common-dev
+ + debian/dh_clistrip:
+ - Copied from cli-common-dev
+ + debian/shlibs.local:
+ - Added libgda-2
+
+ -- Mirco Bauer <meebey at debian.org> Sat, 19 May 2007 15:43:00 +0200
+
mono (1.2.3.1-5) unstable; urgency=low
* Mirco 'meebey' Bauer:
Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/control 2007-05-20 22:12:34 UTC (rev 3169)
@@ -50,6 +50,20 @@
"mono" runs CLI applications, which is currently only available for i386,
powerpc, arm, amd64 kfreebsd-amd64 and ia64 architectures.
+Package: mono-jit-dbg
+Priority: extra
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
+Depends: mono-jit (= ${Source-Version})
+Recommends: gdb
+Description: fast CLI JIT/AOT compiler for Mono, debugging symbols
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the debugging symbols of the Mono JIT/AOT compiler.
+
Package: mono
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
Depends: mono-common (= ${Source-Version}), mono-jit (= ${Source-Version})
@@ -114,6 +128,21 @@
runtime, which can produce and execute CIL (Common Intermediate Language)
bytecode (aka assemblies), and a class library.
+Package: libmono0-dbg
+Priority: extra
+Section: libdevel
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
+Depends: libmono0 (= ${Source-Version})
+Recommends: gdb
+Description: libraries for the Mono JIT, debugging symbols
+ This package contains the debugging symbols of the Mono JIT libraries.
+ .
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+
Package: libmono-dev
Section: devel
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
@@ -317,6 +346,7 @@
Section: libs
Architecture: all
Replaces: mono-classlib-1.0 (<< 1.1.13.6-1), mono-classlib-1.0-dbg (<< 1.1.13.6-1)
+Suggests: ${cli:Suggests}
Depends: ${cli:Depends}
Description: Mono System.Data library
Mono is a platform for running and developing applications based on the
@@ -331,6 +361,7 @@
Section: libs
Architecture: all
Replaces: mono-classlib-2.0 (<< 1.1.13.6-1), mono-classlib-2.0-dbg (<< 1.1.13.6-1)
+Suggests: ${cli:Suggests}
Depends: ${cli:Depends}
Description: Mono System.Data Library
Mono is a platform for running and developing applications based on the
@@ -431,7 +462,7 @@
Architecture: all
Replaces: mono-classlib-1.0 (<< 1.1.13.6-1), mono-classlib-1.0-dbg (<< 1.1.13.6-1)
Suggests: ${cli:Suggests}, shared-mime-info
-Depends: ${cli:Depends}
+Depends: ${cli:Depends}, libgdiplus
Description: Mono System.Windows.Forms library
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -446,7 +477,7 @@
Architecture: all
Replaces: mono-classlib-2.0 (<< 1.1.13.6-1), mono-classlib-2.0-dbg (<< 1.1.13.6-1)
Suggests: ${cli:Suggests}, shared-mime-info
-Depends: ${cli:Depends}
+Depends: ${cli:Depends}, libgdiplus
Description: Mono System.Windows.Forms library
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -848,6 +879,76 @@
.
This package contains the Mono Relaxng library version 2.0.
+Package: mono-dbg
+Priority: extra
+Section: devel
+Architecture: all
+Recommends: mono-debugger
+Replaces: libmono1.0-cil (<< 1.2.4-1),
+ libmono2.0-cil (<< 1.2.4-1),
+ libmono-c5-1.0-cil (<< 1.2.4-1),
+ libmono-corlib1.0-cil (<< 1.2.4-1),
+ libmono-corlib2.0-cil (<< 1.2.4-1),
+ libmono-system1.0-cil (<< 1.2.4-1),
+ libmono-system2.0-cil (<< 1.2.4-1),
+ libmono-system-messaging1.0-cil (<< 1.2.4-1),
+ libmono-system-messaging2.0-cil (<< 1.2.4-1),
+ libmono-security1.0-cil (<< 1.2.4-1),
+ libmono-security2.0-cil (<< 1.2.4-1),
+ libmono-data-tds1.0-cil (<< 1.2.4-1),
+ libmono-data-tds2.0-cil (<< 1.2.4-1),
+ libmono-system-data1.0-cil (<< 1.2.4-1),
+ libmono-system-data2.0-cil (<< 1.2.4-1),
+ libmono-system-web1.0-cil (<< 1.2.4-1),
+ libmono-system-web2.0-cil (<< 1.2.4-1),
+ libmono-system-runtime1.0-cil (<< 1.2.4-1),
+ libmono-system-runtime2.0-cil (<< 1.2.4-1),
+ libmono-system-ldap1.0-cil (<< 1.2.4-1),
+ libmono-system-ldap2.0-cil (<< 1.2.4-1),
+ libmono-winforms1.0-cil (<< 1.2.4-1),
+ libmono-winforms2.0-cil (<< 1.2.4-1),
+ libmono-cairo1.0-cil (<< 1.2.4-1),
+ libmono-cairo2.0-cil (<< 1.2.4-1),
+ libmono-sharpzip0.6-cil (<< 1.2.4-1),
+ libmono-sharpzip0.84-cil (<< 1.2.4-1),
+ libmono-sharpzip2.6-cil (<< 1.2.4-1),
+ libmono-sharpzip2.84-cil (<< 1.2.4-1),
+ libmono-npgsql1.0-cil (<< 1.2.4-1),
+ libmono-npgsql2.0-cil (<< 1.2.4-1),
+ libmono-bytefx0.7.6.1-cil (<< 1.2.4-1),
+ libmono-bytefx0.7.6.2-cil (<< 1.2.4-1),
+ libmono-firebirdsql1.7-cil (<< 1.2.4-1),
+ libmono-oracle1.0-cil (<< 1.2.4-1),
+ libmono-oracle2.0-cil (<< 1.2.4-1),
+ libmono-sqlite1.0-cil (<< 1.2.4-1),
+ libmono-sqlite2.0-cil (<< 1.2.4-1),
+ libmono-accessibility1.0-cil (<< 1.2.4-1),
+ libmono-accessibility2.0-cil (<< 1.2.4-1),
+ libmono-cscompmgd7.0-cil (<< 1.2.4-1),
+ libmono-cscompmgd8.0-cil (<< 1.2.4-1),
+ libmono-ldap1.0-cil (<< 1.2.4-1),
+ libmono-ldap2.0-cil (<< 1.2.4-1),
+ libmono-microsoft-build2.0-cil (<< 1.2.4-1),
+ libmono-microsoft7.0-cil (<< 1.2.4-1),
+ libmono-microsoft8.0-cil (<< 1.2.4-1),
+ libmono-peapi1.0-cil (<< 1.2.4-1),
+ libmono-peapi2.0-cil (<< 1.2.4-1),
+ libmono-relaxng1.0-cil (<< 1.2.4-1),
+ libmono-relaxng2.0-cil (<< 1.2.4-1),
+ mono-mcs (<< 1.2.4-1),
+ mono-mjs (<< 1.2.4-1),
+ mono-gmcs (<< 1.2.4-1),
+ mono-gac (<< 1.2.4-1)
+Description: Mono debugging symbols
+ This package contains the debugging symbols of various libmono-* and mono-*
+ packages.
+ .
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+
Package: mono-mcs
Section: devel
Architecture: all
Added: mono/trunk/debian/dh_clifixperms
===================================================================
--- mono/trunk/debian/dh_clifixperms (rev 0)
+++ mono/trunk/debian/dh_clifixperms 2007-05-20 22:12:34 UTC (rev 3169)
@@ -0,0 +1,70 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_clifixperms - fix permissions of files in CLI package build directories
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_clifixperms> [S<I<debhelper options>>] [B<-X>I<item>]
+
+=head1 DESCRIPTION
+
+dh_clifixperms is a debhelper program that is responsible for setting
+the permissions of files and directories for CLI assemblies and
+executables.
+
+dh_clifixperms makes all files that end in *.dll, *.mdb, *.cs,
+*.aspx, and *.config to mode 644 and *.exe to mode 755.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-X>I<item>, B<--exclude> I<item>
+
+Exclude files that contain "item" anywhere in their filename from having
+their permissions changed. You may use this option multiple times to build
+up a list of things to exclude.
+
+=back
+
+=cut
+
+init();
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+ my $tmp=tmpdir($package);
+
+ my $find_options='';
+ if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
+ $find_options="! \\( $dh{EXCLUDE_FIND} \\)";
+ }
+
+ # Fix the permissions of various CLI-based files
+ for my $ext (qw(dll mdb cs config aspx))
+ {
+ complex_doit("find $tmp $find_options -name \"*.$ext\" -print0",
+ "2>/dev/null | xargs -0r chmod 0644");
+ }
+ complex_doit("find $tmp $find_options -name \"*.exe\" -print0",
+ "2>/dev/null | xargs -0r chmod 0755");
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of cli-common.
+
+=head1 AUTHOR
+
+Dylan R. E. Moonfire <debian at mfgames.com> based on work from Joey Hess
+<joeyh at debian.org>.
+
+=cut
Property changes on: mono/trunk/debian/dh_clifixperms
___________________________________________________________________
Name: svn:executable
+ *
Added: mono/trunk/debian/dh_clistrip
===================================================================
--- mono/trunk/debian/dh_clistrip (rev 0)
+++ mono/trunk/debian/dh_clistrip 2007-05-20 22:12:34 UTC (rev 3169)
@@ -0,0 +1,105 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_clistrip - strips CLI debug symbols from package build directories
+
+=cut
+
+use strict;
+use File::Find;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_clistrip> [S<I<debhelper options>>] [B<-X>I<item>] [--dbg-package=package]
+
+=head1 DESCRIPTION
+
+dh_clistrip is a debhelper program that removes debug symbols from
+CLI libraries and applications.
+
+dh_clistrip deletes all *.exe.mdb and *.dll.mdb files.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-X>I<item>, B<--exclude=>I<item>
+
+Exclude files that contain "item" anywhere in their filename from being
+deleted. You may use this option multiple times to build up a list of things
+to exclude.
+
+=item B<--dbg-package=>I<package>
+
+Moves the debug symbols to the specified package.
+
+=back
+
+=cut
+
+init();
+
+my $pwd = `pwd`;
+chomp $pwd;
+
+# This variable can be used to turn off stripping (see Policy).
+if (defined $ENV{DEB_BUILD_OPTIONS} && $ENV{DEB_BUILD_OPTIONS} =~ /nostrip/) {
+ exit;
+}
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+ my $tmp = tmpdir($package);
+
+ my $debug_pkg = '';
+ if (defined($dh{DEBUGPACKAGES})) {
+ $debug_pkg = @{$dh{DEBUGPACKAGES}}[0];
+ verbose_print("debug_pkg: $debug_pkg");
+ }
+
+ if ($package eq $debug_pkg) {
+ # skip debug package
+ next;
+ }
+
+ # find debug symbols
+ find (sub {
+ foreach my $exclude (@{$dh{EXCLUDE}}) {
+ return if /$exclude/;
+ }
+ return unless -f && /\.(exe|dll)\.mdb$/;
+
+ my $file = $_;
+ my $dir = $File::Find::dir;
+
+ if ($debug_pkg ne '') {
+ my $debug_dir = $dir;
+ verbose_print("dir: $dir");
+ $debug_dir =~ s!$tmp!!;
+ verbose_print("debug_dir: $debug_dir");
+ $debug_dir = $pwd . "/debian/$debug_pkg/" . $debug_dir;
+ verbose_print("debug_dir: $debug_dir");
+ if (! -d $debug_dir) {
+ doit("install", "-d", $debug_dir);
+ }
+ verbose_print("moving $file to $debug_dir");
+ doit("mv", $file, $debug_dir);
+ } else {
+ verbose_print("deleting $file");
+ doit("rm", $file);
+ }
+ }, $tmp);
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of cli-common.
+
+=head1 AUTHOR
+
+Mirco Bauer <meebey at meebey.net>
+
+=cut
Property changes on: mono/trunk/debian/dh_clistrip
___________________________________________________________________
Name: svn:executable
+ *
Modified: mono/trunk/debian/libmono-dev.install
===================================================================
--- mono/trunk/debian/libmono-dev.install 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/libmono-dev.install 2007-05-20 22:12:34 UTC (rev 3169)
@@ -3,4 +3,5 @@
debian/tmp/usr/lib/libmono*.so
debian/tmp/usr/lib/libMonoSupportW.a
debian/tmp/usr/lib/pkgconfig/mono.pc
+debian/tmp/usr/lib/pkgconfig/dotnet.pc
debian/tmp/usr/include/
Modified: mono/trunk/debian/libmono-sqlite1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-sqlite1.0-cil.install 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/libmono-sqlite1.0-cil.install 2007-05-20 22:12:34 UTC (rev 3169)
@@ -1,2 +1,4 @@
+debian/tmp/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/
debian/tmp/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/
+debian/tmp/usr/lib/mono/1.0/Mono.Data.Sqlite.dll
debian/tmp/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll
Modified: mono/trunk/debian/libmono-sqlite2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-sqlite2.0-cil.install 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/libmono-sqlite2.0-cil.install 2007-05-20 22:12:34 UTC (rev 3169)
@@ -1,2 +1,4 @@
+debian/tmp/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/
debian/tmp/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/
+debian/tmp/usr/lib/mono/2.0/Mono.Data.Sqlite.dll
debian/tmp/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll
Modified: mono/trunk/debian/libmono-system-data1.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-system-data1.0-cil.clideps-override 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/libmono-system-data1.0-cil.clideps-override 2007-05-20 22:12:34 UTC (rev 3169)
@@ -1 +1,2 @@
suggests libgda2-3
+suggests libglib2.0-0
Modified: mono/trunk/debian/libmono-system-data2.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-system-data2.0-cil.clideps-override 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/libmono-system-data2.0-cil.clideps-override 2007-05-20 22:12:34 UTC (rev 3169)
@@ -1 +1,2 @@
suggests libgda2-3
+suggests libglib2.0-0
Modified: mono/trunk/debian/libmono-system1.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-system1.0-cil.clideps-override 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/libmono-system1.0-cil.clideps-override 2007-05-20 22:12:34 UTC (rev 3169)
@@ -1,3 +1,5 @@
suggests libfam0
suggests libgamin0
suggests libx11-6
+suggests libcupsys2
+suggests libgdiplus
Modified: mono/trunk/debian/libmono-winforms1.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-winforms1.0-cil.clideps-override 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/libmono-winforms1.0-cil.clideps-override 2007-05-20 22:12:34 UTC (rev 3169)
@@ -1,3 +1,4 @@
suggests libgtk2.0-0
suggests libgnomeui-0
suggests librsvg2-2
+suggests libglib2.0-0
Modified: mono/trunk/debian/libmono-winforms2.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-winforms2.0-cil.clideps-override 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/libmono-winforms2.0-cil.clideps-override 2007-05-20 22:12:34 UTC (rev 3169)
@@ -1,3 +1,4 @@
suggests libgtk2.0-0
suggests libgnomeui-0
suggests librsvg2-2
+suggests libglib2.0-0
Modified: mono/trunk/debian/mono-gmcs.install
===================================================================
--- mono/trunk/debian/mono-gmcs.install 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/mono-gmcs.install 2007-05-20 22:12:34 UTC (rev 3169)
@@ -3,11 +3,13 @@
debian/tmp/usr/bin/monop2
debian/tmp/usr/bin/ilasm2
debian/tmp/usr/bin/resgen2
+debian/tmp/usr/bin/mono-api-info2
debian/tmp/usr/bin/mono-service2
debian/tmp/usr/bin/mkbundle2
debian/tmp/usr/bin/xbuild
debian/tmp/usr/bin/sgen
debian/tmp/usr/bin/al2
+debian/tmp/usr/bin/httpcfg
debian/tmp/usr/lib/mono/2.0/*.exe*
debian/tmp/usr/lib/mono/2.0/xbuild.rsp
debian/tmp/usr/lib/mono/2.0/MSBuild/
Modified: mono/trunk/debian/mono-gmcs.manpages
===================================================================
--- mono/trunk/debian/mono-gmcs.manpages 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/mono-gmcs.manpages 2007-05-20 22:12:34 UTC (rev 3169)
@@ -5,3 +5,4 @@
debian/man/resgen2.1
debian/man/mono-service2.1
debian/man/xbuild.1
+debian/tmp/usr/share/man/man1/httpcfg.1
Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/patches/00list 2007-05-20 22:12:34 UTC (rev 3169)
@@ -2,3 +2,6 @@
console-no-utf8-bom.dpatch
kfreebsd_support.dpatch
firebird-fbclient.dpatch
+fix-mono.pc.in
+fix-mono-cairo.pc.in
+dont_remap_non-runtime_libs
Added: mono/trunk/debian/patches/dont_remap_non-runtime_libs.dpatch
===================================================================
--- mono/trunk/debian/patches/dont_remap_non-runtime_libs.dpatch (rev 0)
+++ mono/trunk/debian/patches/dont_remap_non-runtime_libs.dpatch 2007-05-20 22:12:34 UTC (rev 3169)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## dont_remap_non-runtime_libs.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-1.2.4~/mono/metadata/assembly.c mono-1.2.4/mono/metadata/assembly.c
+--- mono-1.2.4~/mono/metadata/assembly.c 2007-04-25 20:48:41.000000000 +0200
++++ mono-1.2.4/mono/metadata/assembly.c 2007-05-19 15:34:14.000000000 +0200
+@@ -69,21 +69,6 @@
+ {"I18N.West", 0},
+ {"Microsoft.VisualBasic", 1},
+ {"Microsoft.VisualC", 1},
+- {"Mono.Cairo", 0},
+- {"Mono.CompilerServices.SymbolWriter", 0},
+- {"Mono.Data", 0},
+- {"Mono.Data.SqliteClient", 0},
+- {"Mono.Data.SybaseClient", 0},
+- {"Mono.Data.Tds", 0},
+- {"Mono.Data.TdsClient", 0},
+- {"Mono.GetOptions", 0},
+- {"Mono.Http", 0},
+- {"Mono.Posix", 0},
+- {"Mono.Security", 0},
+- {"Mono.Security.Win32", 0},
+- {"Mono.Xml.Ext", 0},
+- {"Novell.Directory.Ldap", 0},
+- {"Npgsql", 0},
+ {"PEAPI", 0},
+ {"System", 0},
+ {"System.Configuration.Install", 0},
Property changes on: mono/trunk/debian/patches/dont_remap_non-runtime_libs.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mono/trunk/debian/patches/fix-mono-cairo.pc.in.dpatch
===================================================================
--- mono/trunk/debian/patches/fix-mono-cairo.pc.in.dpatch (rev 0)
+++ mono/trunk/debian/patches/fix-mono-cairo.pc.in.dpatch 2007-05-20 22:12:34 UTC (rev 3169)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-mono-cairo.pc.in.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-1.2.4~/mono-cairo.pc.in mono-1.2.4/mono-cairo.pc.in
+--- mono-1.2.4~/mono-cairo.pc.in 2007-04-25 20:48:44.000000000 +0200
++++ mono-1.2.4/mono-cairo.pc.in 2007-05-17 11:14:44.000000000 +0200
+@@ -1,5 +1,5 @@
+-prefix=${pcfiledir}/../..
+-exec_prefix=${pcfiledir}/../..
++prefix=@prefix@
++exec_prefix=${prefix}
+ libdir=${prefix}/@reloc_libdir@
+ includedir=${prefix}/include
+
Property changes on: mono/trunk/debian/patches/fix-mono-cairo.pc.in.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mono/trunk/debian/patches/fix-mono.pc.in.dpatch
===================================================================
--- mono/trunk/debian/patches/fix-mono.pc.in.dpatch (rev 0)
+++ mono/trunk/debian/patches/fix-mono.pc.in.dpatch 2007-05-20 22:12:34 UTC (rev 3169)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-mono.pc.in.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-1.2.4~/mono.pc.in mono-1.2.4/mono.pc.in
+--- mono-1.2.4~/mono.pc.in 2007-04-25 20:48:44.000000000 +0200
++++ mono-1.2.4/mono.pc.in 2007-05-17 11:03:54.000000000 +0200
+@@ -1,5 +1,5 @@
+-prefix=${pcfiledir}/../..
+-exec_prefix=${pcfiledir}/../..
++prefix=@prefix@
++exec_prefix=${prefix}
+ libdir=${prefix}/@reloc_libdir@
+ includedir=${prefix}/include/mono- at API_VER@
+
Property changes on: mono/trunk/debian/patches/fix-mono.pc.in.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/rules 2007-05-20 22:12:34 UTC (rev 3169)
@@ -3,7 +3,7 @@
#export DH_VERBOSE=1
export MONO_SHARED_DIR=$(CURDIR)
-MONO_API = 1.2.3
+MONO_API = 1.2.4
VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2)
UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,')
@@ -27,8 +27,6 @@
CONF_FLAGS += --enable-minimal=aot
else ifeq ($(DEB_BUILD_ARCH), amd64)
CONF_FLAGS += --with-tls=__thread
-else
-# CONF_FLAGS += --with-tls=pthread
endif
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -39,7 +37,7 @@
./configure $(CONF_FLAGS) --prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --sysconfdir=/etc \
- --with-sigaltstack=no \
+ --with-sigaltstack=yes \
--with-jit=yes --with-ikvm-native=no --with-preview=yes \
--with-libgdiplus=installed --with-x=yes
@@ -163,6 +161,8 @@
install -m 644 debian/Mono.Cairo.dll.config debian/libmono-cairo2.0-cil/usr/lib/mono/gac/Mono.Cairo/2.0.*/
install -m 644 debian/Mono.Data.SqliteClient.dll.config debian/libmono-sqlite1.0-cil/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/
install -m 644 debian/Mono.Data.SqliteClient.dll.config debian/libmono-sqlite2.0-cil/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/
+ install -m 644 debian/Mono.Data.Sqlite.dll.config debian/libmono-sqlite1.0-cil/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/
+ install -m 644 debian/Mono.Data.Sqlite.dll.config debian/libmono-sqlite2.0-cil/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/
install -m 644 debian/FirebirdSql.Data.Firebird.dll.config debian/libmono-firebirdsql1.7-cil/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/
# delete bin/mono from mono-mcs, no way to exclude it with dh_install,
@@ -184,6 +184,8 @@
rm debian/mono-mcs/usr/bin/ilasm2
# delete resgen2 from mono-mcs (this is already in mono-gmcs)
rm debian/mono-mcs/usr/bin/resgen2
+ # delete mono-api-info2 from mono-mcs (this is already in mono-gmcs)
+ rm debian/mono-mcs/usr/bin/mono-api-info2
# delete mono-service2 from mono-mcs (this is already in mono-gmcs)
rm debian/mono-mcs/usr/bin/mono-service2
# delete xbuild from mono-mcs (this is already in mono-gmcs)
@@ -194,7 +196,7 @@
rm debian/mono-mcs/usr/bin/sgen
# delete al2 from mono-mcs (this is already in mono-gmcs)
rm debian/mono-mcs/usr/bin/al2
- # FIXME delete httpcfg from mono-mcs (this has no corresponding binary)
+ # delete httpcfg from mono-mcs (this is already in mono-gmcs)
rm debian/mono-mcs/usr/bin/httpcfg
# delete Mono.Data.Tds from libmono1.0/2.0-cil (those are already in libmono-data-tds*-cil)
rm -r debian/libmono1.0-cil/usr/lib/mono/gac/Mono.Data.Tds/
@@ -206,6 +208,11 @@
rm -r debian/libmono2.0-cil/usr/lib/mono/gac/Mono.Data.SqliteClient/
rm debian/libmono1.0-cil/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll
rm debian/libmono2.0-cil/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll
+ # delete Mono.Data.Sqlite from libmono1.0/2.0-cil (those are already in libmono-sqlite*-cil)
+ rm -r debian/libmono1.0-cil/usr/lib/mono/gac/Mono.Data.Sqlite/
+ rm -r debian/libmono2.0-cil/usr/lib/mono/gac/Mono.Data.Sqlite/
+ rm debian/libmono1.0-cil/usr/lib/mono/1.0/Mono.Data.Sqlite.dll
+ rm debian/libmono2.0-cil/usr/lib/mono/2.0/Mono.Data.Sqlite.dll
# delete Mono.Cairo from libmono1.0/2.0-cil (those are already in libmono-cairo*-cil)
rm -r debian/libmono1.0-cil/usr/lib/mono/gac/Mono.Cairo/
rm -r debian/libmono2.0-cil/usr/lib/mono/gac/Mono.Cairo/
@@ -274,8 +281,10 @@
dh_installchangelogs -i
dh_installdocs -i
dh_installman -i
+ debian/dh_clistrip -i --dbg-package=mono-dbg
dh_compress -i
dh_fixperms -i
+ 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
@@ -315,7 +324,9 @@
dh_installman -s
dh_installexamples -s
dh_installexamples -pmono-jay $(CURDIR)/mcs/jay/skeleton.cs
- dh_strip -s
+ #dh_strip -s
+ dh_strip -pmono-jit --dbg-package=mono-jit-dbg
+ dh_strip -plibmono0 --dbg-package=libmono0-dbg
dh_compress -s -Xskeleton.cs
dh_fixperms -s
dh_makeshlibs -plibmono0 -V 'libmono0 (>= $(UPVERSION))'
Modified: mono/trunk/debian/shlibs.local
===================================================================
--- mono/trunk/debian/shlibs.local 2007-05-19 18:20:37 UTC (rev 3168)
+++ mono/trunk/debian/shlibs.local 2007-05-20 22:12:34 UTC (rev 3169)
@@ -5,3 +5,4 @@
libsqlite3 0 libsqlite3-0 (>= 3.3.8)
libMonoPosixHelper 0 libmono0 (>= 1.2.2)
libasound 2 libasound2 (>> 1.0.12)
+libgda-2 3 libgda2-3
More information about the Pkg-mono-svn-commits
mailing list