[Pkg-mono-svn-commits] rev 4068 - in mono-tools/trunk/debian: . patches
Jo Shields
directhex at alioth.debian.org
Fri Dec 18 21:35:37 UTC 2009
Author: directhex
Date: 2009-12-18 21:35:37 +0000 (Fri, 18 Dec 2009)
New Revision: 4068
Removed:
mono-tools/trunk/debian/patches/05_fix_webkit_about_blank_signal.patch
Modified:
mono-tools/trunk/debian/changelog
mono-tools/trunk/debian/control
mono-tools/trunk/debian/patches/00-fix_build_system.patch
mono-tools/trunk/debian/patches/series
Log:
* New upstream release
* debian/control:
+ Bump Standards to 3.8.3
+ Raise mono-devel build-dep to 2.4.3, and strip out individual
library build-deps which are no longer needed
+ Use Webkit#'s -dev package (Closes: #559209, #561628)
* debian/patches/05_fix_webkit_about_blank_signal.patch:
+ Drop, merged upstream
* debian/patches/00-fix_build_system.patch:
+ Modify to use mono-csc command, not csc
Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog 2009-12-16 00:30:08 UTC (rev 4067)
+++ mono-tools/trunk/debian/changelog 2009-12-18 21:35:37 UTC (rev 4068)
@@ -1,3 +1,18 @@
+mono-tools (2.4.3-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/control:
+ + Bump Standards to 3.8.3
+ + Raise mono-devel build-dep to 2.4.3, and strip out individual
+ library build-deps which are no longer needed
+ + Use Webkit#'s -dev package (Closes: #559209, #561628)
+ * debian/patches/05_fix_webkit_about_blank_signal.patch:
+ + Drop, merged upstream
+ * debian/patches/00-fix_build_system.patch:
+ + Modify to use mono-csc command, not csc
+
+ -- Jo Shields <directhex at apebox.org> Fri, 18 Dec 2009 21:19:30 +0000
+
mono-tools (2.4.2-2) unstable; urgency=medium
* debian/patches/05_fix_webkit_about_blank_signal.patch:
Modified: mono-tools/trunk/debian/control
===================================================================
--- mono-tools/trunk/debian/control 2009-12-16 00:30:08 UTC (rev 4067)
+++ mono-tools/trunk/debian/control 2009-12-18 21:35:37 UTC (rev 4068)
@@ -9,20 +9,16 @@
autoconf,
automake,
autotools-dev,
- mono-devel (>= 2.0.1),
- libmono-nunit2.4-cil,
- libmono-winforms2.0-cil,
- libmono-system-web2.0-cil,
+ mono-devel (>= 2.4.3),
libgtk2.0-cil (>= 2.0),
libgconf2.0-cil (>= 2.0),
libglade2.0-cil (>= 2.0),
libgnome2.24-cil (>= 2.0),
- libwebkit1.0-cil,
+ libwebkit-cil-dev,
monodoc-base (>= 1.1.9),
mono-xsp-base,
- libmono-management2.0-cil,
mono-csharp-shell
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/mono-tools/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/mono-tools/trunk/
Modified: mono-tools/trunk/debian/patches/00-fix_build_system.patch
===================================================================
--- mono-tools/trunk/debian/patches/00-fix_build_system.patch 2009-12-16 00:30:08 UTC (rev 4067)
+++ mono-tools/trunk/debian/patches/00-fix_build_system.patch 2009-12-18 21:35:37 UTC (rev 4068)
@@ -6,8 +6,8 @@
dnl C# compiler
-AC_PATH_PROG(MCS, mcs, no)
-AC_PATH_PROG(GMCS, gmcs, no)
-+AC_PATH_PROG(MCS, csc, no)
-+AC_PATH_PROG(GMCS, csc, no)
++AC_PATH_PROG(MCS, mono-csc, no)
++AC_PATH_PROG(GMCS, mono-csc, no)
AC_PATH_PROG(RUNTIME, mono, no)
AC_PATH_PROG(GACUTIL, gacutil, no)
@@ -18,7 +18,7 @@
if ENABLE_DEBUG
-ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = csc
++ASSEMBLY_COMPILER_COMMAND = mono-csc
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG
ASSEMBLY = bin/Debug/mprof-decoder.exe
ASSEMBLY_MDB = $(ASSEMBLY).mdb
@@ -27,7 +27,7 @@
if ENABLE_RELEASE
-ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = csc
++ASSEMBLY_COMPILER_COMMAND = mono-csc
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+
ASSEMBLY = bin/Release/mprof-decoder.exe
ASSEMBLY_MDB =
@@ -38,7 +38,7 @@
if ENABLE_DEBUG
-ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = csc
++ASSEMBLY_COMPILER_COMMAND = mono-csc
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG
ASSEMBLY = bin/Debug/mprof-decoder-library.dll
ASSEMBLY_MDB = $(ASSEMBLY).mdb
@@ -47,7 +47,7 @@
if ENABLE_RELEASE
-ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = csc
++ASSEMBLY_COMPILER_COMMAND = mono-csc
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+
ASSEMBLY = bin/Release/profiler-decoder-library.dll
ASSEMBLY_MDB =
@@ -58,7 +58,7 @@
if ENABLE_DEBUG
-ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = csc
++ASSEMBLY_COMPILER_COMMAND = mono-csc
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug "-define:DEBUG"
ASSEMBLY = bin/Debug/mprof-heap-snapshot-explorer.dll
@@ -67,7 +67,7 @@
if ENABLE_RELEASE
-ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = csc
++ASSEMBLY_COMPILER_COMMAND = mono-csc
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+
ASSEMBLY = bin/Release/heap-snapshot-explorer.dll
ASSEMBLY_MDB =
@@ -78,7 +78,7 @@
if ENABLE_DEBUG
-ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = csc
++ASSEMBLY_COMPILER_COMMAND = mono-csc
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug "-define:DEBUG"
ASSEMBLY = bin/Debug/mprof-heap-viewer.exe
@@ -87,7 +87,7 @@
if ENABLE_RELEASE
-ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = csc
++ASSEMBLY_COMPILER_COMMAND = mono-csc
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+
ASSEMBLY = bin/Release/mprof-heap-viewer.exe
ASSEMBLY_MDB =
Deleted: mono-tools/trunk/debian/patches/05_fix_webkit_about_blank_signal.patch
===================================================================
--- mono-tools/trunk/debian/patches/05_fix_webkit_about_blank_signal.patch 2009-12-16 00:30:08 UTC (rev 4067)
+++ mono-tools/trunk/debian/patches/05_fix_webkit_about_blank_signal.patch 2009-12-18 21:35:37 UTC (rev 4068)
@@ -1,13 +0,0 @@
-Index: mono-tools-2.4.2/docbrowser/WebKitHtmlRender.cs
-===================================================================
---- mono-tools-2.4.2.orig/docbrowser/WebKitHtmlRender.cs 2009-10-13 00:37:50.000000000 +0100
-+++ mono-tools-2.4.2/docbrowser/WebKitHtmlRender.cs 2009-10-13 00:38:11.000000000 +0100
-@@ -31,6 +31,8 @@
- web_view = new WebView ();
- web_view.Show ();
- web_view.NavigationRequested += delegate (object sender, NavigationRequestedArgs e) {
-+ if (e.Request.Uri == "about:blank")
-+ return;
- url = e.Request.Uri;
- if (UrlClicked != null)
- UrlClicked (this, new EventArgs());
Modified: mono-tools/trunk/debian/patches/series
===================================================================
--- mono-tools/trunk/debian/patches/series 2009-12-16 00:30:08 UTC (rev 4067)
+++ mono-tools/trunk/debian/patches/series 2009-12-18 21:35:37 UTC (rev 4068)
@@ -1,3 +1,2 @@
00-fix_build_system.patch
04-gendarme_link_libraries_correctly.patch
-05_fix_webkit_about_blank_signal.patch
More information about the Pkg-mono-svn-commits
mailing list