[Pkg-mono-svn-commits] rev 1866 - in mono/trunk/debian: . patches
Mirco Bauer
meebey-guest@costa.debian.org
Tue, 21 Jun 2005 21:10:13 +0000
Author: meebey-guest
Date: 2005-06-21 21:10:12 +0000 (Tue, 21 Jun 2005)
New Revision: 1866
Removed:
mono/trunk/debian/patches/01_arch_fallback.dpatch
mono/trunk/debian/patches/02_soname_map.dpatch
mono/trunk/debian/patches/04_monodiscrash.dpatch
mono/trunk/debian/patches/06_monodis_mono_path.dpatch
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/control
Log:
- preparing 1.1.8.1-1
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2005-06-21 18:32:03 UTC (rev 1865)
+++ mono/trunk/debian/changelog 2005-06-21 21:10:12 UTC (rev 1866)
@@ -1,4 +1,4 @@
-mono (1.1.8-0pre3) unstable; urgency=low
+mono (1.1.8.1-1) unstable; urgency=low
* New upstream release
+ Fixed DirectoryInfo.GetFiles(), it failed when filename had a backspace
@@ -6,8 +6,8 @@
+ With this release we also package the C# 2.0 part, for details see below.
* Mirco 'meebey' Bauer
+ debian/mono-mcs.manpages:
- - removed monoresgen.1
- - removed prj2make.1
+ - removed monoresgen.1 and prj2make.1
+ (the programs for those don't exist in the packages anymore).
+ debian/rules:
- disabled 07_no_libc_fun.dpatch
(upstream doesn't use internal libc symbols anymore)
@@ -38,7 +38,7 @@
- Added missing /usr/bin/monodiet
- Added new /usr/bin/mono-find-provides and /usr/bin/mono-find-requires
- -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org> Thu, 16 Jun 2005 22:13:54 +0200
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org> Tue, 21 Jun 2005 21:30:36 +0200
mono (1.1.6-4) unstable; urgency=low
Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control 2005-06-21 18:32:03 UTC (rev 1865)
+++ mono/trunk/debian/control 2005-06-21 21:10:12 UTC (rev 1866)
@@ -200,8 +200,8 @@
Description: Mono C# 2.0 compiler
This is the Mono C# (C-Sharp) 2.0 compiler, a platform-independent compiler
which produces CIL/.NET (Common Intermediate Language) binary executables.
- The gmcs compiler supports the C# 2.0 featureset like generics, anonymous methods,
- iterators, partial types and nullable types.
+ The gmcs compiler supports the C# 2.0 featureset like generics, anonymous
+ methods, iterators, partial types and nullable types.
WARNING: The C# 2.0 specification is not yet official (there is currently only
a draft), means no ISO nor EMCA standard yet and the specification may
change and breaks your code!
Deleted: mono/trunk/debian/patches/01_arch_fallback.dpatch
===================================================================
--- mono/trunk/debian/patches/01_arch_fallback.dpatch 2005-06-21 18:32:03 UTC (rev 1865)
+++ mono/trunk/debian/patches/01_arch_fallback.dpatch 2005-06-21 21:10:12 UTC (rev 1866)
@@ -1,40 +0,0 @@
-#! /bin/sh -e
-## 01_arch_fallback.dpatch by Eduard Bloch <blade@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Using dpkg-architecture output to declare names of unsupported arches
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/inet/debian/dev/build-area/mono-0.30.1/configure.in mono-0.30.1/configure.in
---- /home/inet/debian/dev/build-area/mono-0.30.1/configure.in 2004-02-13 02:24:03.000000000 +0100
-+++ mono-0.30.1/configure.in 2004-02-24 18:32:35.000000000 +0100
-@@ -845,6 +845,11 @@
- arch_target=s390;
- ACCESS_UNALIGNED="no"
- ;;
-+ *)
-+ arch_target=`dpkg-architecture -qDEB_HOST_ARCH`
-+ TARGET=`echo $arch_target | tr a-z A-Z`
-+ ACCESS_UNALIGNED="no"
-+ ;;
- esac
-
- if test ${TARGET} = ARM; then
Deleted: mono/trunk/debian/patches/02_soname_map.dpatch
===================================================================
--- mono/trunk/debian/patches/02_soname_map.dpatch 2005-06-21 18:32:03 UTC (rev 1865)
+++ mono/trunk/debian/patches/02_soname_map.dpatch 2005-06-21 21:10:12 UTC (rev 1866)
@@ -1,72 +0,0 @@
-#! /bin/sh -e
-## 02_soname_map.dpatch by Eduard Bloch <blade@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix for the hard-coded DLL map
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/inet/debian/dev/build-area/mono-0.31/data/config.in mono-0.31/data/config.in
---- /home/inet/debian/dev/build-area/mono-0.31/data/config.in 2004-04-15 22:36:00.000000000 +0200
-+++ mono-0.31/data/config.in 2004-04-15 22:56:07.000000000 +0200
-@@ -1,21 +1,29 @@
- <configuration>
- <dllmap dll="cygwin1.dll" target="@LIBC@" />
- <dllmap dll="libc" target="@LIBC@" />
-- <dllmap dll="libxslt.dll" target="libxslt.so" />
-- <dllmap dll="libmySQL.dll" target="libmysqlclient.so" />
-+ <dllmap dll="libxslt.dll" target="libxslt.so.1" />
-+ <dllmap dll="libmySQL.dll" target="libmysqlclient.so.12" />
- <dllmap dll="odbc32.dll" target="libodbc.so" />
-- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so" />
-- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so" />
-- <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0.so" />
-- <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0.so" />
-- <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0.so" />
-- <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so" />
-- <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so" />
-- <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so" />
-- <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so" />
-- <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0.so" />
-+ <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" />
-+ <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0" />
-+ <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0.so.0" />
-+ <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0.so.0" />
-+ <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0.so.0" />
-+ <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so.0" />
-+ <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0" />
-+ <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0" />
-+ <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0.so.0" />
- <dllmap dll="oci" target="clntsh" />
-- <dllmap dll="gtkhtml-3.0" target="libgtkhtml-3.0.so" />
-+ <dllmap dll="gtkhtml-3.0" target="libgtkhtml-3.0.so.4" />
- <dllmap dll="db2cli" target="libdb2_36.so"/>
-- <dllmap dll="gstreamer" target="libgstreamer-0.6.so" />
-+ <dllmap dll="gnome-2" target="libgnome-2.so.0" />
-+ <dllmap dll="gconf-2" target="libgconf-2.so.4" />
-+ <dllmap dll="gstreamer" target="libgstreamer-0.6.so.0" />
-+ <dllmap dll="gtksourceview-1.0" target="libgtksourceview-1.0.so.0">
-+ <dllmap dll="gnomeui-2" target="libgnomeui-2.so.0" />
-+ <dllmap dll="gobject-2" target="libgobject-2.0.so.0" />
-+ <dllmap dll="gobject-2.0" target="libgobject-2.0.so.0" />
-+ <dllmap dll="gnomevfs-2" target="libgnomevfs-2.so.0" />
-+ <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2.so.0" />
-+ <dllmap dll="gnome-print2-2" target="libgnomeprint-2-2.so.0" />
- </configuration>
Deleted: mono/trunk/debian/patches/04_monodiscrash.dpatch
===================================================================
--- mono/trunk/debian/patches/04_monodiscrash.dpatch 2005-06-21 18:32:03 UTC (rev 1865)
+++ mono/trunk/debian/patches/04_monodiscrash.dpatch 2005-06-21 21:10:12 UTC (rev 1866)
@@ -1,42 +0,0 @@
-#! /bin/sh -e
-## 01_arch_fallback.dpatch by Eduard Bloch <blade@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Using dpkg-architecture output to declare names of unsupported arches
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-Index: assembly.c
-===================================================================
-RCS file: /cvs/public/mono/mono/metadata/assembly.c,v
-retrieving revision 1.104
-diff -u -r1.104 assembly.c
---- a/mono/metadata/assembly.c 16 Jun 2004 11:48:32 -0000 1.104
-+++ b/mono/metadata/assembly.c 16 Jun 2004 18:59:01 -0000
-@@ -655,7 +655,8 @@
-
- ass = mono_assembly_load_from (image, fname, status);
-
-- mono_config_for_assembly (ass->image);
-+ if (ass)
-+ mono_config_for_assembly (ass->image);
-
- g_free (fname);
-
Deleted: mono/trunk/debian/patches/06_monodis_mono_path.dpatch
===================================================================
--- mono/trunk/debian/patches/06_monodis_mono_path.dpatch 2005-06-21 18:32:03 UTC (rev 1865)
+++ mono/trunk/debian/patches/06_monodis_mono_path.dpatch 2005-06-21 21:10:12 UTC (rev 1866)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_monodis_mono_path.dpatch by Mirco Bauer <meebey@meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad mono-1.1.6/mono/dis/main.c /tmp/dpep.zfxOqo/mono-1.1.6/mono/dis/main.c
---- mono-1.1.6/mono/dis/main.c 2005-03-30 23:26:14.000000000 +0200
-+++ /tmp/dpep.zfxOqo/mono-1.1.6/mono/dis/main.c 2005-04-16 01:07:11.765685528 +0200
-@@ -1622,6 +1622,11 @@
- usage ();
-
- /*
-+ * this is required for abusing monodis to load assemblies references which are not in the GAC
-+ */
-+ check_path_env();
-+
-+ /*
- * If we just have one file, use the corlib version it requires.
- */
- if (!input_files->next) {