[Pkg-mono-svn-commits] [SCM] mono branch, lenny-backports, updated. debian/2.6.7-4-6-g0ab4402
Mirco Bauer
meebey at meebey.net
Sat Dec 18 15:00:50 UTC 2010
The following commit has been merged in the lenny-backports branch:
commit 0ab440215e192bb9c19942abbf01ae8a86d1ed76
Merge: c035dfb539187b74f895c0a107dcce1b78b82cab b2ddb4c5ea24be9b6e41fb912db13df6e33d6661
Author: Mirco Bauer <meebey at meebey.net>
Date: Sat Dec 18 15:01:24 2010 +0100
Merge branch 'master' into lenny-backports
Conflicts:
debian/changelog
diff --combined debian/changelog
index a3e4ce7,056ef7e..f96a695
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,28 +1,50 @@@
- mono (2.6.7-3~bpo50+2) lenny-backports; urgency=low
-
- * debian/control:
- + Replaced libnunit-cil-dev binary dep with libnunit2.4-cil
-
- -- Mirco Bauer <meebey at debian.org> Sun, 12 Sep 2010 23:48:35 +0200
-
- mono (2.6.7-3~bpo50+1) lenny-backports; urgency=low
++mono (2.6.7-4~bpo50+1) lenny-backports; urgency=low
+
+ * Rebuild for lenny-backports.
+ * debian/shlibs.local:
+ + Updated using debian/update-shlibs.local.sh for Debian/Lenny
+ libraries.
+ * debian/control:
+ + Added libmono-posix{1,2}.0-cil, libmono-getoptions{1,2}.0-cil
+ and libmono-cecil-private-cil dependencies to libmono{1,2}.0-cil for binary
+ backwards compatibility with packages build against Mono 1.9.1.
+ + Added libmono-cairo2.0-cil dependency to libmono-cairo1.0-cil so the
+ pkg-config file stays present.
+ + Added mono-devel dependency to mono-gmcs for build-dep compatiblity with
+ source packages of lenny.
+ + Build-depend on libtool >= 2.2 as dolt doesn't work with libtool 1.5
++ + Replaced libnunit-cil-dev binary dep with libnunit2.4-cil
++ + Added libmono-posix{1,2}.0-cil, libmono-getoptions{1,2}.0-cil
++ and libmono-cecil-private-cil dependencies to libmono{1,2}.0-cil for binary
++ backwards compatibility with packages build against Mono 1.9.1.
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 12 Sep 2010 21:35:09 +0200
+
+ mono (2.6.7-4) unstable; urgency=high
+
+ [ Mirco Bauer ]
+ * [63821a1] Added libmono-nunit2.2-cil to conflicts and replaces of
+ libmono-cil-dev for smooth upgrade from lenny (closes: #602024)
+ * [0089f11] Moved the System.Data.Linq library into libmono-system-
+ data-linq2.0-cil to avoid an unneeded dependency chain for most
+ applications.
+ * [393dc41] Demote libmono-firebirdsql1.7-cil and mono-debugger from
+ recommends to suggests if built on Ubuntu.
+
+ [ Paolo Molaro ]
+ * [52727f0] Search for dllimported shared libs in the base directory,
+ not cwd. * loader.c: we don't search the current directory anymore
+ for shared libraries referenced in DllImport attributes, as it has a
+ slight security risk. We search in the same directory where the
+ referencing image was loaded from, instead.
+ (CVE-2010-4159, closes: #605097)
+
+ [ Zoltan Varga ]
+ * [f17ab04] Fix stack alignment when resuming from a signal handler in
+ the soft debugger.
+
+ -- Mirco Bauer <meebey at debian.org> Mon, 06 Dec 2010 23:34:16 +0100
+
mono (2.6.7-3) unstable; urgency=low
* The "welcome to new java refugees" release
diff --combined debian/control
index 37b0e19,aa19a43..a50de91
--- a/debian/control
+++ b/debian/control
@@@ -7,7 -7,7 +7,7 @@@ Build-Depends: debhelper (>= 7)
dpkg-dev (>= 1.13.19),
libglib2.0-dev (>= 2.4),
bison,
- libtool,
+ libtool (>= 2.2),
libxml-dom-perl,
libxslt1-dev,
dc,
@@@ -175,7 -175,8 +175,8 @@@ Description: Mono profiler librarie
Package: libmono-cil-dev
Architecture: all
- Replaces: libmono-nunit2.4-cil (<< 2.4.3),
+ Replaces: libmono-nunit2.2-cil (<< 2.4.3),
+ libmono-nunit2.4-cil (<< 2.4.3),
libmono-cairo2.0-cil (<< 2.4.3),
libmono-cecil-private-cil (<< 2.4.3),
libmono-system-web2.0-cil (<< 2.4.3),
@@@ -183,8 -184,10 +184,10 @@@
libmono2.0-cil (<< 2.4.3),
mono-devel (<< 2.4.3),
libmono-dev (<< 2.4.3)
- Conflicts: libmono-nunit2.4-cil
- Recommends: libmono-firebirdsql1.7-cil (= ${source:Version})
+ Conflicts: libmono-nunit2.2-cil,
+ libmono-nunit2.4-cil
+ Suggests: ${firebirdsql:Suggests}
+ Recommends: ${firebirdsql:Recommends}
Depends: ${misc:Depends},
libmono1.0-cil (= ${source:Version}),
libmono2.0-cil (= ${source:Version}),
@@@ -218,6 -221,7 +221,7 @@@
libmono-data-tds2.0-cil (= ${source:Version}),
libmono-system-data1.0-cil (= ${source:Version}),
libmono-system-data2.0-cil (= ${source:Version}),
+ libmono-system-data-linq2.0-cil (= ${source:Version}),
libmono-system-web1.0-cil (= ${source:Version}),
libmono-system-web2.0-cil (= ${source:Version}),
libmono-system-web-mvc1.0-cil (= ${source:Version}),
@@@ -260,7 -264,7 +264,7 @@@
libmono-debugger-soft0.0-cil (= ${source:Version}),
libmono-tasklets2.0-cil (= ${source:Version}),
libmono-windowsbase3.0-cil (= ${source:Version}),
- libnunit-cil-dev (>= 2.4)
+ libnunit2.4-cil
Description: Mono Base Class Libraries (BCL) - Development files
This package contains development headers for the Mono Base Class Libraries.
.
@@@ -273,7 -277,7 +277,7 @@@
Package: libmono1.0-cil
Architecture: all
Replaces: mono-classlib-1.0 (<< 1.1.13.6), mono-classlib-1.0-dbg (<< 1.1.13.6)
-Depends: ${misc:Depends}, ${cli:Depends}
+Depends: ${cli:Depends}, libmono-posix1.0-cil, libmono-getoptions1.0-cil, libmono-cecil-private-cil
Description: Mono libraries (for CLI 1.0)
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@@ -289,7 -293,7 +293,7 @@@
Package: libmono2.0-cil
Architecture: all
Replaces: mono-classlib-2.0 (<< 1.1.13.6), mono-classlib-2.0-dbg (<< 1.1.13.6)
-Depends: ${misc:Depends}, ${cli:Depends}
+Depends: ${cli:Depends}, libmono-posix2.0-cil, libmono-getoptions2.0-cil
Description: Mono libraries (for CLI 2.0)
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@@ -770,6 -774,22 +774,22 @@@ Description: Mono System.Data Library (
.
This package contains the Mono System.Data library for CLI 2.0.
+ Package: libmono-system-data-linq2.0-cil
+ Architecture: all
+ Replaces: libmono-system-data2.0-cil (<< 2.6.7-4)
+ Conflicts: libmono-system-data2.0-cil (<< 2.6.7-4)
+ Depends: ${misc:Depends}, ${cli:Depends}
+ Description: Mono System.Data.Linq 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.
+ 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 Mono System.Data.Linq library which implements
+ LINQ to SQL. LINQ to SQL allows one to query relational databases using the
+ language-integrated query (LINQ) extension of the C# programming language.
+
Package: libmono-system-web1.0-cil
Architecture: all
Replaces: mono-classlib-1.0 (<< 1.1.13.6), mono-classlib-1.0-dbg (<< 1.1.13.6)
@@@ -926,7 -946,7 +946,7 @@@ Description: Mono System.Windows.Forms
Package: libmono-cairo1.0-cil
Architecture: all
Replaces: mono-classlib-1.0 (<< 1.1.13.4-1), mono-classlib-1.0-dbg (<< 1.1.13.4-1)
-Depends: ${misc:Depends}, ${cli:Depends}
+Depends: ${cli:Depends}, libmono-cairo2.0-cil
Description: Mono Cairo library (for CLI 1.0)
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@@ -1351,7 -1371,8 +1371,8 @@@ Package: mono-db
Priority: extra
Section: debug
Architecture: all
- Recommends: mono-debugger
+ Suggests: ${mdb:Suggests}
+ Recommends: ${mdb:Recommends}
Depends: ${misc:Depends}
Replaces: libmono1.0-cil (<< 1.2.4-1),
libmono2.0-cil (<< 1.2.4-1),
@@@ -1457,8 -1478,7 +1478,8 @@@ Architecture: al
Depends: ${misc:Depends},
${cli:Depends},
libmono-corlib2.0-cil (>= ${mono:upversion}),
- libmono-corlib2.0-cil (<< ${mono:next-upversion})
+ libmono-corlib2.0-cil (<< ${mono:next-upversion}),
+ mono-devel (= ${source:Version})
Recommends: pkg-config
Replaces: mono-mcs (>= 1.1.10), mono-mcs (<= 1.1.13), mono-devel (<< 2.4.2.3)
Description: Mono C# 2.0 and C# 3.0 compiler for CLI 2.0
--
mono
More information about the Pkg-mono-svn-commits
mailing list