[Pkg-mono-svn-commits] rev 4012 - in mono-tools/trunk/debian: . patches
Jo Shields
directhex-guest at alioth.debian.org
Tue Jul 7 22:36:06 UTC 2009
Author: directhex-guest
Date: 2009-07-07 22:36:06 +0000 (Tue, 07 Jul 2009)
New Revision: 4012
Added:
mono-tools/trunk/debian/10_monodochttp
mono-tools/trunk/debian/mono-tools-devel.manpages
mono-tools/trunk/debian/mono-tools-gui.manpages
mono-tools/trunk/debian/monodoc-http-script
mono-tools/trunk/debian/monodoc-http.1
mono-tools/trunk/debian/monodoc-http.conffiles
mono-tools/trunk/debian/monodoc-http.desktop
mono-tools/trunk/debian/monodoc-http.dirs
mono-tools/trunk/debian/monodoc-http.hostxsp2
mono-tools/trunk/debian/monodoc-http.install
mono-tools/trunk/debian/monodoc-http.links
mono-tools/trunk/debian/monodoc-http.manpages
mono-tools/trunk/debian/monodoc-http.menu
mono-tools/trunk/debian/monodoc.xpm
Removed:
mono-tools/trunk/debian/patches/01-use_real_nunit.patch
mono-tools/trunk/debian/patches/02-startup_mono_path.patch
mono-tools/trunk/debian/patches/03-mozilla_home.patch
mono-tools/trunk/debian/patches/05-cecil.patch
mono-tools/trunk/debian/patches/06-nunit_2.4_port.patch
mono-tools/trunk/debian/patches/07-webkit-sharp_port.patch
mono-tools/trunk/debian/patches/dont_bundle_cecil.patch
Modified:
mono-tools/trunk/debian/changelog
mono-tools/trunk/debian/control
mono-tools/trunk/debian/mono-tools-gui.install
mono-tools/trunk/debian/patches/04-gendarme_link_libraries_correctly.patch
mono-tools/trunk/debian/patches/series
mono-tools/trunk/debian/rules
Log:
* New upstream release
* debian/gnunit.install,
debian/gnunit2.install,
debian/gnunit.desktop,
debian/gnunit2.desktop,
debian/control:
+ Remove GNunit - abandoned upstream
* debian/monodoc.1,
debian/monodoc-browser.manpages:
+ Provide a manpage for the "monodoc" command
* debian/rules:
+ Enhance get-orig-source rule to produce consistent md5sums
* debian/mono-tools-gui.install,
debian/control:
+ Add mperfmon to the apps in mono-tools-gui
+ Add gsharp to the apps in mono-tools-gui
* debian/control:
+ Bump to Standards version 3.8.2
+ Remove build-dependencies on web browser engines that aren't Webkit
as we only install one anyway
+ Remove seemingly pointless lynx Recommends on monodoc-browser
+ Build-depends on NUnit 2.4, not 2.2
+ Add new gsharp dependencies
* debian/monodoc-http.conffiles,
debian/monodoc-http.dirs,
debian/monodoc-http.hostxsp2,
debian/monodoc-http.links,
debian/monodoc-http.menu,
debian/monodoc-http.desktop,
debian/monodoc-http.install,
debian/monodoc-http.manpages,
debian/monodoc-http-script:
+ Add MonoDoc HTTP frontend (transplanted packaging files from old
monodoc source package)
* debian/mono-tools-devel.manpages,
debian/mono-tools-gui.manpages:
+ Include as many manpages as upstream provide us with
* debian/patches/02-startup_mono_path.patch,
debian/patches/dont_bundle_cecil.patch:
+ Removed, obsoleted by upstream
* debian/patches/03-mozilla_home.patch:
+ Removed, we don't care about Moz anymore
* debian/patches/04-gendarme_link_libraries_correctly.patch:
+ Refreshed
Added: mono-tools/trunk/debian/10_monodochttp
===================================================================
--- mono-tools/trunk/debian/10_monodochttp (rev 0)
+++ mono-tools/trunk/debian/10_monodochttp 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1,4 @@
+# This is the configuration file
+# for the monodoc-http
+path = /usr/lib/monodoc/web
+alias = /monodoc
Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/changelog 2009-07-07 22:36:06 UTC (rev 4012)
@@ -1,14 +1,51 @@
-mono-tools (2.0-4) UNRELEASED; urgency=low
+mono-tools (2.4.2-1) UNRELEASED; urgency=low
+ * New upstream release
+ * debian/gnunit.install,
+ debian/gnunit2.install,
+ debian/gnunit.desktop,
+ debian/gnunit2.desktop,
+ debian/control:
+ + Remove GNunit - abandoned upstream
* debian/monodoc.1,
debian/monodoc-browser.manpages:
+ Provide a manpage for the "monodoc" command
* debian/rules:
+ Enhance get-orig-source rule to produce consistent md5sums
+ * debian/mono-tools-gui.install,
+ debian/control:
+ + Add mperfmon to the apps in mono-tools-gui
+ + Add gsharp to the apps in mono-tools-gui
* debian/control:
+ Bump to Standards version 3.8.2
+ + Remove build-dependencies on web browser engines that aren't Webkit
+ as we only install one anyway
+ + Remove seemingly pointless lynx Recommends on monodoc-browser
+ + Build-depends on NUnit 2.4, not 2.2
+ + Add new gsharp dependencies
+ * debian/monodoc-http.conffiles,
+ debian/monodoc-http.dirs,
+ debian/monodoc-http.hostxsp2,
+ debian/monodoc-http.links,
+ debian/monodoc-http.menu,
+ debian/monodoc-http.desktop,
+ debian/monodoc-http.install,
+ debian/monodoc-http.manpages,
+ debian/monodoc-http-script:
+ + Add MonoDoc HTTP frontend (transplanted packaging files from old
+ monodoc source package)
+ * debian/mono-tools-devel.manpages,
+ debian/mono-tools-gui.manpages:
+ + Include as many manpages as upstream provide us with
+ * debian/patches/02-startup_mono_path.patch,
+ debian/patches/dont_bundle_cecil.patch:
+ + Removed, obsoleted by upstream
+ * debian/patches/03-mozilla_home.patch:
+ + Removed, we don't care about Moz anymore
+ * debian/patches/04-gendarme_link_libraries_correctly.patch:
+ + Refreshed
- -- Jo Shields <directhex at apebox.org> Wed, 10 Jun 2009 19:42:00 +0100
+ -- Jo Shields <directhex at apebox.org> Tue, 07 Jul 2009 17:51:43 +0100
mono-tools (2.0-3) unstable; urgency=low
Modified: mono-tools/trunk/debian/control
===================================================================
--- mono-tools/trunk/debian/control 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/control 2009-07-07 22:36:06 UTC (rev 4012)
@@ -10,17 +10,21 @@
automake,
autotools-dev,
mono-devel (>= 2.0.1),
- libmono-nunit2.2-cil,
+ libmono-nunit2.4-cil,
libmono-winforms2.0-cil,
libmono-system-web2.0-cil,
libgtk2.0-cil (>= 2.0),
libgconf2.0-cil (>= 2.0),
libglade2.0-cil (>= 2.0),
libgnome2.24-cil (>= 2.0),
- libgtkhtml3.16-cil,
- libmono-webbrowser0.5-cil,
libwebkit1.0-cil,
- monodoc-base (>= 1.1.9)
+ monodoc-base (>= 1.1.9),
+ mono-xsp-base,
+ libmono-system-ldap2.0-cil,
+ libmono-microsoft8.0-cil,
+ libmono-cscompmgd8.0-cil,
+ libmono-management2.0-cil,
+ mono-csharp-shell
Standards-Version: 3.8.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/mono-tools/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/mono-tools/trunk/
@@ -29,7 +33,6 @@
Provides: monodoc-viewer
Replaces: monodoc-base (<< 1.1.9)
Architecture: all
-Recommends: lynx
Depends: ${cli:Depends}, monodoc-manual
Description: MonoDoc GTK+ based viewer
The MonoDoc Project is the documentation framework of the Mono project which
@@ -38,30 +41,6 @@
.
This package contains the GTK+ based viewer of the Mono documentation.
-Package: gnunit
-Architecture: all
-Depends: ${cli:Depends}
-Description: frontend for running NUnit 2 test suites
- gnunit (formerly known as nunit-gtk) is a frontend for NUnit which uses
- the Mono class library version 1.0.
- .
- NUnit is a unit testing framework for all .NET languages. It serves the
- same purpose as JUnit does in the Java world. It supports test
- categories, testing for exceptions and writing test results in plain
- text or XML.
-
-Package: gnunit2
-Architecture: all
-Depends: ${cli:Depends}
-Description: frontend for running NUnit 2 test suites
- gnunit2 (formerly known as nunit-gtk) is a frontend for NUnit which uses
- the Mono class library version 2.0.
- .
- NUnit is a unit testing framework for all .NET languages. It serves the
- same purpose as JUnit does in the Java world. It supports test
- categories, testing for exceptions and writing test results in plain
- text or XML.
-
Package: mono-tools-gui
Architecture: all
Depends: ${cli:Depends}
@@ -71,6 +50,8 @@
- gasnview
- ilcontrast
- gui-compare
+ - mperfmon
+ - gsharp
Package: mono-tools-devel
Architecture: all
@@ -100,3 +81,18 @@
- mprof-decoder
- mprof-heap-viewer
+Package: monodoc-http
+Provides: monodoc-viewer
+Architecture: all
+Depends: monodoc-manual,
+ ${cli:Depends},
+ ${cli:XspServer2},
+ monodoc-base
+Description: MonoDoc http based viewer
+ The MonoDoc Project is the documentation framework of the Mono project which
+ provides detailed API documentation for all Mono components and the Mono CLI
+ implementation.
+ .
+ This package contains ASP.NET scripts which allow viewing the Mono
+ documentation via an ASP.NET enabled webserver with a standard http
+ webbrowser.
Added: mono-tools/trunk/debian/mono-tools-devel.manpages
===================================================================
--- mono-tools/trunk/debian/mono-tools-devel.manpages (rev 0)
+++ mono-tools/trunk/debian/mono-tools-devel.manpages 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/create-native-map.1
Modified: mono-tools/trunk/debian/mono-tools-gui.install
===================================================================
--- mono-tools/trunk/debian/mono-tools-gui.install 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/mono-tools-gui.install 2009-07-07 22:36:06 UTC (rev 4012)
@@ -6,3 +6,8 @@
debian/tmp/usr/share/pixmaps/ilcontrast.png
debian/tmp/usr/bin/gui-compare
debian/tmp/usr/lib/gui-compare/
+debian/tmp/usr/bin/mperfmon
+debian/tmp/usr/lib/mperfmon/
+debian/tmp/usr/bin/gsharp
+debian/tmp/usr/lib/gsharp/
+debian/tmp/usr/share/applications/gsharp.desktop
Added: mono-tools/trunk/debian/mono-tools-gui.manpages
===================================================================
--- mono-tools/trunk/debian/mono-tools-gui.manpages (rev 0)
+++ mono-tools/trunk/debian/mono-tools-gui.manpages 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/mperfmon.1
Added: mono-tools/trunk/debian/monodoc-http-script
===================================================================
--- mono-tools/trunk/debian/monodoc-http-script (rev 0)
+++ mono-tools/trunk/debian/monodoc-http-script 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1,18 @@
+#!/bin/bash
+export LANG=C
+unset port
+
+while test -z "$port" ; do
+ port=$RANDOM
+ if [ $port -lt 1025 ] || netstat -a -n | grep -q :$port ; then
+ unset port
+ fi
+done
+
+clear
+echo -e "\n\nThe XSP web server is starting now. To view the monodoc pages, your"
+echo -e "web browser will open http://localhost:$port/ now.\n\n"
+
+(sleep 5; sensible-browser http://localhost:$port/) &
+
+exec xsp2 --root /usr/lib/monodoc/web --port $port --address 127.0.0.1
Property changes on: mono-tools/trunk/debian/monodoc-http-script
___________________________________________________________________
Added: svn:executable
+ *
Added: mono-tools/trunk/debian/monodoc-http.1
===================================================================
--- mono-tools/trunk/debian/monodoc-http.1 (rev 0)
+++ mono-tools/trunk/debian/monodoc-http.1 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1,11 @@
+.TH UNDOCUMENTED 1 "January 15th, 2004" "Debian GNU/Linux" "MonoDoc Manual"
+.SH NAME
+undocumented \- No manpage for this program.
+.SH DESCRIPTION
+This
+.B program
+does not have a manpage. Run this command with the
+.B --help
+switch to see what it does. For further information, refer to the .NET
+documentation from the Mono project, located on
+.B http://www.go-mono.com/docs/
Added: mono-tools/trunk/debian/monodoc-http.conffiles
===================================================================
--- mono-tools/trunk/debian/monodoc-http.conffiles (rev 0)
+++ mono-tools/trunk/debian/monodoc-http.conffiles 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1,2 @@
+/etc/mono-server2/conf.d/monodoc-http/10_monodoc-http
+/etc/xsp2/conf.d/monodoc-http/10_monodoc-http
Added: mono-tools/trunk/debian/monodoc-http.desktop
===================================================================
--- mono-tools/trunk/debian/monodoc-http.desktop (rev 0)
+++ mono-tools/trunk/debian/monodoc-http.desktop 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Monodoc (http)
+GenericName=Documentation Browser
+Comment=Monodoc Documentation Browser
+Exec=monodoc-http
+Icon=monodoc.png
+StartupNotify=false
+Terminal=true
+Type=Application
+Categories=Application;Development;
Added: mono-tools/trunk/debian/monodoc-http.dirs
===================================================================
--- mono-tools/trunk/debian/monodoc-http.dirs (rev 0)
+++ mono-tools/trunk/debian/monodoc-http.dirs 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/monodoc/web
Added: mono-tools/trunk/debian/monodoc-http.hostxsp2
===================================================================
--- mono-tools/trunk/debian/monodoc-http.hostxsp2 (rev 0)
+++ mono-tools/trunk/debian/monodoc-http.hostxsp2 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1,4 @@
+# This is the configuration file
+# for the monodoc-http
+path = /usr/lib/monodoc/web
+alias = /monodoc
Added: mono-tools/trunk/debian/monodoc-http.install
===================================================================
--- mono-tools/trunk/debian/monodoc-http.install (rev 0)
+++ mono-tools/trunk/debian/monodoc-http.install 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/monodoc/web/ /usr/share/monodoc/
+debian/monodoc-http.desktop /usr/share/applications/
+debian/monodoc.xpm /usr/share/pixmaps/
Added: mono-tools/trunk/debian/monodoc-http.links
===================================================================
--- mono-tools/trunk/debian/monodoc-http.links (rev 0)
+++ mono-tools/trunk/debian/monodoc-http.links 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1,2 @@
+/usr/share/monodoc/web /usr/lib/monodoc/web
+
Added: mono-tools/trunk/debian/monodoc-http.manpages
===================================================================
--- mono-tools/trunk/debian/monodoc-http.manpages (rev 0)
+++ mono-tools/trunk/debian/monodoc-http.manpages 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1 @@
+debian/monodoc-http.1
Added: mono-tools/trunk/debian/monodoc-http.menu
===================================================================
--- mono-tools/trunk/debian/monodoc-http.menu (rev 0)
+++ mono-tools/trunk/debian/monodoc-http.menu 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1,3 @@
+?package(monodoc-http):needs="text" section="Applications/Programming"\
+ title="Monodoc (http)" command="/usr/bin/monodoc-http"\
+ icon="/usr/share/pixmaps/monodoc.xpm"
Added: mono-tools/trunk/debian/monodoc.xpm
===================================================================
--- mono-tools/trunk/debian/monodoc.xpm (rev 0)
+++ mono-tools/trunk/debian/monodoc.xpm 2009-07-07 22:36:06 UTC (rev 4012)
@@ -0,0 +1,159 @@
+/* XPM */
+static char *monodoc_new[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 121 2",
+" c #01BF01C101CE",
+". c #07BF07C60778",
+"X c #0C510C590C58",
+"o c #1325134613AF",
+"O c #1BDC1C0C1CE3",
+"+ c #1F611FE32127",
+"@ c #228B22CA23A5",
+"# c #277A27AD2791",
+"$ c #255325972815",
+"% c #2B542BB82CA8",
+"& c #2F8D302432BB",
+"* c #331A33633451",
+"= c #354735C03952",
+"- c #3CE03D123BB2",
+"; c #3D213DB041AE",
+": c #4331439B44F9",
+"> c #48094837453D",
+", c #44B0452D482F",
+"< c #4CA84D0E4CE2",
+"1 c #4C2B4CB051E3",
+"2 c #526952D95375",
+"3 c #540054C75A50",
+"4 c #5C275C735A1A",
+"5 c #5AFE5BEE622D",
+"6 c #5F175FEE5FF9",
+"7 c #62B963616408",
+"8 c #6C3E6C8E668E",
+"9 c #655066266B52",
+"0 c #679168156B81",
+"q c #6C256CA96B1E",
+"w c #6FC970236CC8",
+"e c #712871C96E43",
+"r c #6D106DD672C7",
+"t c #6FED70DF7580",
+"y c #739D744374C8",
+"u c #777377FA77F4",
+"i c #7A427AD7768F",
+"p c #7555764D7D3E",
+"a c #76D678267CE8",
+"s c #7BA97C427A04",
+"d c #7FC9805E7C20",
+"f c #825082617BB1",
+"g c #7CF87DDB8647",
+"h c #831583F2846B",
+"j c #896C89A78204",
+"k c #834384328B27",
+"l c #86E2880D8EEF",
+"z c #8B9A8C798BD6",
+"x c #8F7E90D98F78",
+"c c #92A493558CD2",
+"v c #8C308D28951F",
+"b c #8EA38FA59B45",
+"n c #8F8A903D93F1",
+"m c #8F68907E9BD6",
+"M c #92E9940494D2",
+"N c #9A559AC293F8",
+"B c #9128925C9C7D",
+"V c #97F29990983A",
+"C c #9D8B9ECC9C8D",
+"Z c #A2FCA3D59D8A",
+"A c #AA2CAA2B9FB4",
+"S c #9C639D68A3F8",
+"D c #9E1D9F54A941",
+"F c #9F60A058A6E8",
+"G c #9FF3A0F8A9F5",
+"H c #A3DBA51BA420",
+"J c #A73DA913A6D7",
+"K c #AB3AABF3A4EB",
+"L c #A27AA37AAA40",
+"P c #A76BA95AA832",
+"I c #AC34AD68AA83",
+"U c #B013B0EDABB2",
+"Y c #B1E5B201A754",
+"T c #B2D1B348AACF",
+"R c #A4D4A628B595",
+"E c #AB1EAC13B31B",
+"W c #A969AAA9B8A0",
+"Q c #AF6BB051B3D1",
+"! c #B379B452B49C",
+"~ c #BA1EBAFEB775",
+"^ c #B1EFB31DBBA2",
+"/ c #BA05BB2ABFDD",
+"( c #BFC7C044B8FF",
+") c #C06BC18DBB8B",
+"_ c #B3D6B50CC371",
+"` c #BC2BBD61CBE0",
+"' c #BEDEC058D11B",
+"] c #C952CA30C392",
+"[ c #C3BCC4FFCC66",
+"{ c #CD7DCE5ECDDD",
+"} c #D351D41FCEFD",
+"| c #C4CAC68CD77D",
+" . c #CB2BCC7ED609",
+".. c #CDA1CEE8DEE9",
+"X. c #D27ED36ED595",
+"o. c #DCEDDDD4D7C6",
+"O. c #D827D946DCCD",
+"+. c #DB6ADC52DB01",
+"@. c #DFFEE0C3DA91",
+"#. c #E131E23ADDA5",
+"$. c #D03DD1BFE177",
+"%. c #D362D4BFE3CA",
+"&. c #D7A9D993E458",
+"*. c #DD65DEAFE4A9",
+"=. c #D583D707E9FB",
+"-. c #DCA3DE0DEED4",
+";. c #DC00DDA7F13E",
+":. c #E01BE158E708",
+">. c #DF29E0EDED1F",
+",. c #E05BE20CF0D3",
+"<. c #E43AE541E5C3",
+"1. c #E773E877E4B9",
+"2. c #EB07EC03E527",
+"3. c #E43EE5F4EDE2",
+"4. c #E7E8E8F0EDD0",
+"5. c #EB0BEC0DEE2E",
+"6. c #EFCEF0D0ED65",
+"7. c #F263F364ED7E",
+"8. c #EC0BED4EF212",
+"9. c #F48BF590F120",
+"0. c None",
+/* pixels */
+"0.0.0.0.0.0.0.0.0.0.0. 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0.0.0.0.X X 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0.0.0.X 8 f % 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0.0. > A Y N > X 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0. # N Y Y Y A 8 O 0.0.0.0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0.o d Y Y Y Y Y Y f * 0.0.0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.. 4 Y Z f i i N K T Z 2 o 0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0. = Z C e Z ) Y f e N Y A e @ 0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0. O z C w T 7.9.9.2.) w N K K c - . 0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.X e Z q T 7.7.7.7.7.) < w N K I Z 4 o 0.0.0.0.0.0.0.",
+"0.0.0.0. 1 H y J 7.7.7.7.7.} e H K u y M K K d # . 0.0.0.0.0.0.",
+"0.0.0. % V j u <.6.6.7.6.6.#.o.6.6.1.! u d J K M > X 0.0.0.0.",
+"0.0. o h I 7 4 <.5.5.6.5.7.6.6.6.6.6.7.o.z y H K H 0 O 0.0.0.",
+"0.0.. 5 H M 7 ! 5.5.5.5.5.5.5.5.5.4.X.{ ~ h = i J J J h $ 0.0.",
+"0. : C H 0 ! 5.5.5.5.5.5.5.5.5.5.X.t 2 2 2 y 0 z J I z O 0.0.0.",
+" X h L L 7 { 8.6.4.*.4.5.5.4.4.5.5.<.O.O.4.8.[ q C C : 0.0.0.",
+"0. * k H h a E E h n 3.4.4.4.4.4.4.4.4.4.5.8.&.t h 6 . 0.0.0.0.",
+"0.0. O 0 S k y 3 w .3.4.3.4.3.4.4.4.4.5.*.I t a y o 0.0.0.0.",
+"0.0.0. X , n D y ^ 3.3.3.4.3.3.4.4.3.:.Q a t B n % @ o 0.0.0.0.",
+"0.0.0. O O # r r O.,.3.3.3.3.3.3.:._ a q l H S , * Z 7 0.0.0.0.",
+"0.0.0.0.o 9 ; X 2 =.>.>.3.3.>.3.*.v 6 l D G G 0 O z #.o.2 0.0.",
+"0.0.0.0. ; R 9 O 5 | >.>.-.-.3.=.r b D G G g + 8 { #.~ 4 . 0.0.",
+"0.0.0.0.0.. g | k % * G =.-.-.-.>.l g D D m = , T J 7 O . 0.0.",
+"0.0.0.0.0.0.+ ^ $.F : + g ..3.-.-.` 9 S S 1 $ y 2 O 0.0.0.0.0.",
+"0.0.0.0.0.0.0.3 =.%.W 0 O 1 _ ;.;.$.t b r o O o 0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.o m ;.=.` k & % b =.=.S 5 @ 0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0.* ` ;.=.` R 1 O 9 | W @ 0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0.. r =.;.;.` b & ; 3 X 0.0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0.0.O R =.W 9 O . . 0.0.0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0.0. = 3 O 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0.0.0. 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0."
+};
Deleted: mono-tools/trunk/debian/patches/01-use_real_nunit.patch
===================================================================
--- mono-tools/trunk/debian/patches/01-use_real_nunit.patch 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/patches/01-use_real_nunit.patch 2009-07-07 22:36:06 UTC (rev 4012)
@@ -1,51 +0,0 @@
---- mono-tools-2.0.orig/configure.in
-+++ mono-tools-2.0/configure.in
-@@ -35,7 +35,7 @@
- AC_SUBST(GACUTIL)
-
-
--PKG_CHECK_MODULES(NUNIT, mono-nunit)
-+PKG_CHECK_MODULES(NUNIT, nunit)
- AC_SUBST(NUNIT_LIBS)
-
- PKG_CHECK_MODULES(MONODOC, monodoc)
---- mono-tools-2.0.orig/gnunit/src/AssemblyStore.cs
-+++ mono-tools-2.0/gnunit/src/AssemblyStore.cs
-@@ -574,6 +574,11 @@
- idle.Set ();
- }
-
-+ void EventListener.TestOutput (TestOutput testOutput)
-+ {
-+ ;
-+ }
-+
- void SetIconFromResult (TestResult result)
- {
- CircleColor color;
---- mono-tools-2.0.orig/gnunit/src/main.cs
-+++ mono-tools-2.0/gnunit/src/main.cs
-@@ -284,6 +284,11 @@
- return inner_filter.Pass (test);
- }
-
-+ public bool Exclude
-+ {
-+ get { return false; }
-+ }
-+
- static string _ (string key)
- {
- return Catalog.GetString (key);
-@@ -767,6 +772,11 @@
- ClockUpdater (this, EventArgs.Empty);
- }
-
-+ void EventListener.TestOutput (TestOutput testOutput)
-+ {
-+ ;
-+ }
-+
- // Misc.
-
- void UpdateRunStatus ()
Deleted: mono-tools/trunk/debian/patches/02-startup_mono_path.patch
===================================================================
--- mono-tools/trunk/debian/patches/02-startup_mono_path.patch 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/patches/02-startup_mono_path.patch 2009-07-07 22:36:06 UTC (rev 4012)
@@ -1,12 +0,0 @@
---- mono-tools-2.0.orig/gnunit/src/script.in
-+++ mono-tools-2.0/gnunit/src/script.in
-@@ -1,2 +1,3 @@
- #!/bin/sh
-+export MONO_PATH=/usr/lib/nunit:$MONO_PATH
- exec @RUNTIME@ @mono_one_instdir@/@exe_file@ "$@"
---- mono-tools-2.0.orig/gnunit/src/script2.in
-+++ mono-tools-2.0/gnunit/src/script2.in
-@@ -1,2 +1,3 @@
- #!/bin/sh
-+export MONO_PATH=/usr/lib/nunit:$MONO_PATH
- exec @RUNTIME@ @mono_two_instdir@/@exe_file@ "$@"
Deleted: mono-tools/trunk/debian/patches/03-mozilla_home.patch
===================================================================
--- mono-tools/trunk/debian/patches/03-mozilla_home.patch 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/patches/03-mozilla_home.patch 2009-07-07 22:36:06 UTC (rev 4012)
@@ -1,34 +0,0 @@
---- mono-tools-2.0.orig/configure.in
-+++ mono-tools-2.0/configure.in
-@@ -62,7 +62,7 @@
-
- if test "x$enable_gecko" = "xyes"; then
- # get the mozilla home directory
-- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
-+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir xulrunner-gtkmozembed`"
- AC_SUBST(MOZILLA_HOME)
- fi
-
---- mono-tools-2.0.orig/ilcontrast/ilcontrast.in
-+++ mono-tools-2.0/ilcontrast/ilcontrast.in
-@@ -19,16 +19,20 @@
- elif test x at MOZILLA_HOME@ != x; then
- if [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
- MOZILLA_HOME=@MOZILLA_HOME@
-+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
- fi
- elif grep GRE_PATH /etc/gre.d/*.conf > /dev/null ; then
- MOZILLA_HOME=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d = | head -n 1)
-+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
- elif [ $(which xulrunner 2> /dev/null) ] > /dev/null ; then
- MOZILLA_FIVE_HOME=`getdirectory xulrunner`
- MOZILLA_HOME=$MOZILLA_FIVE_HOME
- elif [ $(which mozilla 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then
- MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2)
-+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
- elif [ $(which firefox 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then
- MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f 2)
-+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
- fi
-
- if [ -n $LD_LIBRARY_PATH ]; then
Modified: mono-tools/trunk/debian/patches/04-gendarme_link_libraries_correctly.patch
===================================================================
--- mono-tools/trunk/debian/patches/04-gendarme_link_libraries_correctly.patch 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/patches/04-gendarme_link_libraries_correctly.patch 2009-07-07 22:36:06 UTC (rev 4012)
@@ -1,11 +1,12 @@
---- mono-tools-2.0.orig/gendarme/rules/Gendarme.Rules.Portability/Makefile.am
-+++ mono-tools-2.0/gendarme/rules/Gendarme.Rules.Portability/Makefile.am
-@@ -13,7 +13,7 @@
- CLEANFILES = $(rules_dll) $(rules_dll).mdb $(tests_dll)
- DISTCLEANFILES = Makefile.in Gendarme.Rules.Portability.xml TestResult.xml
+Index: mono-tools-2.4.2/gendarme/rules/Gendarme.Rules.Portability/Makefile.am
+===================================================================
+--- mono-tools-2.4.2.orig/gendarme/rules/Gendarme.Rules.Portability/Makefile.am 2009-02-23 18:52:20.000000000 +0000
++++ mono-tools-2.4.2/gendarme/rules/Gendarme.Rules.Portability/Makefile.am 2009-07-07 20:40:33.000000000 +0100
+@@ -1,6 +1,6 @@
+ include ../common.make
--EXTRA_RULES_OPTIONS = -r:ICSharpCode.SharpZipLib.dll -pkg:dotnet
-+EXTRA_RULES_OPTIONS = -r:ICSharpCode.SharpZipLib.dll -r:System.Web.Services
+-EXTRA_RULES_OPTIONS += -r:ICSharpCode.SharpZipLib.dll -pkg:dotnet
++EXTRA_RULES_OPTIONS += -r:ICSharpCode.SharpZipLib.dll -r:System.Web.Services
- rules_sources = \
+ rules_sources = \
DoNotHardcodePathsRule.cs \
Deleted: mono-tools/trunk/debian/patches/05-cecil.patch
===================================================================
--- mono-tools/trunk/debian/patches/05-cecil.patch 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/patches/05-cecil.patch 2009-07-07 22:36:06 UTC (rev 4012)
@@ -1,20 +0,0 @@
---- mono-tools-2.0.orig/configure.in
-+++ mono-tools-2.0/configure.in
-@@ -119,13 +119,13 @@
- dnl
- dnl I hate PKG_CONFIG_MODULES, that is for the weak
- dnl
--if pkg-config --modversion cecil>/dev/null; then
--AC_MSG_RESULT("Found cecil.pc")
-+if pkg-config --modversion mono-cecil>/dev/null; then
-+AC_MSG_RESULT("Found mono-cecil.pc")
- else
--AC_MSG_ERROR([You are missing Cecil (cecil.pc for packageconfig) required for gui-compare])
-+AC_MSG_ERROR([You are missing Cecil (mono-cecil.pc for packageconfig) required for gui-compare])
- fi
-
--CECIL_ASM=`pkg-config --variable=Libraries cecil`
-+CECIL_ASM=`pkg-config --variable=Libraries mono-cecil`
- AC_SUBST(CECIL_ASM)
-
- dnl Intl
Deleted: mono-tools/trunk/debian/patches/06-nunit_2.4_port.patch
===================================================================
--- mono-tools/trunk/debian/patches/06-nunit_2.4_port.patch 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/patches/06-nunit_2.4_port.patch 2009-07-07 22:36:06 UTC (rev 4012)
@@ -1,240 +0,0 @@
---- mono-tools-2.0.orig/gnunit/src/AssemblyStore.cs
-+++ mono-tools-2.0/gnunit/src/AssemblyStore.cs
-@@ -40,9 +40,9 @@
- }
- }
-
-- delegate void TestStartHandler (TestCase test);
-+ delegate void TestStartHandler (TestName test);
- delegate void TestFinishHandler (TestCaseResult result);
-- delegate void SuiteStartHandler (TestSuite test);
-+ delegate void SuiteStartHandler (TestName test);
- delegate void SuiteFinishHandler (TestSuiteResult result);
- delegate void TestCaseResultHandler (TestResult result);
-
-@@ -71,9 +71,9 @@
- class QueuedSuiteStart : QueuedEvent
- {
- SuiteStartHandler handler;
-- TestSuite suite;
-+ TestName suite;
-
-- public QueuedSuiteStart (SuiteStartHandler handler, TestSuite suite)
-+ public QueuedSuiteStart (SuiteStartHandler handler, TestName suite)
- {
- this.handler = handler;
- this.suite = suite;
-@@ -105,9 +105,9 @@
- class QueuedTestStart : QueuedEvent
- {
- TestStartHandler handler;
-- TestCase test;
-+ TestName test;
-
-- public QueuedTestStart (TestStartHandler handler, TestCase test)
-+ public QueuedTestStart (TestStartHandler handler, TestName test)
- {
- this.handler = handler;
- this.test = test;
-@@ -186,7 +186,7 @@
- Queue pending;
- System.Threading.Thread th;
- string location;
-- IFilter filter;
-+ ITestFilter filter;
-
- Exception exception;
- static GLib.GType gtype = GLib.GType.Invalid;
-@@ -220,7 +220,7 @@
- }
- }
-
-- public IFilter Filter {
-+ public ITestFilter Filter {
- get { return filter; }
- set { filter = value; }
- }
-@@ -437,7 +437,7 @@
- {
- TreeIter next;
- foreach (Test t in suite.Tests) {
-- next = AddFixture (parent, t.FullName);
-+ next = AddFixture (parent, t.TestName.FullName);
- if ((n % 5) == 0) {
- while (GLib.MainContext.Iteration ());
- }
-@@ -516,11 +516,11 @@
- }
-
- // Interface NUnit.Core.EventListener
-- void EventListener.RunStarted (Test [] tests)
-+ void EventListener.RunStarted (string name, int testCount)
- {
- }
-
-- void EventListener.RunFinished (TestResult [] results)
-+ void EventListener.RunFinished (TestResult result)
- {
- }
-
-@@ -532,7 +532,7 @@
- {
- }
-
-- void EventListener.TestStarted (TestCase testCase)
-+ void EventListener.TestStarted (TestName testCase)
- {
- if (listener != null) {
- Monitor.Enter (pending);
-@@ -553,7 +553,7 @@
- idle.Set ();
- }
-
-- void EventListener.SuiteStarted (TestSuite suite)
-+ void EventListener.SuiteStarted (TestName suite)
- {
- if (listener != null) {
- Monitor.Enter (pending);
---- mono-tools-2.0.orig/gnunit/src/main.cs
-+++ mono-tools-2.0/gnunit/src/main.cs
-@@ -17,6 +17,7 @@
- using Gnome;
- using Gtk;
- using NUnit.Core;
-+using NUnit.Core.Filters;
- using NUnit.Util;
- using Dialog = Gtk.Dialog;
-
-@@ -125,7 +126,7 @@
- }
- }
-
-- class CategoryMaster : IFilter {
-+ class CategoryMaster : ITestFilter {
- static Hashtable known_categories;
- string [] categories;
- bool [] states;
-@@ -134,7 +135,7 @@
- string [] exclude;
- bool uncategorized;
- bool all;
-- IFilter inner_filter;
-+ ITestFilter inner_filter;
-
- static CategoryMaster ()
- {
-@@ -216,6 +217,10 @@
- get { return cb; }
- }
-
-+ public bool IsEmpty {
-+ get { return false; }
-+ }
-+
- void ToggleState (object sender, EventArgs args)
- {
- CheckMenuItem item = (CheckMenuItem) sender;
-@@ -255,25 +260,19 @@
- idx++;
- }
- }
-- inner_filter = new CategoryFilter (exclude, uncategorized);
-+ inner_filter = new CategoryFilter (exclude);
- } else {
-- inner_filter = new CategoryFilter (categories, uncategorized);
-+ inner_filter = new CategoryFilter (categories);
-+ }
-+
-+ if (uncategorized) {
-+ inner_filter = new NotFilter(inner_filter);
- }
- }
-
- public bool Cancel;
-- bool IFilter.Pass (TestSuite suite)
-- {
-- if (Cancel)
-- return false;
--
-- if (all)
-- return true;
--
-- return inner_filter.Pass (suite);
-- }
-
-- bool IFilter.Pass (TestCase test)
-+ bool ITestFilter.Pass (ITest test)
- {
- if (Cancel)
- return false;
-@@ -284,9 +283,9 @@
- return inner_filter.Pass (test);
- }
-
-- public bool Exclude
-+ public bool Match (ITest test)
- {
-- get { return false; }
-+ return true;
- }
-
- static string _ (string key)
-@@ -724,11 +723,11 @@
- }
-
- // Interface NUnit.Core.EventListener
-- void EventListener.RunStarted (Test [] tests)
-+ void EventListener.RunStarted (string name, int testCount)
- {
- }
-
-- void EventListener.RunFinished (TestResult [] results)
-+ void EventListener.RunFinished (TestResult result)
- {
- }
-
-@@ -740,7 +739,7 @@
- {
- }
-
-- void EventListener.TestStarted (TestCase testCase)
-+ void EventListener.TestStarted (TestName testCase)
- {
- frameLabel.Text = "Test: " + testCase.FullName;
- }
-@@ -752,7 +751,7 @@
-
- assertions += result.AssertCount;
- if (result.Executed == false) {
-- AddIgnored (result.Test.FullName, result.Test.IgnoreReason);
-+ AddIgnored (result.Test.TestName.FullName, result.Test.IgnoreReason);
- } else if (result.IsFailure) {
- AddError (result);
- }
-@@ -762,7 +761,7 @@
- ClockUpdater (this, EventArgs.Empty);
- }
-
-- void EventListener.SuiteStarted (TestSuite suite)
-+ void EventListener.SuiteStarted (TestName suite)
- {
- frameLabel.Text = "Suite: " + suite.FullName;
- }
-@@ -826,7 +825,7 @@
- int dot;
- TreeIter main = TreeIter.Zero;
- TreeIter iter;
-- string fullname = result.Test.FullName;
-+ string fullname = result.Test.TestName.FullName;
- if ((dot = fullname.LastIndexOf ('.')) != -1) {
- string key = fullname.Substring (0, dot);
- if (!errorIters.ContainsKey (key)) {
-@@ -841,7 +840,7 @@
- errorIters [fullname] = main;
- }
-
-- iter = failuresStore.AppendValues (main, result.Test.Name);
-+ iter = failuresStore.AppendValues (main, result.Test.TestName.Name);
- iter = failuresStore.AppendValues (iter, result.Message);
- iter = failuresStore.AppendValues (iter, result.StackTrace);
-
Deleted: mono-tools/trunk/debian/patches/07-webkit-sharp_port.patch
===================================================================
--- mono-tools/trunk/debian/patches/07-webkit-sharp_port.patch 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/patches/07-webkit-sharp_port.patch 2009-07-07 22:36:06 UTC (rev 4012)
@@ -1,1042 +0,0 @@
-Author: Mirco Bauer <meebey at debian.org>
-Reason: Backport of webkit-sharp support, taken from upstream SVN revision:
- r97203, r97657, r97745, r105817, r105820, r105828, r105860 and r105868
-diff -urNad mono-tools-1.9~/configure.in mono-tools-1.9/configure.in
---- mono-tools-1.9~/configure.in 2008-08-10 14:59:40.000000000 +0200
-+++ mono-tools-1.9/configure.in 2008-08-10 14:59:40.000000000 +0200
-@@ -10,6 +10,7 @@
- AC_PATH_PROG(MCS, mcs, no)
- AC_PATH_PROG(GMCS, gmcs, no)
- AC_PATH_PROG(RUNTIME, mono, no)
-+AC_PATH_PROG(GACUTIL, gacutil, no)
-
- CS="C#"
- if test "x$MCS" = "xno" ; then
-@@ -31,6 +32,8 @@
- AC_SUBST(GMCS)
- AC_SUBST(RUNTIME)
- AC_SUBST(RESGEN)
-+AC_SUBST(GACUTIL)
-+
-
- PKG_CHECK_MODULES(NUNIT, mono-nunit)
- AC_SUBST(NUNIT_LIBS)
-@@ -63,9 +66,35 @@
- AC_SUBST(MOZILLA_HOME)
- fi
-
-+dnl TODO: check for webkit-sharp
-+# AM_CONDITIONAL(ENABLE_WEBKIT, test "xno" = "xyes")
-+PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, enable_webkit=yes, enable_webkit=no)
-+AC_SUBST(WEBKIT_SHARP_LIBS)
-+AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes")
-
--if test "x$enable_gtkhtml$enable_gecko" = "xnono" ; then
-- AC_MSG_ERROR([no HTML display found. You need either gtkhtml or gecko])
-+# PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no)
-+# AC_SUBST(MONOWEBBROWSER_LIBS)
-+
-+AC_MSG_CHECKING([for Mono.WebBrowser])
-+if test "x$GACUTIL" = "xno"
-+then
-+ AC_MSG_RESULT([no])
-+ if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi
-+else
-+ if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser"
-+ then
-+ AC_MSG_RESULT([yes])
-+ enable_monowebbrowser=yes
-+ else
-+ AC_MSG_RESULT([no])
-+ enable_monowebbrowser=no
-+ fi
-+fi
-+MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser
-+AM_CONDITIONAL(ENABLE_MONOWEBBROWSER, test "x$enable_monowebbrowser" = "xyes")
-+
-+if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser$enable_webkit" = "xnononono" ; then
-+ AC_MSG_ERROR([no HTML display found. You need either gtkhtml, gecko, WebKit or Mono.WebBrowser])
- fi
-
- dnl
-@@ -183,7 +212,10 @@
- echo "Configuration summary"
- echo ""
- echo " * Installation prefix = $prefix"
--echo " * gecko-sharp.dll = $enable_gecko"
-+echo " * Using Gecko = $enable_gecko"
-+echo " * Using GtkHtml = $enable_gtkhtml"
-+echo " * Using Mono.WebBrowser = $enable_monowebbrowser"
-+echo " * Using WebKit = $enable_webkit"
- echo ""
- echo " NOTE: if any of the above say 'no' you may install the"
- echo " corresponding development packages for them, rerun"
-diff -urNad mono-tools-1.9~/docbrowser/BrowserWidget.cs mono-tools-1.9/docbrowser/BrowserWidget.cs
---- mono-tools-1.9~/docbrowser/BrowserWidget.cs 1970-01-01 01:00:00.000000000 +0100
-+++ mono-tools-1.9/docbrowser/BrowserWidget.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -0,0 +1,108 @@
-+//Permission is hereby granted, free of charge, to any person obtaining
-+//a copy of this software and associated documentation files (the
-+//"Software"), to deal in the Software without restriction, including
-+//without limitation the rights to use, copy, modify, merge, publish,
-+//distribute, sublicense, and/or sell copies of the Software, and to
-+//permit persons to whom the Software is furnished to do so, subject to
-+//the following conditions:
-+//
-+//The above copyright notice and this permission notice shall be
-+//included in all copies or substantial portions of the Software.
-+//
-+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+//NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+//LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+//OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+//WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+//
-+//Copyright (c) 2008 Novell, Inc.
-+//
-+//Authors:
-+// Andreia Gaita (avidigal at novell.com)
-+//
-+
-+using System;
-+using Mono.WebBrowser;
-+using Gtk;
-+using Gdk;
-+using Gnome;
-+
-+namespace Monodoc
-+{
-+ public class BrowserWidget : Gtk.Bin
-+ {
-+ public IWebBrowser browser;
-+ int width, height;
-+
-+ public BrowserWidget() : base()
-+ {
-+ width = height = 200;
-+ browser = Manager.GetNewInstance (Platform.Gtk);
-+ }
-+
-+
-+ protected override void OnRealized ()
-+ {
-+ base.OnRealized ();
-+
-+ WindowAttr attributes = new WindowAttr ();
-+ attributes.WindowType = Gdk.WindowType.Child;
-+ attributes.X = Allocation.X;
-+ attributes.Y = Allocation.Y;
-+ attributes.Width = Allocation.Width;
-+ attributes.Height = Allocation.Height;
-+ attributes.Wclass = WindowClass.InputOutput;
-+ attributes.Visual = Visual;
-+ attributes.Colormap = Colormap;
-+ attributes.EventMask = (int) Events;
-+ attributes.EventMask = attributes.EventMask | ((int) Gdk.EventMask.ExposureMask |
-+ (int) Gdk.EventMask.KeyPressMask |
-+ (int) Gdk.EventMask.KeyReleaseMask |
-+ (int) Gdk.EventMask.EnterNotifyMask |
-+ (int) Gdk.EventMask.LeaveNotifyMask |
-+ (int) Gdk.EventMask.StructureMask |
-+ (int) Gdk.EventMask.FocusChangeMask);
-+
-+ GdkWindow = new Gdk.Window (ParentWindow, attributes, Gdk.WindowAttributesType.X | Gdk.WindowAttributesType.Y |
-+ Gdk.WindowAttributesType.Colormap | Gdk.WindowAttributesType.Visual);
-+ GdkWindow.UserData = this.Handle;
-+
-+ Style = Style.Attach (GdkWindow);
-+ Style.Background (StateType.Normal);
-+
-+ browser.Load (this.Handle, width, height);
-+ }
-+
-+ protected override void OnMapped ()
-+ {
-+ base.OnMapped ();
-+ GdkWindow.Show ();
-+ }
-+
-+ protected override void OnUnmapped ()
-+ {
-+ base.OnUnmapped ();
-+ GdkWindow.Hide ();
-+ }
-+
-+ protected override void OnSizeAllocated (Rectangle allocation)
-+ {
-+ base.OnSizeAllocated (allocation);
-+ if ((WidgetFlags & WidgetFlags.Realized) != 0) {
-+ GdkWindow.MoveResize (allocation);
-+ if (browser != null)
-+ browser.Resize (allocation.Width, allocation.Height);
-+ }
-+ }
-+
-+ protected override void OnSizeRequested (ref Requisition requisition)
-+ {
-+ SetSizeRequest (width, height);
-+
-+ }
-+
-+
-+ }
-+}
-diff -urNad mono-tools-1.9~/docbrowser/GtkHtmlHtmlRender.cs mono-tools-1.9/docbrowser/GtkHtmlHtmlRender.cs
---- mono-tools-1.9~/docbrowser/GtkHtmlHtmlRender.cs 2008-01-30 00:06:11.000000000 +0100
-+++ mono-tools-1.9/docbrowser/GtkHtmlHtmlRender.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -31,11 +31,6 @@
-
- public GtkHtmlHtmlRender (RootTree help_tree)
- {
-- html_panel = new HTML();
-- html_panel.Show();
-- html_panel.LinkClicked += new LinkClickedHandler (LinkClicked);
-- html_panel.OnUrl += new OnUrlHandler (OnUrlMouseOver);
-- html_panel.UrlRequested += new UrlRequestedHandler (UrlRequested);
- this.help_tree = help_tree;
- }
-
-@@ -115,5 +110,34 @@
-
- PrintManager.Print (Html);
- }
-+
-+ public bool Initialize ()
-+ {
-+ try {
-+ html_panel = new HTML ();
-+ }
-+ catch (Exception ex) {
-+ Console.WriteLine (ex.Message);
-+ Console.WriteLine (ex.StackTrace);
-+ return false;
-+ }
-+ html_panel.Show ();
-+ html_panel.LinkClicked += new LinkClickedHandler (LinkClicked);
-+ html_panel.OnUrl += new OnUrlHandler (OnUrlMouseOver);
-+ html_panel.UrlRequested += new UrlRequestedHandler (UrlRequested);
-+ return true;
-+
-+ }
-+
-+ public Capabilities Capabilities
-+ {
-+ get { return Capabilities.None; }
-+ }
-+
-+ public string Name
-+ {
-+ get { return "GtkHtml"; }
-+ }
-+
- }
- }
-diff -urNad mono-tools-1.9~/docbrowser/IHtmlRender.cs mono-tools-1.9/docbrowser/IHtmlRender.cs
---- mono-tools-1.9~/docbrowser/IHtmlRender.cs 2007-12-06 22:43:45.000000000 +0100
-+++ mono-tools-1.9/docbrowser/IHtmlRender.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -6,35 +6,49 @@
- using System;
- using Gtk;
-
--namespace Monodoc {
--public interface IHtmlRender {
-- // Jump to an anchor of the form <a name="tttt">
-- void JumpToAnchor (string anchor_name);
-+namespace Monodoc
-+{
-+ public interface IHtmlRender
-+ {
-+ // Jump to an anchor of the form <a name="tttt">
-+ void JumpToAnchor (string anchor_name);
-
-- //Copy to the clipboard the selcted text
-- void Copy ();
-+ //Copy to the clipboard the selcted text
-+ void Copy ();
-
-- //Select all the text
-- void SelectAll ();
-+ //Select all the text
-+ void SelectAll ();
-
-- //Render the HTML code given
-- void Render (string html_code);
-+ //Render the HTML code given
-+ void Render (string html_code);
-
-- //Event fired when the use is over an Url
-- event EventHandler OnUrl;
-+ //Event fired when the use is over an Url
-+ event EventHandler OnUrl;
-
-- //Event fired when the user clicks on a Link
-- event EventHandler UrlClicked;
-+ //Event fired when the user clicks on a Link
-+ event EventHandler UrlClicked;
-
-- // Variable that handles the info encessary for the events
-- // As every implementation of HtmlRender will have differents events
-- // we try to homogenize them with the variabel
-- string Url { get; }
-+ // Variable that handles the info encessary for the events
-+ // As every implementation of HtmlRender will have differents events
-+ // we try to homogenize them with the variabel
-+ string Url { get; }
-
-- Widget HtmlPanel { get; }
-+ Widget HtmlPanel { get; }
-
-- void Print (string Html);
--}
-+ void Print (string Html);
-+
-+ bool Initialize ();
-+ Capabilities Capabilities { get; }
-+ string Name { get; }
-+
-+ }
-
-+ [Flags]
-+ public enum Capabilities
-+ {
-+ None = 0,
-+ Css = 1,
-+ Fonts = 2
-+ }
-
- }
-diff -urNad mono-tools-1.9~/docbrowser/Makefile.am mono-tools-1.9/docbrowser/Makefile.am
---- mono-tools-1.9~/docbrowser/Makefile.am 2008-01-30 00:06:11.000000000 +0100
-+++ mono-tools-1.9/docbrowser/Makefile.am 2008-08-10 14:59:40.000000000 +0200
-@@ -10,9 +10,15 @@
-
- GTKHTML_TARGET=GtkHtmlHtmlRender.dll
- endif
-+if ENABLE_WEBKIT
-+WEBKIT_TARGET=WebKitHtmlRender.dll
-+endif
-+if ENABLE_MONOWEBBROWSER
-+MONOWEBBROWSER_TARGET=MonoWebBrowserHtmlRender.dll
-+endif
-
--CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb monodoc.desktop
--monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET)
-+CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb $(WEBKIT_TARGET) $(WEBKIT_TARGET).mdb $(MONOWEBBROWSER_TARGET) $(MONOWEBBROWSER_TARGET).mdb monodoc.desktop
-+monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET) $(WEBKIT_TARGET) $(MONOWEBBROWSER_TARGET)
-
- DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop monodoc
-
-@@ -39,6 +45,13 @@
- $(srcdir)/PrintManager.cs \
- $(srcdir)/GtkHtmlHtmlRender.cs
-
-+webkitrender_sources = \
-+ $(srcdir)/WebKitHtmlRender.cs
-+
-+monowebbrowserrender_sources = \
-+ $(srcdir)/BrowserWidget.cs \
-+ $(srcdir)/MonoWebBrowserHtmlRender.cs
-+
- admin_sources = \
- $(srcdir)/admin.cs \
- $(srcdir)/Contributions.cs
-@@ -48,10 +61,17 @@
- geckorender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(GECKO_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
- gtkhtmlrender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-
-+# TODO: use pkg-config for webkit-sharp
-+# WEBKIT_SHARP_LIBS = -r:nwebkit.dll
-+webkitrender_assemblies = $(GTK_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-+
-+monowebbrowserrender_assemblies = $(GTK_SHARP_LIBS) $(MONOWEBBROWSER_LIBS) $(MONODOC_LIBS) -r:browser.exe -r:Mono.Mozilla.dll
-+
- EXTRA_DIST = \
- $(browser_sources) \
- $(geckorender_sources) \
- $(gtkhtmlrender_sources) \
-+ $(webkitrender_sources) \
- monodoc.desktop.in \
- admin.cs \
- admin.glade \
-@@ -63,17 +83,23 @@
- # admin hardcodes GTKHTML for now.
- if ENABLE_GTKHTML
- admin.exe: $(admin_sources) $(srcdir)/admin.glade
-- $(MCS) -debug -out:admin.exe $(admin_sources) -resource:$(srcdir)/admin.glade,admin.glade $(browser_assemblies) $(GTKHTML_SHARP_LIBS) -r:System.Drawing
-+ $(GMCS) -debug -out:admin.exe $(admin_sources) -resource:$(srcdir)/admin.glade,admin.glade $(browser_assemblies) $(GTKHTML_SHARP_LIBS) -r:System.Drawing
- endif
-
- browser.exe: $(browser_sources) $(browser_built_sources) $(srcdir)/browser.glade $(srcdir)/monodoc.png
-- $(MCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
-+ $(GMCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
-
- GeckoHtmlRender.dll : $(geckorender_sources) browser.exe
-- $(MCS) -debug -target:library -out:$@ $(geckorender_sources) $(geckorender_assemblies) $(GECKO_PRINTING_DEF) $(CSHARP_FLAGS)
-+ $(GMCS) -debug -target:library -out:$@ $(geckorender_sources) $(geckorender_assemblies) $(GECKO_PRINTING_DEF) $(CSHARP_FLAGS)
-
- GtkHtmlHtmlRender.dll : $(gtkhtmlrender_sources) browser.exe
-- $(MCS) -debug -target:library -out:$@ $(gtkhtmlrender_sources) $(gtkhtmlrender_assemblies) $(CSHARP_FLAGS)
-+ $(GMCS) -debug -target:library -out:$@ $(gtkhtmlrender_sources) $(gtkhtmlrender_assemblies) $(CSHARP_FLAGS)
-+
-+WebKitHtmlRender.dll : $(webkitrender_sources) browser.exe
-+ $(GMCS) -debug -target:library -out:$@ $(webkitrender_sources) $(webkitrender_assemblies) $(CSHARP_FLAGS)
-+
-+MonoWebBrowserHtmlRender.dll : $(monowebbrowserrender_sources) browser.exe
-+ $(GMCS) -debug -target:library -out:$@ $(monowebbrowserrender_sources) $(monowebbrowserrender_assemblies) $(CSHARP_FLAGS)
-
- b: browser.exe
- MONO_PATH=. $(RUNTIME) --debug browser.exe
-diff -urNad mono-tools-1.9~/docbrowser/Makefile.am.orig mono-tools-1.9/docbrowser/Makefile.am.orig
---- mono-tools-1.9~/docbrowser/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100
-+++ mono-tools-1.9/docbrowser/Makefile.am.orig 2008-08-10 14:59:40.000000000 +0200
-@@ -0,0 +1,117 @@
-+monodocdir=$(prefix)/lib/monodoc
-+noinst_DATA = admin.exe
-+
-+
-+if ENABLE_GECKO
-+GECKO_TARGET=GeckoHtmlRender.dll
-+endif
-+if ENABLE_GTKHTML
-+GECKO_PRINTING_DEF="-d:USE_GTKHTML_PRINT"
-+
-+GTKHTML_TARGET=GtkHtmlHtmlRender.dll
-+endif
-+if ENABLE_WEBKIT
-+WEBKIT_TARGET=WebKitHtmlRender.dll
-+endif
-+if ENABLE_MONOWEBBROWSER
-+MONOWEBBROWSER_TARGET=MonoWebBrowserHtmlRender.dll
-+endif
-+
-+CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb $(WEBKIT_TARGET) $(WEBKIT_TARGET).mdb $(MONOWEBBROWSER_TARGET) $(MONOWEBBROWSER_TARGET).mdb monodoc.desktop
-+monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET) $(WEBKIT_TARGET) $(MONOWEBBROWSER_TARGET)
-+
-+DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop monodoc
-+
-+bin_SCRIPTS = monodoc
-+
-+browser_sources = \
-+ $(srcdir)/browser.cs \
-+ $(srcdir)/list.cs \
-+ $(srcdir)/elabel.cs \
-+ $(srcdir)/history.cs \
-+ $(srcdir)/Contributions.cs \
-+ $(srcdir)/XmlNodeWriter.cs \
-+ $(srcdir)/IHtmlRender.cs \
-+ $(srcdir)/BookmarkManager.cs \
-+ $(srcdir)/ProgressPanel.cs
-+
-+browser_built_sources = AssemblyInfo.cs
-+
-+geckorender_sources = \
-+ $(srcdir)/PrintManager.cs \
-+ $(srcdir)/GeckoHtmlRender.cs
-+
-+gtkhtmlrender_sources = \
-+ $(srcdir)/PrintManager.cs \
-+ $(srcdir)/GtkHtmlHtmlRender.cs
-+
-+webkitrender_sources = \
-+ $(srcdir)/WebKitHtmlRender.cs
-+
-+monowebbrowserrender_sources = \
-+ $(srcdir)/BrowserWidget.cs \
-+ $(srcdir)/MonoWebBrowserHtmlRender.cs
-+
-+admin_sources = \
-+ $(srcdir)/admin.cs \
-+ $(srcdir)/Contributions.cs
-+
-+browser_assemblies = $(GTK_SHARP_LIBS) $(MONODOC_LIBS) -r:System.Web.Services
-+# we insert gtkhtml libs if we have them for printing
-+geckorender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(GECKO_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-+gtkhtmlrender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-+
-+# TODO: use pkg-config for webkit-sharp
-+# WEBKIT_SHARP_LIBS = -r:nwebkit.dll
-+webkitrender_assemblies = $(GTK_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-+
-+monowebbrowserrender_assemblies = $(GTK_SHARP_LIBS) $(MONOWEBBROWSER_LIBS) $(MONODOC_LIBS) -r:browser.exe -r:Mono.Mozilla.dll
-+
-+EXTRA_DIST = \
-+ $(browser_sources) \
-+ $(geckorender_sources) \
-+ $(gtkhtmlrender_sources) \
-+ $(webkitrender_sources) \
-+ monodoc.desktop.in \
-+ admin.cs \
-+ admin.glade \
-+ browser.glade \
-+ monodoc.png \
-+ AssemblyInfo.cs.in \
-+ README.ADMIN
-+
-+# admin hardcodes GTKHTML for now.
-+if ENABLE_GTKHTML
-+admin.exe: $(admin_sources) $(srcdir)/admin.glade
-+ $(MCS) -debug -out:admin.exe $(admin_sources) -resource:$(srcdir)/admin.glade,admin.glade $(browser_assemblies) $(GTKHTML_SHARP_LIBS) -r:System.Drawing
-+endif
-+
-+browser.exe: $(browser_sources) $(browser_built_sources) $(srcdir)/browser.glade $(srcdir)/monodoc.png
-+ $(MCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
-+
-+GeckoHtmlRender.dll : $(geckorender_sources) browser.exe
-+ $(MCS) -debug -target:library -out:$@ $(geckorender_sources) $(geckorender_assemblies) $(GECKO_PRINTING_DEF) $(CSHARP_FLAGS)
-+
-+GtkHtmlHtmlRender.dll : $(gtkhtmlrender_sources) browser.exe
-+ $(MCS) -debug -target:library -out:$@ $(gtkhtmlrender_sources) $(gtkhtmlrender_assemblies) $(CSHARP_FLAGS)
-+
-+WebKitHtmlRender.dll : $(webkitrender_sources) browser.exe
-+ $(GMCS) -debug -target:library -out:$@ $(webkitrender_sources) $(webkitrender_assemblies) $(CSHARP_FLAGS)
-+
-+MonoWebBrowserHtmlRender.dll : $(monowebbrowserrender_sources) browser.exe
-+ $(GMCS) -debug -target:library -out:$@ $(monowebbrowserrender_sources) $(monowebbrowserrender_assemblies) $(CSHARP_FLAGS)
-+
-+b: browser.exe
-+ MONO_PATH=. $(RUNTIME) --debug browser.exe
-+
-+c: admin.exe
-+ MONO_PATH=. $(RUNTIME) --debug admin.exe
-+
-+desktopdir = $(datadir)/applications
-+desktop_DATA = monodoc.desktop
-+
-+monodoc.desktop: monodoc.desktop.in
-+ sed -e "s|\@bindir\@|$(bindir)|" $< > $@
-+
-+pixmapdir = $(datadir)/pixmaps
-+pixmap_DATA = monodoc.png
-diff -urNad mono-tools-1.9~/docbrowser/MonoWebBrowserHtmlRender.cs mono-tools-1.9/docbrowser/MonoWebBrowserHtmlRender.cs
---- mono-tools-1.9~/docbrowser/MonoWebBrowserHtmlRender.cs 1970-01-01 01:00:00.000000000 +0100
-+++ mono-tools-1.9/docbrowser/MonoWebBrowserHtmlRender.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -0,0 +1,116 @@
-+//Permission is hereby granted, free of charge, to any person obtaining
-+//a copy of this software and associated documentation files (the
-+//"Software"), to deal in the Software without restriction, including
-+//without limitation the rights to use, copy, modify, merge, publish,
-+//distribute, sublicense, and/or sell copies of the Software, and to
-+//permit persons to whom the Software is furnished to do so, subject to
-+//the following conditions:
-+//
-+//The above copyright notice and this permission notice shall be
-+//included in all copies or substantial portions of the Software.
-+//
-+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+//NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+//LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+//OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+//WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+//
-+//Copyright (c) 2008 Novell, Inc.
-+//
-+//Authors:
-+// Andreia Gaita (avidigal at novell.com)
-+//
-+
-+using System;
-+using Mono.WebBrowser;
-+using Gtk;
-+
-+namespace Monodoc
-+{
-+ public class MonoWebBrowserHtmlRender : IHtmlRender
-+ {
-+ BrowserWidget html_panel;
-+// Widget html_panel;
-+ RootTree help_tree;
-+
-+ public MonoWebBrowserHtmlRender (RootTree help_tree)
-+ {
-+
-+
-+// html_panel = new Gtk.Bin (IntPtr.Zero);
-+// html_panel.ExposeEvent += new ExposeEventHandler (OnExposed);
-+ //html_panel.Realized += new EventHandler (OnRealized);
-+ this.help_tree = help_tree;
-+
-+ }
-+
-+ public void OnRealized (object sender, EventArgs e)
-+ {
-+
-+ }
-+
-+ public void OnExposed (object sender, ExposeEventArgs e)
-+ {
-+ }
-+
-+ public event EventHandler OnUrl;
-+ public event EventHandler UrlClicked;
-+
-+ // Jump to an anchor of the form <a name="tttt">
-+ public void JumpToAnchor (string anchor_name)
-+ {
-+ }
-+
-+ //Copy to the clipboard the selcted text
-+ public void Copy ()
-+ {
-+ }
-+
-+ //Select all the text
-+ public void SelectAll ()
-+ {
-+ }
-+
-+ //Render the HTML code given
-+ public void Render (string html_code)
-+ {
-+ Console.WriteLine (html_code);
-+ html_panel.browser.Render (html_code);
-+ }
-+
-+
-+ // Variable that handles the info encessary for the events
-+ // As every implementation of HtmlRender will have differents events
-+ // we try to homogenize them with the variabel
-+ public string Url {
-+ get {return String.Empty;}//return html_panel.browser.Document.Url; }
-+ }
-+
-+ public Widget HtmlPanel {
-+ get { return (Widget)html_panel; }
-+ }
-+
-+ public void Print (string Html)
-+ {
-+ }
-+
-+ public bool Initialize ()
-+ {
-+ html_panel = new BrowserWidget ();
-+ return html_panel.browser.Initialized;
-+ }
-+
-+ public Capabilities Capabilities
-+ {
-+ get { return Capabilities.Css | Capabilities.Fonts; }
-+ }
-+
-+ public string Name
-+ {
-+ get { return "MonoWebBrowser"; }
-+ }
-+
-+ }
-+}
-diff -urNad mono-tools-1.9~/docbrowser/WebKitHtmlRender.cs mono-tools-1.9/docbrowser/WebKitHtmlRender.cs
---- mono-tools-1.9~/docbrowser/WebKitHtmlRender.cs 1970-01-01 01:00:00.000000000 +0100
-+++ mono-tools-1.9/docbrowser/WebKitHtmlRender.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -0,0 +1,89 @@
-+//
-+// WebKitHtmlRender.cs: Implementation of IHtmlRender that uses WebKit
-+//
-+// Author: Alp Toker <alp at nuanti.com>
-+//
-+
-+using System;
-+using System.IO;
-+using Gtk;
-+using WebKit;
-+
-+namespace Monodoc {
-+public class WebKitHtmlRender : IHtmlRender {
-+
-+ WebView web_view;
-+ public Widget HtmlPanel {
-+ get { return (Widget) web_view; }
-+ }
-+
-+ string url;
-+ public string Url {
-+ get { return url; }
-+ }
-+
-+ RootTree help_tree;
-+ public event EventHandler OnUrl;
-+ public event EventHandler UrlClicked;
-+
-+ public WebKitHtmlRender (RootTree help_tree)
-+ {
-+ web_view = new WebView ();
-+ web_view.Show ();
-+ web_view.NavigationRequested += delegate (object sender, NavigationRequestedArgs e) {
-+ url = e.Request.Uri;
-+ if (UrlClicked != null)
-+ UrlClicked (this, new EventArgs());
-+ e.RetVal = NavigationResponse.Ignore;
-+ };
-+ web_view.HoveringOverLink += delegate (object sender, HoveringOverLinkArgs e) {
-+ url = e.Link;
-+ if (OnUrl != null)
-+ OnUrl (this, new EventArgs ());
-+ };
-+ this.help_tree = help_tree;
-+ }
-+
-+ public void JumpToAnchor (string anchor)
-+ {
-+ web_view.Open ("#" + anchor);
-+ }
-+
-+ public void Copy ()
-+ {
-+ web_view.CopyClipboard ();
-+ }
-+
-+ public void SelectAll ()
-+ {
-+ web_view.SelectAll ();
-+ }
-+
-+ public void Render (string html)
-+ {
-+ web_view.LoadHtmlString (html, null);
-+ }
-+
-+ public void Print (string html)
-+ {
-+ web_view.ExecuteScript ("print();");
-+ }
-+
-+ public bool Initialize ()
-+ {
-+ return true;
-+ }
-+
-+ public Capabilities Capabilities
-+ {
-+ get { return Capabilities.Css | Capabilities.Fonts; }
-+ }
-+
-+ public string Name
-+ {
-+ get { return "WebKit"; }
-+ }
-+
-+
-+}
-+}
-diff -urNad mono-tools-1.9~/docbrowser/browser.cs mono-tools-1.9/docbrowser/browser.cs
---- mono-tools-1.9~/docbrowser/browser.cs 2008-01-30 00:06:10.000000000 +0100
-+++ mono-tools-1.9/docbrowser/browser.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -15,17 +15,22 @@
- using System.Reflection;
- using System.Threading;
- using System.Collections;
-+using System.Collections.Generic;
- using System.Web.Services.Protocols;
- using System.Xml;
-
- namespace Monodoc {
- class Driver {
-+
-+ public static string[] engines = {"WebKit", "GtkHtml", "MonoWebBrowser", "Gecko"};
-+
- static int Main (string [] args)
- {
- string topic = null;
-- bool useGecko = true;
- bool remote_mode = false;
-
-+ string engine = engines[0];
-+
- for (int i = 0; i < args.Length; i++){
- switch (args [i]){
- case "--html":
-@@ -98,8 +103,14 @@
- remote_mode = true;
- break;
-
-- case "--no-gecko":
-- useGecko = false;
-+ case "--engine":
-+ if (i + 1 == args.Length) {
-+ Console.WriteLine ("Usage: --engine engine, where engine is the name of the browser engine to use (WebKit, GtkHtml, MonoWebBrowser, Gecko or another).");
-+ return 1;
-+ }
-+
-+ engine = args [i+1];
-+ i++;
- break;
- default:
- topic = args [i];
-@@ -112,7 +123,7 @@
-
- Settings.RunningGUI = true;
- Application.Init ();
-- Browser browser = new Browser (useGecko);
-+ Browser browser = new Browser (engine);
-
- if (topic != null)
- browser.LoadUrl (topic);
-@@ -165,7 +176,7 @@
- public Notebook tabs_nb;
- public Tab CurrentTab;
- bool HoldCtrl;
-- public bool UseGecko;
-+ public string engine;
-
- [Glade.Widget] public MenuItem bookmarksMenu;
- [Glade.Widget] MenuItem view1;
-@@ -231,9 +242,11 @@
-
- public ArrayList bookList;
-
-- public Browser (bool UseGecko)
-+ public Capabilities capabilities;
-+
-+ public Browser (string engine)
- {
-- this.UseGecko = UseGecko;
-+ this.engine = engine;
- ui = new Glade.XML (null, "browser.glade", "window1", null);
- ui.Autoconnect (this);
-
-@@ -280,7 +293,10 @@
- tabs_nb.SwitchPage += new SwitchPageHandler(ChangeTab);
- help_container.Add(tabs_nb);
-
-- if (UseGecko) {
-+ AddTab();
-+
-+
-+ if ((capabilities & Capabilities.Fonts) != 0) {
- // Add Menu entries for changing the font
- Menu aux = (Menu) view1.Submenu;
- MenuItem sep = new SeparatorMenuItem ();
-@@ -334,10 +350,11 @@
-
- index_browser = IndexBrowser.MakeIndexBrowser (this);
-
-- AddTab();
- MainWindow.ShowAll();
- }
-
-+
-+
- // Initianlizes the search index
- void CreateSearchPanel ()
- {
-@@ -821,7 +838,7 @@
- void on_print_activate (object sender, EventArgs e)
- {
- // desactivate css temporary
-- if (UseGecko)
-+ if ((capabilities & Capabilities.Css) != 0)
- HelpSource.use_css = false;
-
- string url = CurrentUrl;
-@@ -842,7 +859,7 @@
- if (html != null)
- CurrentTab.html.Print (html);
-
-- if (UseGecko)
-+ if ((capabilities & Capabilities.Css) != 0)
- HelpSource.use_css = true;
- }
-
-@@ -2264,19 +2281,65 @@
- text_editor.GrabFocus ();
- }
-
-- static IHtmlRender GetRenderer (string file, string type, Browser browser)
-- {
-+
-+ private static IHtmlRender LoadRenderer (string dll, Browser browser) {
- try {
--
-- string exeAssembly = Assembly.GetExecutingAssembly ().Location;
-- string myPath = System.IO.Path.GetDirectoryName (exeAssembly);
-- Assembly dll = Assembly.LoadFrom (System.IO.Path.Combine (myPath, file));
-- Type t = dll.GetType (type, true);
-+ Assembly ass = Assembly.LoadFile (dll);
-+ System.Type type = ass.GetType ("Monodoc." + ass.GetName ().Name, false, false);
-+ if (type == null)
-+ return null;
-+ return (IHtmlRender) Activator.CreateInstance (type, new object[1] { browser.help_tree });
-+ } catch (Exception ex) {
-+ Console.Error.WriteLine (ex);
-+ }
-+ return null;
-+ }
-+
-+
-+ public static IHtmlRender GetRenderer (string engine, string fallback, Browser browser)
-+ {
-+ IHtmlRender renderer = LoadRenderer (System.IO.Path.Combine (AppDomain.CurrentDomain.BaseDirectory, engine + "HtmlRender.dll"), browser);
-+ if (renderer != null) {
-+ try {
-+ if (renderer.Initialize ()) {
-+ Console.WriteLine ("using " + renderer.Name);
-+ return renderer;
-+ }
-+ } catch (Exception ex) {
-+ Console.Error.WriteLine (ex);
-+ }
-+ }
-
-- return (IHtmlRender) Activator.CreateInstance (t, new object [1] { browser.help_tree });
-- } catch {
-- return null;
-+ renderer = LoadRenderer (System.IO.Path.Combine (AppDomain.CurrentDomain.BaseDirectory, fallback + "HtmlRender.dll"), browser);
-+ if (renderer != null) {
-+ try {
-+ if (renderer.Initialize ()) {
-+ Console.WriteLine ("using " + renderer.Name);
-+ return renderer;
-+ }
-+ } catch (Exception ex) {
-+ //Console.Error.WriteLine (ex);
-+ }
-+ }
-+
-+ foreach (string backend in Driver.engines) {
-+ string dll = System.IO.Path.Combine (AppDomain.CurrentDomain.BaseDirectory, backend + "HtmlRender.dll");
-+ if (System.IO.File.Exists (dll)) {
-+ renderer = LoadRenderer (dll, browser);
-+ if (renderer != null) {
-+ try {
-+ if (renderer.Initialize ()) {
-+ Console.WriteLine ("using " + renderer.Name);
-+ return renderer;
-+ }
-+ } catch (Exception ex) {
-+ //Console.Error.WriteLine (ex);
-+ }
-+ }
-+ }
- }
-+
-+ return null;
- }
-
-
-@@ -2300,24 +2363,19 @@
- //
- // Setup the HTML rendering and preview area
- //
-- if (browser.UseGecko) {
-- html = GetRenderer ("GeckoHtmlRender.dll", "Monodoc.GeckoHtmlRender", browser);
-- html_preview = GetRenderer ("GeckoHtmlRender.dll", "Monodoc.GeckoHtmlRender", browser);
-- HelpSource.use_css = true;
-- }
--
-- if (html == null || html_preview == null) {
-- html = GetRenderer ("GtkHtmlHtmlRender.dll", "Monodoc.GtkHtmlHtmlRender", browser);
-- html_preview = GetRenderer ("GtkHtmlHtmlRender.dll", "Monodoc.GtkHtmlHtmlRender", browser);
-- browser.UseGecko = false;
-- HelpSource.use_css = false;
-- }
-
-+ html = GetRenderer (browser.engine, Driver.engines[1], browser);
-+ html_preview = GetRenderer (browser.engine, Driver.engines[1], browser);
- if (html == null || html_preview == null)
- throw new Exception ("Couldn't find html renderer!");
--
-+
-+ browser.capabilities = html.Capabilities;
-+
-+ if ((html.Capabilities & Capabilities.Css) != 0)
-+ HelpSource.use_css = true;
-+
- //Prepare Font for css (TODO: use GConf?)
-- if (browser.UseGecko && SettingsHandler.Settings.preferred_font_size == 0) {
-+ if ((html.Capabilities & Capabilities.Fonts) != 0 && SettingsHandler.Settings.preferred_font_size == 0) {
- Pango.FontDescription font_desc = Pango.FontDescription.FromString ("Sans 12");
- SettingsHandler.Settings.preferred_font_family = font_desc.Family;
- SettingsHandler.Settings.preferred_font_size = 100; //size: 100%
-diff -urNad mono-tools-1.9~/docbrowser/monodoc.in mono-tools-1.9/docbrowser/monodoc.in
---- mono-tools-1.9~/docbrowser/monodoc.in 2008-03-10 23:34:01.000000000 +0100
-+++ mono-tools-1.9/docbrowser/monodoc.in 2008-08-10 15:00:17.000000000 +0200
-@@ -98,4 +98,4 @@
- export MOZILLA_HOME
- export LD_LIBRARY_PATH
-
--exec @RUNTIME@ $monodocdir/browser.exe $OPTIONS "$@" $REST
-+exec @RUNTIME@ $monodocdir/browser.exe --engine GtkHtml $OPTIONS "$@" $REST
-diff -urNad mono-tools-1.9~/ilcontrast/Makefile.am mono-tools-1.9/ilcontrast/Makefile.am
---- mono-tools-1.9~/ilcontrast/Makefile.am 2007-12-06 22:43:43.000000000 +0100
-+++ mono-tools-1.9/ilcontrast/Makefile.am 2008-08-10 14:59:40.000000000 +0200
-@@ -7,6 +7,12 @@
- desktopdir = $(datadir)/applications
- pixmapdir = $(datadir)/pixmaps
-
-+if ENABLE_WEBKIT
-+assembly_DATA = $(TARGET)
-+bin_SCRIPTS = ilcontrast
-+desktop_DATA = ilcontrast.desktop
-+pixmap_DATA = ilcontrast.png
-+else
- if ENABLE_GECKO
- assembly_DATA = $(TARGET)
- bin_SCRIPTS = ilcontrast
-@@ -14,10 +20,15 @@
- pixmap_DATA = ilcontrast.png
- else
- all:
-- echo "Install gecko-sharp to build ilContrast"
-+ echo "Install webkit-sharp or gecko-sharp to build ilContrast"
-+endif
- endif
-
--references = $(GTK_SHARP_LIBS) $(GECKO_SHARP_LIBS) -r:ICSharpCode.SharpZipLib.dll
-+if ENABLE_WEBKIT
-+references = $(GTK_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) -r:ICSharpCode.SharpZipLib.dll
-+else
-+references = $(GTK_SHARP_LIBS) $(GECKO_SHARP_LIBS) -d:USE_GECKO -r:ICSharpCode.SharpZipLib.dll
-+endif
-
- resources = \
- /resource:$(srcdir)/ilcontrast.png,ilcontrast.png \
-diff -urNad mono-tools-1.9~/ilcontrast/Window.cs mono-tools-1.9/ilcontrast/Window.cs
---- mono-tools-1.9~/ilcontrast/Window.cs 2007-12-06 22:43:43.000000000 +0100
-+++ mono-tools-1.9/ilcontrast/Window.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -40,7 +40,11 @@
-
- Box main_vbox;
- Statusbar statusbar;
-+#if USE_GECKO
- Gecko.WebControl browser;
-+#else
-+ WebKit.WebView web_view;
-+#endif
- bool first_show = false;
- Thread worker;
- ComparisonInfo info;
-@@ -49,10 +53,17 @@
- {
- DefaultSize = new Size (450, 450);
-
-- browser = new Gecko.WebControl ();
- main_vbox = new VBox (false, 0);
- AddActionUI ();
-+#if USE_GECKO
-+ browser = new Gecko.WebControl ();
- main_vbox.PackStart (browser, true, true, 0);
-+#else
-+ web_view = new WebKit.WebView ();
-+ ScrolledWindow sw = new ScrolledWindow ();
-+ sw.Add (web_view);
-+ main_vbox.PackStart (sw, true, true, 0);
-+#endif
- statusbar = new Statusbar ();
- main_vbox.PackStart (statusbar, false, false, 0);
- Add (main_vbox);
-@@ -125,7 +136,11 @@
-
- void LoadUrl (string url)
- {
-+#if USE_GECKO
- browser.LoadUrl (url);
-+#else
-+ web_view.Open (url);
-+#endif
- }
-
- void GenerateHtmlTarget ()
Deleted: mono-tools/trunk/debian/patches/dont_bundle_cecil.patch
===================================================================
--- mono-tools/trunk/debian/patches/dont_bundle_cecil.patch 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/patches/dont_bundle_cecil.patch 2009-07-07 22:36:06 UTC (rev 4012)
@@ -1,29 +0,0 @@
---- mono-tools-2.0.orig/gui-compare/Makefile.am
-+++ mono-tools-2.0/gui-compare/Makefile.am
-@@ -1,8 +1,8 @@
- guicomparedir=$(prefix)/lib/gui-compare
- bin_SCRIPTS = gui-compare
--guicompare_DATA = gui-compare.exe Mono.Cecil.dll
-+guicompare_DATA = gui-compare.exe
-
--CLEANFILES = gui-compare.exe gui-compare.exe.mdb Mono.Cecil.dll gui-compare
-+CLEANFILES = gui-compare.exe gui-compare.exe.mdb gui-compare
-
-
- gui_compare_sources = \
-@@ -53,12 +53,9 @@
-
- EXTRA_DIST = $(gui_compare_sources) $(gui_compare_resources) gui-compare.mds gui-compare.mdp gui-compare.in
-
--packages = -pkg:gtk-sharp-2.0 -pkg:glib-sharp-2.0 -pkg:glade-sharp-2.0 -r:Mono.Cecil.dll
--assemblies = -r:System -r:Mono.Posix -r:System.Xml
-+packages = -pkg:gtk-sharp-2.0 -pkg:glib-sharp-2.0 -pkg:glade-sharp-2.0
-+assemblies = -r:System -r:Mono.Posix -r:System.Xml -r:$(CECIL_ASM)
- ress= $(foreach res,$(gui_compare_resources), $(addprefix -resource:,$(res)),$(notdir $(res)))
-
--Mono.Cecil.dll:
-- cp $(CECIL_ASM) .
--
--gui-compare.exe: $(gui_compare_sources) $(gui_compare_resources) Mono.Cecil.dll
-+gui-compare.exe: $(gui_compare_sources) $(gui_compare_resources)
- $(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:gui-compare.exe $(gui_compare_sources) $(ress) $(packages) $(assemblies)
Modified: mono-tools/trunk/debian/patches/series
===================================================================
--- mono-tools/trunk/debian/patches/series 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/patches/series 2009-07-07 22:36:06 UTC (rev 4012)
@@ -1,9 +1,2 @@
-#01-use_real_nunit.patch
00-fix_build_system.patch
-02-startup_mono_path.patch
-03-mozilla_home.patch
04-gendarme_link_libraries_correctly.patch
-#05-cecil.patch
-#06-nunit_2.4_port.patch
-#07-webkit-sharp_port.patch
-dont_bundle_cecil.patch
Modified: mono-tools/trunk/debian/rules
===================================================================
--- mono-tools/trunk/debian/rules 2009-07-06 09:28:26 UTC (rev 4011)
+++ mono-tools/trunk/debian/rules 2009-07-07 22:36:06 UTC (rev 4012)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
export MONO_SHARED_DIR=$(CURDIR)
MAKEFILE = $(firstword $(MAKEFILE_LIST))
@@ -54,6 +54,12 @@
dh_movefiles
dh_link
dh_install
+ cp $(CURDIR)/debian/monodoc-http-script $(CURDIR)/debian/monodoc-http/usr/bin/monodoc-http
+ # fix upstream file permissions
+ find debian/monodoc-http/usr/*/monodoc/web -type f -exec chmod 644 {} \;
+ find debian/monodoc-http/usr/*/monodoc/web -type d -exec chmod 755 {} \;
+ # remove directories moved to /usr/share/
+ #find debian/monodoc-http/usr/lib/monodoc/web -type d -name "images" -o -name "xtree" | xargs rm -rf
dh_installchangelogs ChangeLog
dh_installdocs
dh_installmenu
@@ -65,6 +71,7 @@
dh_fixperms
dh_clifixperms
dh_installdeb
+ dh_installxsp -V 2
dh_clideps
dh_gencontrol
dh_md5sums
More information about the Pkg-mono-svn-commits
mailing list