[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.10.1-4-40-gdfd65af
Mirco Bauer
meebey at meebey.net
Sun Aug 7 18:53:18 UTC 2011
The following commit has been merged in the master-experimental branch:
commit 997bec0d6c5f63ce2ac42e61de730bab5d60b1c1
Author: Mirco Bauer <meebey at meebey.net>
Date: Sun Aug 7 19:52:35 2011 +0200
Mono.WebBrowser library is now shipped in both 2.0 and 4.0 runtime flavors
diff --git a/debian/control b/debian/control
index d276105..8e0efb4 100644
--- a/debian/control
+++ b/debian/control
@@ -334,7 +334,8 @@ Depends: ${misc:Depends},
libmono-tasklets4.0-cil (= ${source:Version}),
libmono-wcf3.0-cil (= ${source:Version}),
libmono-web4.0-cil (= ${source:Version}),
- libmono-webbrowser0.5-cil (= ${source:Version}),
+ libmono-webbrowser2.0-cil (= ${source:Version}),
+ libmono-webbrowser4.0-cil (= ${source:Version}),
libmono-webmatrix-data4.0-cil (= ${source:Version}),
libmono-windowsbase3.0-cil (= ${source:Version}),
libmono-windowsbase4.0-cil (= ${source:Version}),
@@ -494,12 +495,12 @@ Description: Mono C5 library
.
This package contains the Mono C5 library.
-Package: libmono-webbrowser0.5-cil
+Package: libmono-webbrowser2.0-cil
Architecture: all
Depends: ${misc:Depends},
${cli:Depends}
Recommends: ${cli:Recommends}
-Description: Mono Web Browser library
+Description: Mono Web Browser library (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.
Mono provides a complete CLR (Common Language Runtime) including compiler and
@@ -507,7 +508,22 @@ Description: Mono Web Browser library
bytecode (aka assemblies), and a class library.
.
This package contains the implementation of the WebControl class based on the
- Mozilla engine using libgluezilla.
+ Mozilla engine using libgluezilla for CLI 2.0.
+
+Package: libmono-webbrowser4.0-cil
+Architecture: all
+Depends: ${misc:Depends},
+ ${cli:Depends}
+Recommends: ${cli:Recommends}
+Description: Mono Web Browser library (for CLI 4.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.
+ 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 implementation of the WebControl class based on the
+ Mozilla engine using libgluezilla for CLI 4.0.
Package: libmono-management2.0-cil
Architecture: all
diff --git a/debian/libmono-webbrowser0.5-cil.install b/debian/libmono-webbrowser0.5-cil.install
deleted file mode 100644
index 0acdaa2..0000000
--- a/debian/libmono-webbrowser0.5-cil.install
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/mono/4.0/Mono.WebBrowser.dll*
-/usr/lib/mono/gac/Mono.WebBrowser/0.5.0.0__*/
diff --git a/debian/libmono-webbrowser0.5-cil.clideps-override b/debian/libmono-webbrowser2.0-cil.clideps-override
similarity index 100%
copy from debian/libmono-webbrowser0.5-cil.clideps-override
copy to debian/libmono-webbrowser2.0-cil.clideps-override
diff --git a/debian/libmono-webbrowser2.0-cil.install b/debian/libmono-webbrowser2.0-cil.install
new file mode 100644
index 0000000..faa24b9
--- /dev/null
+++ b/debian/libmono-webbrowser2.0-cil.install
@@ -0,0 +1,2 @@
+/usr/lib/mono/2.0/Mono.WebBrowser.dll*
+/usr/lib/mono/gac/Mono.WebBrowser/2.0.0.0__*/
diff --git a/debian/libmono-webbrowser0.5-cil.clideps-override b/debian/libmono-webbrowser4.0-cil.clideps-override
similarity index 100%
rename from debian/libmono-webbrowser0.5-cil.clideps-override
rename to debian/libmono-webbrowser4.0-cil.clideps-override
diff --git a/debian/libmono-webbrowser4.0-cil.install b/debian/libmono-webbrowser4.0-cil.install
new file mode 100644
index 0000000..151198e
--- /dev/null
+++ b/debian/libmono-webbrowser4.0-cil.install
@@ -0,0 +1,2 @@
+/usr/lib/mono/4.0/Mono.WebBrowser.dll*
+/usr/lib/mono/gac/Mono.WebBrowser/4.0.0.0__*/
diff --git a/debian/rules b/debian/rules
index 20e2614..582dc97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -194,7 +194,6 @@ install-stamp:
# mono 2.10.1 bug, this lib is really linked against corlib 4.0
rm -f $(CURDIR)/debian/tmp/usr/lib/mono/2.0/Mono.C5.dll
- rm -f $(CURDIR)/debian/tmp/usr/lib/mono/2.0/Mono.WebBrowser.dll
# mono 2.10.1 bug, prj2make was removed but the start script not
rm -f $(CURDIR)/debian/tmp/usr/bin/prj2make
# mono 2.10.1 bug, this lib doesn't exist for .NET 4.0 and also has
@@ -255,7 +254,8 @@ binary-indep: build-stamp install-stamp
install -m 644 debian/System.Windows.Forms.dll.config debian/libmono-system-windows-forms4.0-cil/usr/lib/mono/gac/System.Windows.Forms/4.0.*/
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.Cairo.dll.config debian/libmono-cairo4.0-cil/usr/lib/mono/gac/Mono.Cairo/4.0.*/
- install -m 644 debian/Mono.WebBrowser.dll.config debian/libmono-webbrowser0.5-cil/usr/lib/mono/gac/Mono.WebBrowser/0.5.*/
+ install -m 644 debian/Mono.WebBrowser.dll.config debian/libmono-webbrowser2.0-cil/usr/lib/mono/gac/Mono.WebBrowser/2.0.*/
+ install -m 644 debian/Mono.WebBrowser.dll.config debian/libmono-webbrowser4.0-cil/usr/lib/mono/gac/Mono.WebBrowser/4.0.*/
dh_link -i
dh_installchangelogs -i -X ChangeLog
@@ -300,7 +300,6 @@ binary-indep: build-stamp install-stamp
debian/dh_makeclilibs -p libmono-security4.0-cil -m 2.10.1 $(DH_INTERNAL_MONO_PARAM)
debian/dh_makeclilibs -p libmono-sqlite2.0-cil -m 1.2.6 $(DH_INTERNAL_MONO_PARAM)
debian/dh_makeclilibs -p libmono-sqlite4.0-cil -m 2.10.1 $(DH_INTERNAL_MONO_PARAM)
- debian/dh_makeclilibs -p libmono-webbrowser0.5-cil -m 2.4 $(DH_INTERNAL_MONO_PARAM)
debian/dh_makeclilibs -p libmono-winforms2.0-cil -m 2.4 $(DH_INTERNAL_MONO_PARAM)
debian/dh_makeclilibs -p libmono-winforms4.0-cil -m 2.10.1 $(DH_INTERNAL_MONO_PARAM)
# unstable and preview APIs get tighter clilibs
--
mono
More information about the Pkg-mono-svn-commits
mailing list