[Pkg-mono-svn-commits] rev 2420 - in
non-group/monodevelop/trunk/debian: . patches
Mirco Bauer
meebey-guest at costa.debian.org
Mon Apr 10 22:07:18 UTC 2006
Author: meebey-guest
Date: 2006-04-10 22:07:17 +0000 (Mon, 10 Apr 2006)
New Revision: 2420
Added:
non-group/monodevelop/trunk/debian/monodevelop-query.install
non-group/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.8.x.dpatch
non-group/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch
non-group/monodevelop/trunk/debian/patches/use_real_libs.dpatch
non-group/monodevelop/trunk/debian/patches/use_real_log4net_and_firebird.dpatch
Removed:
non-group/monodevelop/trunk/debian/patches/01_remove_bashism.dpatch
non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch
non-group/monodevelop/trunk/debian/patches/boo_0.6.0_compat.dpatch
non-group/monodevelop/trunk/debian/patches/parsing_mcs_1.1.9_output.dpatch
non-group/monodevelop/trunk/debian/patches/remove_unused_icon.dpatch
non-group/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.3.x.dpatch
Modified:
non-group/monodevelop/trunk/debian/changelog
non-group/monodevelop/trunk/debian/compat
non-group/monodevelop/trunk/debian/control
non-group/monodevelop/trunk/debian/copyright
non-group/monodevelop/trunk/debian/monodevelop-boo.install
non-group/monodevelop/trunk/debian/monodevelop-java.install
non-group/monodevelop/trunk/debian/patches/00list
non-group/monodevelop/trunk/debian/rules
Log:
- latest art
Modified: non-group/monodevelop/trunk/debian/changelog
===================================================================
--- non-group/monodevelop/trunk/debian/changelog 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/changelog 2006-04-10 22:07:17 UTC (rev 2420)
@@ -1,3 +1,34 @@
+monodevelop (0.10-0pre1) unstable; urgency=low
+
+ * New upstream release
+ + Fixed fr.po encoding (Closes: #343889)
+ * debian/patches/01_use_real_nunit.dpatch
+ debian/patches/02_fix_mono.unix_api_breakage.dpatch
+ debian/patches/remove_unused_icon.dpatch:
+ + Removed, already applied upstream.
+ * debian/control:
+ + Added libnunit2.2-cil, libmono-oracle1.0-cil, libmono-bytefx0.7.6.1-cil,
+ libmono-npgsql1.0-cil, libmono-cecil0.3-cil, liblog4net1.2-cil,
+ libmono-firebirdsql1.7-cil to build-deps.
+ + Added monodevelop-query package, because it pulls firebird libraries in
+ which doesn't exist for all architectures.
+ + Updated debhelper build-dep to >= 5.0.0
+ + Updated mono-mcs build-dep to >= 1.1.10
+ * debian/compat:
+ + Bumped to 5
+ * debian/copyright:
+ + Updated author list.
+ + Added URL for the source of stetic.
+ * debian/patches/use_real_libs.dpatch:
+ + Use real log4net, cecil and FirebirdSql.Data.Firebird instead of the
+ bundled versions.
+ (thanks to Sebastian 'slomo' Dröge <slomo at ubuntu.com> for the patch)
+ * debian/patches/update_templates_for_gtk_sharp_2.8.x.dpatch:
+ + Updates the references to Gtk# 2 libraries in the templates.
+ (thanks to Sebastian 'slomo' Dröge <slomo at ubuntu.com> for the patch)
+
+ -- Mirco Bauer <meebey at meebey.net> Sun, 19 Mar 2006 15:36:34 +0100
+
monodevelop (0.9-1) unstable; urgency=low
* New upstream release
Modified: non-group/monodevelop/trunk/debian/compat
===================================================================
--- non-group/monodevelop/trunk/debian/compat 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/compat 2006-04-10 22:07:17 UTC (rev 2420)
@@ -1 +1 @@
-4
+5
Modified: non-group/monodevelop/trunk/debian/control
===================================================================
--- non-group/monodevelop/trunk/debian/control 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/control 2006-04-10 22:07:17 UTC (rev 2420)
@@ -2,13 +2,13 @@
Section: devel
Priority: optional
Maintainer: Mirco Bauer <meebey at meebey.net>
-Build-Depends-Indep: debhelper (>= 4.0.0), cli-common (>= 0.2.0), dpatch, mono-mcs (>= 1.1.4) | c-sharp-compiler, libmono-dev (>= 1.1.4), boo (>= 0.6.0.1858), ikvm (>= 0.10), monodoc-base (>= 1.1.9), intltool, gtk-sharp2-gapi (>= 2.4.0), libgtk2.0-cil (>= 2.4.0), libgnome2.0-cil (>= 2.4.0), libgconf2.0-cil (>= 2.4.0), libglade2.0-cil (>= 2.4.0), libvte2.0-cil (>= 2.4.0), libgtksourceview2.0-cil (>= 0.10), libgecko2.0-cil (>= 0.10), libnunit-cil (>= 1.1.8), mozilla-dev
+Build-Depends-Indep: debhelper (>= 5.0.0), cli-common (>= 0.2.0), dpatch, mono-mcs (>= 1.1.10) | c-sharp-compiler, libmono-dev (>= 1.1.10), boo (>= 0.7.5.2013), ikvm (>= 0.10), monodoc-base (>= 1.1.9), intltool, mozilla-dev, gtk-sharp2-gapi (>= 2.4.0), libgtk2.0-cil (>= 2.4.0), libgnome2.0-cil (>= 2.4.0), libgconf2.0-cil (>= 2.4.0), libglade2.0-cil (>= 2.4.0), libvte2.0-cil (>= 2.4.0), libgtksourceview2.0-cil (>= 0.10), libgecko2.0-cil (>= 0.10), libnunit2.2-cil (>= 2.2.0), libmono-oracle1.0-cil, libmono-bytefx0.7.6.1-cil, libmono-npgsql1.0-cil, libmono-cecil0.3-cil, liblog4net1.2-cil, libmono-firebirdsql1.7-cil
Standards-Version: 3.6.2.1
Package: monodevelop
Architecture: all
-Suggests: monodevelop-boo, monodevelop-java, monodevelop-nunit, monodevelop-versioncontrol
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, mono-mcs (>= 1.1.4), monodoc-manual (>= 1.1.9), pkg-config, gnome-icon-theme (>= 1.1.3), xterm | x-terminal-emulator
+Suggests: monodevelop-boo, monodevelop-java, monodevelop-nunit, monodevelop-versioncontrol, monodevelop-query
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, mono-mcs (>= 1.1.10), monodoc-manual (>= 1.1.9), pkg-config, gnome-icon-theme (>= 1.1.3), xterm | x-terminal-emulator
Provides: monodoc-viewer
Description: C#/Boo/Java/Nemerle/ILasm Development Environment
MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
@@ -54,3 +54,13 @@
.
This package enables version control integration (currently only Subversion)
for MonoDevelop.
+
+Package: monodevelop-query
+Architecture: all
+Replaces: monodevelop (<< 0.10)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, monodevelop (= ${Source-Version})
+Description: MonoQuery plugin for MonoDevelop
+ MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
+ languages.
+ .
+ This package enables database SQL query features for MonoDevelop.
Modified: non-group/monodevelop/trunk/debian/copyright
===================================================================
--- non-group/monodevelop/trunk/debian/copyright 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/copyright 2006-04-10 22:07:17 UTC (rev 2420)
@@ -30,6 +30,7 @@
Maurício de Lemos Rodrigues Collares Neto
Christian Hergert
Ankit Jain
+Jacob Ilsø Christensen
and Mike Krueger and the SharpDevelop team
@@ -51,3 +52,6 @@
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The source of the stetic library can be found here:
+http://svn.myrealbox.com/viewcvs/trunk/stetic/
Modified: non-group/monodevelop/trunk/debian/monodevelop-boo.install
===================================================================
--- non-group/monodevelop/trunk/debian/monodevelop-boo.install 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/monodevelop-boo.install 2006-04-10 22:07:17 UTC (rev 2420)
@@ -1,3 +1 @@
debian/tmp/usr/lib/monodevelop/AddIns/BackendBindings/Boo*
-debian/tmp/usr/lib/monodevelop/AddIns/BackendBindings/templates/Boo*
-debian/tmp/usr/lib/monodevelop/AddIns/BackendBindings/templates/EmptyBoo*
Modified: non-group/monodevelop/trunk/debian/monodevelop-java.install
===================================================================
--- non-group/monodevelop/trunk/debian/monodevelop-java.install 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/monodevelop-java.install 2006-04-10 22:07:17 UTC (rev 2420)
@@ -1,4 +1 @@
debian/tmp/usr/lib/monodevelop/AddIns/BackendBindings/Java*
-debian/tmp/usr/lib/monodevelop/AddIns/BackendBindings/templates/Java*
-debian/tmp/usr/lib/monodevelop/AddIns/BackendBindings/templates/EmptyJava*
-debian/tmp/usr/lib/monodevelop/AddIns/BackendBindings/templates/Ikvm*
Added: non-group/monodevelop/trunk/debian/monodevelop-query.install
===================================================================
--- non-group/monodevelop/trunk/debian/monodevelop-query.install 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/monodevelop-query.install 2006-04-10 22:07:17 UTC (rev 2420)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/monodevelop/AddIns/MonoQuery/
Modified: non-group/monodevelop/trunk/debian/patches/00list
===================================================================
--- non-group/monodevelop/trunk/debian/patches/00list 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/patches/00list 2006-04-10 22:07:17 UTC (rev 2420)
@@ -1,2 +1,3 @@
-01_use_real_nunit
-remove_unused_icon
+use_nunit2.2
+use_real_libs
+update_templates_for_gtk_sharp_2.8.x
Deleted: non-group/monodevelop/trunk/debian/patches/01_remove_bashism.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/01_remove_bashism.dpatch 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/patches/01_remove_bashism.dpatch 2006-04-10 22:07:17 UTC (rev 2420)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_startup_script.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./monodevelop.in /tmp/dpep-work.BbGgsz/monodevelop-0.7/monodevelop.in
---- ./monodevelop.in 2005-07-29 08:36:55.000000000 +0200
-+++ /tmp/dpep-work.BbGgsz/monodevelop-0.7/monodevelop.in 2005-07-29 08:37:17.000000000 +0200
-@@ -1,6 +1,6 @@
- #!/bin/sh
-
--function reWrite {
-+reWrite() {
- ret=""
- WD=`pwd`
- for arg in $*
Deleted: non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch 2006-04-10 22:07:17 UTC (rev 2420)
@@ -1,136 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_use_real_nunit.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad monodevelop-0.9~/Extras/MonoDeveloperExtensions/Makefile.am monodevelop-0.9/Extras/MonoDeveloperExtensions/Makefile.am
---- monodevelop-0.9~/Extras/MonoDeveloperExtensions/Makefile.am 2005-09-28 02:40:25.000000000 +0200
-+++ monodevelop-0.9/Extras/MonoDeveloperExtensions/Makefile.am 2005-11-26 19:48:53.000000000 +0100
-@@ -15,7 +15,7 @@
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Components.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Ide.dll \
- /r:$(top_builddir)/build/AddIns/NUnit/MonoDevelop.NUnit.dll \
-- /r:nunit.core.dll \
-+ $(MONO_NUNIT_LIBS) \
- $(GTK_SHARP_LIBS) \
- $(GLADE_SHARP_LIBS) \
- $(GCONF_SHARP_LIBS) \
-diff -urNad monodevelop-0.9~/Extras/MonoDeveloperExtensions/Makefile.in monodevelop-0.9/Extras/MonoDeveloperExtensions/Makefile.in
---- monodevelop-0.9~/Extras/MonoDeveloperExtensions/Makefile.in 2005-11-23 21:45:17.000000000 +0100
-+++ monodevelop-0.9/Extras/MonoDeveloperExtensions/Makefile.in 2005-11-26 19:48:42.000000000 +0100
-@@ -255,7 +255,7 @@
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Components.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Ide.dll \
- /r:$(top_builddir)/build/AddIns/NUnit/MonoDevelop.NUnit.dll \
-- /r:nunit.core.dll \
-+ $(MONO_NUNIT_LIBS) \
- $(GTK_SHARP_LIBS) \
- $(GLADE_SHARP_LIBS) \
- $(GCONF_SHARP_LIBS) \
-diff -urNad monodevelop-0.9~/Extras/NUnit/Makefile.am monodevelop-0.9/Extras/NUnit/Makefile.am
---- monodevelop-0.9~/Extras/NUnit/Makefile.am 2005-09-28 02:40:25.000000000 +0200
-+++ monodevelop-0.9/Extras/NUnit/Makefile.am 2005-11-26 19:46:51.000000000 +0100
-@@ -2,8 +2,7 @@
- ADDIN_BUILD = $(top_builddir)/build/AddIns/NUnit
- ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.NUnit.dll
-
--DLLS = /r:nunit.framework.dll \
-- /r:nunit.core.dll \
-+DLLS = $(MONO_NUNIT_LIBS) \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
-diff -urNad monodevelop-0.9~/Extras/NUnit/Makefile.in monodevelop-0.9/Extras/NUnit/Makefile.in
---- monodevelop-0.9~/Extras/NUnit/Makefile.in 2005-11-23 21:45:19.000000000 +0100
-+++ monodevelop-0.9/Extras/NUnit/Makefile.in 2005-11-26 19:46:13.000000000 +0100
-@@ -240,8 +240,7 @@
- target_alias = @target_alias@
- ADDIN_BUILD = $(top_builddir)/build/AddIns/NUnit
- ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.NUnit.dll
--DLLS = /r:nunit.framework.dll \
-- /r:nunit.core.dll \
-+DLLS = $(MONO_NUNIT_LIBS) \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
-diff -urNad monodevelop-0.9~/Extras/WelcomePage/Makefile.am monodevelop-0.9/Extras/WelcomePage/Makefile.am
---- monodevelop-0.9~/Extras/WelcomePage/Makefile.am 2005-11-16 18:13:23.000000000 +0100
-+++ monodevelop-0.9/Extras/WelcomePage/Makefile.am 2005-11-26 19:49:31.000000000 +0100
-@@ -2,8 +2,7 @@
- ADDIN_BUILD = $(top_builddir)/build/AddIns/WelcomePage
- ASSEMBLY = $(ADDIN_BUILD)/WelcomePage.dll
-
--DLLS = /r:nunit.framework.dll \
-- /r:nunit.core.dll \
-+DLLS = $(MONO_NUNIT_LIBS) \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
-diff -urNad monodevelop-0.9~/Extras/WelcomePage/Makefile.in monodevelop-0.9/Extras/WelcomePage/Makefile.in
---- monodevelop-0.9~/Extras/WelcomePage/Makefile.in 2005-11-23 21:45:21.000000000 +0100
-+++ monodevelop-0.9/Extras/WelcomePage/Makefile.in 2005-11-26 19:49:19.000000000 +0100
-@@ -240,8 +240,7 @@
- target_alias = @target_alias@
- ADDIN_BUILD = $(top_builddir)/build/AddIns/WelcomePage
- ASSEMBLY = $(ADDIN_BUILD)/WelcomePage.dll
--DLLS = /r:nunit.framework.dll \
-- /r:nunit.core.dll \
-+DLLS = $(MONO_NUNIT_LIBS) \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
-diff -urNad monodevelop-0.9~/configure.in monodevelop-0.9/configure.in
---- monodevelop-0.9~/configure.in 2005-11-23 21:36:28.000000000 +0100
-+++ monodevelop-0.9/configure.in 2005-11-26 19:46:13.000000000 +0100
-@@ -137,7 +137,7 @@
- AC_ARG_ENABLE(nunit,
- AC_HELP_STRING([--enable-nunit],
- [enable support for NUnit [default=yes]]),
-- [PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION, enable_nunit=${enableval}, enable_nunit=no)],
-+ [PKG_CHECK_MODULES(MONO_NUNIT, nunit >= $MONO_NUNIT_REQUIRED_VERSION, enable_nunit=${enableval}, enable_nunit=no)],
- enable_nunit=yes)
-
- AM_CONDITIONAL(ENABLE_NUNIT, test x$enable_nunit = xyes)
-diff -urNad monodevelop-0.9~/configure monodevelop-0.9/configure
---- monodevelop-0.9~/configure 2005-11-23 21:45:25.000000000 +0100
-+++ monodevelop-0.9/configure 2005-11-26 19:46:13.000000000 +0100
-@@ -4365,23 +4365,23 @@
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION" >&5
--echo $ECHO_N "checking for mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for nunit >= $MONO_NUNIT_REQUIRED_VERSION" >&5
-+echo $ECHO_N "checking for nunit >= $MONO_NUNIT_REQUIRED_VERSION... $ECHO_C" >&6
-
-- if $PKG_CONFIG --exists "mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION" ; then
-+ if $PKG_CONFIG --exists "nunit >= $MONO_NUNIT_REQUIRED_VERSION" ; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- succeeded=yes
-
- echo "$as_me:$LINENO: checking MONO_NUNIT_CFLAGS" >&5
- echo $ECHO_N "checking MONO_NUNIT_CFLAGS... $ECHO_C" >&6
-- MONO_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION"`
-+ MONO_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit >= $MONO_NUNIT_REQUIRED_VERSION"`
- echo "$as_me:$LINENO: result: $MONO_NUNIT_CFLAGS" >&5
- echo "${ECHO_T}$MONO_NUNIT_CFLAGS" >&6
-
- echo "$as_me:$LINENO: checking MONO_NUNIT_LIBS" >&5
- echo $ECHO_N "checking MONO_NUNIT_LIBS... $ECHO_C" >&6
-- MONO_NUNIT_LIBS=`$PKG_CONFIG --libs "mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION"`
-+ MONO_NUNIT_LIBS=`$PKG_CONFIG --libs "nunit >= $MONO_NUNIT_REQUIRED_VERSION"`
- echo "$as_me:$LINENO: result: $MONO_NUNIT_LIBS" >&5
- echo "${ECHO_T}$MONO_NUNIT_LIBS" >&6
- else
-@@ -4389,7 +4389,7 @@
- MONO_NUNIT_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
-- MONO_NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION"`
-+ MONO_NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nunit >= $MONO_NUNIT_REQUIRED_VERSION"`
-
- fi
-
Deleted: non-group/monodevelop/trunk/debian/patches/boo_0.6.0_compat.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/boo_0.6.0_compat.dpatch 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/patches/boo_0.6.0_compat.dpatch 2006-04-10 22:07:17 UTC (rev 2420)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## boo_0.6.0_compat.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad monodevelop-0.7~/Extras/BooBinding/BooBindingCompilerServices.boo monodevelop-0.7/Extras/BooBinding/BooBindingCompilerServices.boo
---- monodevelop-0.7~/Extras/BooBinding/BooBindingCompilerServices.boo 2005-04-26 03:27:10.000000000 +0200
-+++ monodevelop-0.7/Extras/BooBinding/BooBindingCompilerServices.boo 2005-09-25 18:03:13.000000000 +0200
-@@ -105,7 +105,7 @@
- try:
- monitor.BeginTask (null, 2)
- monitor.Log.WriteLine ("Compiling Boo source code ...")
-- arguments = String.Format ("-c \"{0} {1} > {2} 2> {3}\"", (compiler, args, output, error))
-+ arguments = String.Format ("-c \"{0} {1} > {2} 2> {3}\"", compiler, args, output, error)
- si = ProcessStartInfo ("/bin/sh", arguments)
- // print "${si.FileName}, ${si.Arguments}"
- si.RedirectStandardOutput = true
-diff -urNad monodevelop-0.7~/Extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo monodevelop-0.7/Extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo
---- monodevelop-0.7~/Extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo 2005-04-28 04:38:46.000000000 +0200
-+++ monodevelop-0.7/Extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo 2005-09-25 18:03:13.000000000 +0200
-@@ -119,9 +119,7 @@
- labelCompileTarget.Markup = String.Format ("{0} :", GettextCatalog.GetString ("Output Assembly"))
-
-
-- typeArray = array(System.Type, 1)
-- typeArray[0] = typeof(string)
-- store = ListStore (typeArray)
-+ store = ListStore (typeof(string))
-
- stringArray = array(System.String, 1)
- stringArray[0] = GettextCatalog.GetString ("Executable")
Deleted: non-group/monodevelop/trunk/debian/patches/parsing_mcs_1.1.9_output.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/parsing_mcs_1.1.9_output.dpatch 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/patches/parsing_mcs_1.1.9_output.dpatch 2006-04-10 22:07:17 UTC (rev 2420)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## parsing_mcs_1.1.9_output.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs /tmp/dpep-work.ElNPZA/monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
---- ./Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2005-03-22 19:02:01.000000000 +0100
-+++ /tmp/dpep-work.ElNPZA/monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2005-09-11 19:50:07.000000000 +0200
-@@ -530,7 +530,7 @@
- }
-
- // Snatched from our codedom code :-).
-- static Regex regexError = new Regex (@"^(\s*(?<file>.*)\((?<line>\d*)(,(?<column>\d*))?\)\s+)*(?<level>\w+)\s*(?<number>.*):\s(?<message>.*)",
-+ static Regex regexError = new Regex (@"^(\s*(?<file>.*)\((?<line>\d*)(,(?<column>\d*[\+]*))?\)(:|)\s+)*(?<level>\w+)\s*(?<number>.*):\s(?<message>.*)",
- RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-
- private static CompilerError CreateErrorFromString(string error_string)
-@@ -550,8 +550,12 @@
- error.FileName=match.Result("${file}");
- if (String.Empty != match.Result("${line}"))
- error.Line=Int32.Parse(match.Result("${line}"));
-- if (String.Empty != match.Result("${column}"))
-- error.Column=Int32.Parse(match.Result("${column}"));
-+ if (String.Empty != match.Result("${column}")) {
-+ if (match.Result("${column}") == "255+")
-+ error.Column = -1;
-+ else
-+ error.Column=Int32.Parse(match.Result("${column}"));
-+ }
- if (match.Result("${level}")=="warning")
- error.IsWarning=true;
- error.ErrorNumber=match.Result("${number}");
Deleted: non-group/monodevelop/trunk/debian/patches/remove_unused_icon.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/remove_unused_icon.dpatch 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/patches/remove_unused_icon.dpatch 2006-04-10 22:07:17 UTC (rev 2420)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.addin.xml 2005/11/09 10:38:33 52780
-+++ monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.addin.xml 2005/11/25 13:11:43 53477
-@@ -96,7 +96,6 @@
- <StockIcon stockid = "md-private-method" resource = "Icons.16x16.PrivateMethod" />
- <StockIcon stockid = "md-private-property" resource = "Icons.16x16.PrivateProperty" />
- <StockIcon stockid = "md-private-struct" resource = "Icons.16x16.PrivateStruct" />
-- <StockIcon stockid = "md-project-scout-icon" resource = "Icons.ProjectScoutIcon" />
- <StockIcon stockid = "md-properties-icon" resource = "Icons.16x16.PropertiesIcon" />
- <StockIcon stockid = "md-property" resource = "Icons.16x16.Property" />
- <StockIcon stockid = "md-protected-class" resource = "Icons.16x16.ProtectedClass" />
-
-
---- monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/StockIcons.cs 2005/09/27 15:22:05 50869
-+++ monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/StockIcons.cs 2005/11/25 13:11:43 53477
-@@ -83,7 +83,6 @@
- public static readonly string PrivateMethod = "md-private-method";
- public static readonly string PrivateProperty = "md-private-property";
- public static readonly string PrivateStruct = "md-private-struct";
-- public static readonly string ProjectScoutIcon = "md-project-scout-icon";
- public static readonly string PropertiesIcon = "md-properties-icon";
- public static readonly string Property = "md-property";
- public static readonly string ProtectedClass = "md-protected-class";
-
Deleted: non-group/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.3.x.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.3.x.dpatch 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.3.x.dpatch 2006-04-10 22:07:17 UTC (rev 2420)
@@ -1,103 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## update_templates_for_gtk_sharp_2.3.x.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./Core/src/AddIns/BackendBindings/CSharpBinding/templates/GladeSharp2Project.xpt.xml /tmp/dpep-work.xddBG2/monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GladeSharp2Project.xpt.xml
---- ./Core/src/AddIns/BackendBindings/CSharpBinding/templates/GladeSharp2Project.xpt.xml 2005-02-20 01:50:39.000000000 +0100
-+++ /tmp/dpep-work.xddBG2/monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GladeSharp2Project.xpt.xml 2005-09-11 19:56:34.000000000 +0200
-@@ -27,12 +27,12 @@
- <Options/>
-
- <References>
-- <Reference type="Gac" refto="gtk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="gdk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="glib-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="glade-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="pango-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="glade-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- </References>
-
- <Resources>
-diff -urNad --exclude=CVS --exclude=.svn ./Core/src/AddIns/BackendBindings/CSharpBinding/templates/GnomeSharp2Project.xpt.xml /tmp/dpep-work.xddBG2/monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GnomeSharp2Project.xpt.xml
---- ./Core/src/AddIns/BackendBindings/CSharpBinding/templates/GnomeSharp2Project.xpt.xml 2005-02-20 01:50:39.000000000 +0100
-+++ /tmp/dpep-work.xddBG2/monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GnomeSharp2Project.xpt.xml 2005-09-11 19:56:34.000000000 +0200
-@@ -27,12 +27,12 @@
- <Options/>
-
- <References>
-- <Reference type="Gac" refto="gnome-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="gtk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="gdk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="glib-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="glade-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="pango-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="gnome-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- </References>
-
- <Files>
-diff -urNad --exclude=CVS --exclude=.svn ./Core/src/AddIns/BackendBindings/CSharpBinding/templates/GtkSharp2Project.xpt.xml /tmp/dpep-work.xddBG2/monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GtkSharp2Project.xpt.xml
---- ./Core/src/AddIns/BackendBindings/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2005-02-20 01:50:39.000000000 +0100
-+++ /tmp/dpep-work.xddBG2/monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2005-09-11 19:56:34.000000000 +0200
-@@ -27,11 +27,11 @@
- <Options/>
-
- <References>
-- <Reference type="Gac" refto="gtk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="gdk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="glib-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="glade-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="pango-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- </References>
-
- <Files>
-diff -urNad --exclude=CVS --exclude=.svn ./Core/src/AddIns/BackendBindings/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml /tmp/dpep-work.xddBG2/monodevelop-0.7/Core/src/AddIns/BackendBindings/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml
---- ./Core/src/AddIns/BackendBindings/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2005-05-14 01:13:05.000000000 +0200
-+++ /tmp/dpep-work.xddBG2/monodevelop-0.7/Core/src/AddIns/BackendBindings/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2005-09-11 19:56:34.000000000 +0200
-@@ -27,11 +27,11 @@
- <Options/>
-
- <References>
-- <Reference type="Gac" refto="gtk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="gdk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="glib-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="glade-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-- <Reference type="Gac" refto="pango-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- </References>
-
- <Files>
-diff -urNad --exclude=CVS --exclude=.svn ./Extras/BooBinding/templates/BooGtkSharpProject.xpt.xml /tmp/dpep-work.xddBG2/monodevelop-0.7/Extras/BooBinding/templates/BooGtkSharpProject.xpt.xml
---- ./Extras/BooBinding/templates/BooGtkSharpProject.xpt.xml 2005-04-26 03:27:10.000000000 +0200
-+++ /tmp/dpep-work.xddBG2/monodevelop-0.7/Extras/BooBinding/templates/BooGtkSharpProject.xpt.xml 2005-09-11 19:56:34.000000000 +0200
-@@ -23,7 +23,7 @@
-
- <Project name = "${ProjectName}" directory = ".">
- <References>
-- <Reference type="Gac" refto="gtk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+ <Reference type="Gac" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- </References>
- <Files>
- <File name="Main.boo"><![CDATA[// project created on ${Date} at ${Time}
Added: non-group/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.8.x.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.8.x.dpatch 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.8.x.dpatch 2006-04-10 22:07:17 UTC (rev 2420)
@@ -0,0 +1,182 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+diff -Naur monodevelop-0.9/Extras-old/BooBinding/templates/BooGtkSharpProject.xpt.xml monodevelop-0.9/Extras/BooBinding/templates/BooGtkSharpProject.xpt.xml
+--- monodevelop-0.9/Extras-old/BooBinding/templates/BooGtkSharpProject.xpt.xml 2005-09-27 16:50:33.000000000 +0200
++++ monodevelop-0.9/Extras/BooBinding/templates/BooGtkSharpProject.xpt.xml 2006-03-17 20:12:32.150898800 +0100
+@@ -23,8 +23,8 @@
+
+ <Project name = "${ProjectName}" directory = ".">
+ <References>
+- <Reference type="Gac" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+ <Files>
+ <File name="Main.boo"><![CDATA[// project created on ${Date} at ${Time}
+diff -Naur monodevelop-0.9/Extras-old/CSharpBinding/templates/GladeSharp2Project.xpt.xml monodevelop-0.9/Extras/CSharpBinding/templates/GladeSharp2Project.xpt.xml
+--- monodevelop-0.9/Extras-old/CSharpBinding/templates/GladeSharp2Project.xpt.xml 2005-11-17 12:04:46.000000000 +0100
++++ monodevelop-0.9/Extras/CSharpBinding/templates/GladeSharp2Project.xpt.xml 2006-03-17 20:12:30.315177872 +0100
+@@ -28,11 +28,11 @@
+
+ <References>
+ <Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+- <Reference type="Gac" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+
+ <Resources>
+diff -Naur monodevelop-0.9/Extras-old/CSharpBinding/templates/GnomeSharp2Project.xpt.xml monodevelop-0.9/Extras/CSharpBinding/templates/GnomeSharp2Project.xpt.xml
+--- monodevelop-0.9/Extras-old/CSharpBinding/templates/GnomeSharp2Project.xpt.xml 2005-11-17 12:04:46.000000000 +0100
++++ monodevelop-0.9/Extras/CSharpBinding/templates/GnomeSharp2Project.xpt.xml 2006-03-17 20:12:30.322176808 +0100
+@@ -28,12 +28,12 @@
+
+ <References>
+ <Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+- <Reference type="Gac" refto="gnome-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gnome-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+
+ <Files>
+diff -Naur monodevelop-0.9/Extras-old/CSharpBinding/templates/GtkSharp2Project.xpt.xml monodevelop-0.9/Extras/CSharpBinding/templates/GtkSharp2Project.xpt.xml
+--- monodevelop-0.9/Extras-old/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2005-11-17 12:04:46.000000000 +0100
++++ monodevelop-0.9/Extras/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2006-03-17 20:12:30.331175440 +0100
+@@ -28,11 +28,11 @@
+
+ <References>
+ <Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+- <Reference type="Gac" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+
+ <Files>
+diff -Naur monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmGladeApplicationProject.xpt.xml monodevelop-0.9/Extras/JavaBinding/templates/IkvmGladeApplicationProject.xpt.xml
+--- monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmGladeApplicationProject.xpt.xml 2005-09-23 22:11:15.000000000 +0200
++++ monodevelop-0.9/Extras/JavaBinding/templates/IkvmGladeApplicationProject.xpt.xml 2006-03-17 20:12:31.583984984 +0100
+@@ -28,12 +28,12 @@
+ <Options Target = "WinExe" PauseConsoleOutput = "False" MainClass ="application" />
+
+ <References>
+- <Reference type="Gac" refto="gtk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gdk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="pango-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+
+ <Files>
+diff -Naur monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmGnomeApplicationProject.xpt.xml monodevelop-0.9/Extras/JavaBinding/templates/IkvmGnomeApplicationProject.xpt.xml
+--- monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmGnomeApplicationProject.xpt.xml 2005-09-23 22:11:15.000000000 +0200
++++ monodevelop-0.9/Extras/JavaBinding/templates/IkvmGnomeApplicationProject.xpt.xml 2006-03-17 20:12:31.590983920 +0100
+@@ -28,12 +28,12 @@
+ <Options Target = "WinExe" PauseConsoleOutput = "False" MainClass ="application" />
+
+ <References>
+- <Reference type="Gac" refto="gnome-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gtk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gdk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="pango-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gnome-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+
+ <Files>
+diff -Naur monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmGtkApplicationProject.xpt.xml monodevelop-0.9/Extras/JavaBinding/templates/IkvmGtkApplicationProject.xpt.xml
+--- monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmGtkApplicationProject.xpt.xml 2005-09-23 22:11:15.000000000 +0200
++++ monodevelop-0.9/Extras/JavaBinding/templates/IkvmGtkApplicationProject.xpt.xml 2006-03-17 20:12:31.599982552 +0100
+@@ -28,11 +28,11 @@
+ <Options Target = "WinExe" PauseConsoleOutput = "False" MainClass ="application" />
+
+ <References>
+- <Reference type="Gac" refto="gtk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gdk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="pango-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+
+ <Files>
+diff -Naur monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmLibraryProject.xpt.xml monodevelop-0.9/Extras/JavaBinding/templates/IkvmLibraryProject.xpt.xml
+--- monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmLibraryProject.xpt.xml 2005-09-23 22:11:15.000000000 +0200
++++ monodevelop-0.9/Extras/JavaBinding/templates/IkvmLibraryProject.xpt.xml 2006-03-17 20:12:31.606981488 +0100
+@@ -25,10 +25,10 @@
+
+ <Project name = "${ProjectName}" directory = ".">
+ <References>
+- <Reference type="Gac" refto="gtk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gdk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="atk-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+
+ <Options Target = "Library" PauseConsoleOutput = "False" />
+diff -Naur monodevelop-0.9/Extras-old/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml monodevelop-0.9/Extras/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml
+--- monodevelop-0.9/Extras-old/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2005-09-23 22:11:15.000000000 +0200
++++ monodevelop-0.9/Extras/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2006-03-17 20:12:33.442702416 +0100
+@@ -27,11 +27,11 @@
+ <Options/>
+
+ <References>
+- <Reference type="Gac" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+
+ <Files>
Property changes on: non-group/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.8.x.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: non-group/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch 2006-04-10 22:07:17 UTC (rev 2420)
@@ -0,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use_nunit2.2.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad monodevelop-0.10~/configure monodevelop-0.10/configure
+--- monodevelop-0.10~/configure 2006-04-09 15:51:49.000000000 +0200
++++ monodevelop-0.10/configure 2006-04-09 16:11:59.000000000 +0200
+@@ -4381,23 +4381,23 @@
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for nunit >= 2.2.0" >&5
+-echo $ECHO_N "checking for nunit >= 2.2.0... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for nunit-2.2 >= 2.2.0" >&5
++echo $ECHO_N "checking for nunit-2.2 >= 2.2.0... $ECHO_C" >&6
+
+- if $PKG_CONFIG --exists "nunit >= 2.2.0" ; then
++ if $PKG_CONFIG --exists "nunit-2.2 >= 2.2.0" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ succeeded=yes
+
+ echo "$as_me:$LINENO: checking NUNIT_CFLAGS" >&5
+ echo $ECHO_N "checking NUNIT_CFLAGS... $ECHO_C" >&6
+- NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit >= 2.2.0"`
++ NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit-2.2 >= 2.2.0"`
+ echo "$as_me:$LINENO: result: $NUNIT_CFLAGS" >&5
+ echo "${ECHO_T}$NUNIT_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking NUNIT_LIBS" >&5
+ echo $ECHO_N "checking NUNIT_LIBS... $ECHO_C" >&6
+- NUNIT_LIBS=`$PKG_CONFIG --libs "nunit >= 2.2.0"`
++ NUNIT_LIBS=`$PKG_CONFIG --libs "nunit-2.2 >= 2.2.0"`
+ echo "$as_me:$LINENO: result: $NUNIT_LIBS" >&5
+ echo "${ECHO_T}$NUNIT_LIBS" >&6
+ else
+@@ -4405,7 +4405,7 @@
+ NUNIT_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+- NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nunit >= 2.2.0"`
++ NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nunit-2.2 >= 2.2.0"`
+
+ fi
+
+diff -urNad monodevelop-0.10~/configure.in monodevelop-0.10/configure.in
+--- monodevelop-0.10~/configure.in 2006-04-09 16:04:22.000000000 +0200
++++ monodevelop-0.10/configure.in 2006-04-09 16:12:18.000000000 +0200
+@@ -147,7 +147,7 @@
+ AC_HELP_STRING([--enable-nunit],[enable support for NUnit [default=yes]]),
+ enable_nunit=${enableval}, enable_nunit=yes)
+ if test "x$enable_nunit" = "xyes"; then
+- PKG_CHECK_MODULES(NUNIT, nunit >= 2.2.0, [],
++ PKG_CHECK_MODULES(NUNIT, nunit-2.2 >= 2.2.0, [],
+ [PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit >= 1.1.9)
+ NUNIT_LIBS="$MONO_NUNIT_LIBS"
+ ])
Property changes on: non-group/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: non-group/monodevelop/trunk/debian/patches/use_real_libs.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/use_real_libs.dpatch 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/patches/use_real_libs.dpatch 2006-04-10 22:07:17 UTC (rev 2420)
@@ -0,0 +1,187 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+diff -urNad monodevelop-0.10~/Core/src/MonoDevelop.Core/Makefile.am monodevelop-0.10/Core/src/MonoDevelop.Core/Makefile.am
+--- monodevelop-0.10~/Core/src/MonoDevelop.Core/Makefile.am 2006-04-09 18:43:13.000000000 +0200
++++ monodevelop-0.10/Core/src/MonoDevelop.Core/Makefile.am 2006-04-09 18:43:19.000000000 +0200
+@@ -136,8 +136,8 @@
+ -r:System.Xml \
+ -r:System.Runtime.Remoting \
+ -r:ICSharpCode.SharpZipLib.dll \
+- -r:$(top_builddir)/build/bin/log4net.dll \
+- -r:$(top_builddir)/build/bin/Mono.Cecil.dll
++ `pkg-config --libs log4net` \
++ `pkg-config --libs mono-cecil`
+
+ all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN)
+
+diff -urNad monodevelop-0.10~/Core/src/MonoDevelop.Core/Makefile.in monodevelop-0.10/Core/src/MonoDevelop.Core/Makefile.in
+--- monodevelop-0.10~/Core/src/MonoDevelop.Core/Makefile.in 2006-04-09 18:43:13.000000000 +0200
++++ monodevelop-0.10/Core/src/MonoDevelop.Core/Makefile.in 2006-04-09 18:43:19.000000000 +0200
+@@ -376,8 +376,8 @@
+ -r:System.Xml \
+ -r:System.Runtime.Remoting \
+ -r:ICSharpCode.SharpZipLib.dll \
+- -r:$(top_builddir)/build/bin/log4net.dll \
+- -r:$(top_builddir)/build/bin/Mono.Cecil.dll
++ `pkg-config --libs log4net` \
++ `pkg-config --libs mono-cecil`
+
+ ADDIN = MonoDevelop.Core.addin.xml
+ ADDIN_BUILD = $(top_builddir)/build/AddIns
+diff -urNad monodevelop-0.10~/Core/src/MonoDevelop.Ide/Makefile.am monodevelop-0.10/Core/src/MonoDevelop.Ide/Makefile.am
+--- monodevelop-0.10~/Core/src/MonoDevelop.Ide/Makefile.am 2006-04-09 18:43:13.000000000 +0200
++++ monodevelop-0.10/Core/src/MonoDevelop.Ide/Makefile.am 2006-04-09 18:43:19.000000000 +0200
+@@ -14,7 +14,7 @@
+ -r:Mono.Posix \
+ -r:Mono.GetOptions \
+ -r:System.Runtime.Remoting \
+- -r:$(top_builddir)/build/bin/log4net.dll \
++ `pkg-config --libs log4net` \
+ $(GTK_SHARP_LIBS) \
+ $(GNOME_SHARP_LIBS) \
+ $(GNOME_VFS_SHARP_LIBS) \
+diff -urNad monodevelop-0.10~/Core/src/MonoDevelop.Ide/Makefile.in monodevelop-0.10/Core/src/MonoDevelop.Ide/Makefile.in
+--- monodevelop-0.10~/Core/src/MonoDevelop.Ide/Makefile.in 2006-04-09 18:43:13.000000000 +0200
++++ monodevelop-0.10/Core/src/MonoDevelop.Ide/Makefile.in 2006-04-09 18:43:19.000000000 +0200
+@@ -259,7 +259,7 @@
+ -r:Mono.Posix \
+ -r:Mono.GetOptions \
+ -r:System.Runtime.Remoting \
+- -r:$(top_builddir)/build/bin/log4net.dll \
++ `pkg-config --libs log4net` \
+ $(GTK_SHARP_LIBS) \
+ $(GNOME_SHARP_LIBS) \
+ $(GNOME_VFS_SHARP_LIBS) \
+diff -urNad monodevelop-0.10~/Extras/MonoDevelop.GtkCore/Makefile.am monodevelop-0.10/Extras/MonoDevelop.GtkCore/Makefile.am
+--- monodevelop-0.10~/Extras/MonoDevelop.GtkCore/Makefile.am 2006-04-04 21:29:09.000000000 +0200
++++ monodevelop-0.10/Extras/MonoDevelop.GtkCore/Makefile.am 2006-04-09 18:44:58.000000000 +0200
+@@ -11,7 +11,7 @@
+ -r:$(srcdir)/lib/libstetic.dll \
+ -r:$(srcdir)/lib/libsteticui.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
++ `pkg-config --libs mono-cecil` \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Components.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
+diff -urNad monodevelop-0.10~/Extras/MonoDevelop.GtkCore/Makefile.in monodevelop-0.10/Extras/MonoDevelop.GtkCore/Makefile.in
+--- monodevelop-0.10~/Extras/MonoDevelop.GtkCore/Makefile.in 2006-04-04 23:55:46.000000000 +0200
++++ monodevelop-0.10/Extras/MonoDevelop.GtkCore/Makefile.in 2006-04-09 18:45:13.000000000 +0200
+@@ -251,7 +251,7 @@
+ -r:$(srcdir)/lib/libstetic.dll \
+ -r:$(srcdir)/lib/libsteticui.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
++ `pkg-config --libs mono-cecil` \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Components.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
+diff -urNad monodevelop-0.10~/Extras/MonoQuery/Mono.Data.Sql/Makefile.am monodevelop-0.10/Extras/MonoQuery/Mono.Data.Sql/Makefile.am
+--- monodevelop-0.10~/Extras/MonoQuery/Mono.Data.Sql/Makefile.am 2006-04-09 18:43:13.000000000 +0200
++++ monodevelop-0.10/Extras/MonoQuery/Mono.Data.Sql/Makefile.am 2006-04-09 18:43:19.000000000 +0200
+@@ -42,7 +42,7 @@
+ -r:Mono.Data.SqliteClient \
+ -r:System.Data.OracleClient \
+ -r:Mono.Data.SybaseClient \
+--r:$(top_srcdir)/contrib/FirebirdSql.Data.Firebird.dll
++-r:FirebirdSql.Data.Firebird
+
+ ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoQuery
+
+diff -urNad monodevelop-0.10~/Extras/MonoQuery/Mono.Data.Sql/Makefile.in monodevelop-0.10/Extras/MonoQuery/Mono.Data.Sql/Makefile.in
+--- monodevelop-0.10~/Extras/MonoQuery/Mono.Data.Sql/Makefile.in 2006-04-09 18:43:13.000000000 +0200
++++ monodevelop-0.10/Extras/MonoQuery/Mono.Data.Sql/Makefile.in 2006-04-09 18:43:19.000000000 +0200
+@@ -284,7 +284,7 @@
+ -r:Mono.Data.SqliteClient \
+ -r:System.Data.OracleClient \
+ -r:Mono.Data.SybaseClient \
+--r:$(top_srcdir)/contrib/FirebirdSql.Data.Firebird.dll
++-r:FirebirdSql.Data.Firebird
+
+ ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoQuery
+ ASSEMBLY = $(ADDIN_BUILD)/Mono.Data.Sql.dll
+diff -urNad monodevelop-0.10~/contrib/Makefile.am monodevelop-0.10/contrib/Makefile.am
+--- monodevelop-0.10~/contrib/Makefile.am 2006-04-09 18:43:13.000000000 +0200
++++ monodevelop-0.10/contrib/Makefile.am 2006-04-09 18:43:19.000000000 +0200
+@@ -1,34 +1,8 @@
+
+ BINDIR=$(top_builddir)/build/bin
+-LOG4NET_DLL=log4net.dll
+-LOG4NET = $(BINDIR)/$(LOG4NET_DLL)
+-CECIL_DLL=Mono.Cecil.dll
+-CECIL = $(BINDIR)/$(CECIL_DLL)
+-
+-# We need to copy Firebird to the same directory as where
+-# mono.data.sql builds. otherwise, mono.data.sql cant find the
+-# firebird provider when monoquery links against mono.data.sql.
+-FIREBIRDDIR=$(top_builddir)/build/AddIns/MonoQuery
+-FIREBIRD_DLL=FirebirdSql.Data.Firebird.dll
+-FIREBIRD = $(FIREBIRDDIR)/$(FIREBIRD_DLL)
+-
+-all: $(LOG4NET) $(CECIL) $(FIREBIRD)
+-
+-$(LOG4NET): $(srcdir)/$(LOG4NET_DLL)
+- mkdir -p $(BINDIR)
+- cp $(srcdir)/$(LOG4NET_DLL) $(LOG4NET)
+-
+-$(CECIL): $(srcdir)/$(CECIL_DLL)
+- mkdir -p $(BINDIR)
+- cp $(srcdir)/$(CECIL_DLL) $(CECIL)
+
+-$(FIREBIRD): $(srcdir)/$(FIREBIRD_DLL)
+- mkdir -p $(FIREBIRDDIR)
+- cp $(srcdir)/$(FIREBIRD_DLL) $(FIREBIRD)
+-
+-assemblydir = $(MD_ASSEMBLY_DIR)
+-assembly_DATA = $(LOG4NET) $(CECIL) $(FIREBIRD)
++all:
+
+-CLEANFILES = $(LOG4NET) $(CECIL) $(FIREBIRD)
++CLEANFILES =
+ EXTRA_DIST = $(LOG4NET_DLL) $(CECIL_DLL) $(FIREBIRD_DLL)
+
+diff -urNad monodevelop-0.10~/contrib/Makefile.in monodevelop-0.10/contrib/Makefile.in
+--- monodevelop-0.10~/contrib/Makefile.in 2006-04-09 18:43:13.000000000 +0200
++++ monodevelop-0.10/contrib/Makefile.in 2006-04-09 18:43:19.000000000 +0200
+@@ -240,19 +240,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ BINDIR = $(top_builddir)/build/bin
+-LOG4NET_DLL = log4net.dll
+-LOG4NET = $(BINDIR)/$(LOG4NET_DLL)
+-CECIL_DLL = Mono.Cecil.dll
+-CECIL = $(BINDIR)/$(CECIL_DLL)
+
+-# We need to copy Firebird to the same directory as where
+-# mono.data.sql builds. otherwise, mono.data.sql cant find the
+-# firebird provider when monoquery links against mono.data.sql.
+-FIREBIRDDIR = $(top_builddir)/build/AddIns/MonoQuery
+-FIREBIRD_DLL = FirebirdSql.Data.Firebird.dll
+-FIREBIRD = $(FIREBIRDDIR)/$(FIREBIRD_DLL)
+-assemblydir = $(MD_ASSEMBLY_DIR)
+-assembly_DATA = $(LOG4NET) $(CECIL) $(FIREBIRD)
+ CLEANFILES = $(LOG4NET) $(CECIL) $(FIREBIRD)
+ EXTRA_DIST = $(LOG4NET_DLL) $(CECIL_DLL) $(FIREBIRD_DLL)
+ all: all-am
+@@ -428,19 +416,8 @@
+ uninstall-info-am
+
+
+-all: $(LOG4NET) $(CECIL) $(FIREBIRD)
+-
+-$(LOG4NET): $(srcdir)/$(LOG4NET_DLL)
+- mkdir -p $(BINDIR)
+- cp $(srcdir)/$(LOG4NET_DLL) $(LOG4NET)
+-
+-$(CECIL): $(srcdir)/$(CECIL_DLL)
+- mkdir -p $(BINDIR)
+- cp $(srcdir)/$(CECIL_DLL) $(CECIL)
++all:
+
+-$(FIREBIRD): $(srcdir)/$(FIREBIRD_DLL)
+- mkdir -p $(FIREBIRDDIR)
+- cp $(srcdir)/$(FIREBIRD_DLL) $(FIREBIRD)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Property changes on: non-group/monodevelop/trunk/debian/patches/use_real_libs.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: non-group/monodevelop/trunk/debian/patches/use_real_log4net_and_firebird.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/use_real_log4net_and_firebird.dpatch 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/patches/use_real_log4net_and_firebird.dpatch 2006-04-10 22:07:17 UTC (rev 2420)
@@ -0,0 +1,160 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- ../monodevelop-0.9/Core/src/MonoDevelop.Core/Makefile.am 2005-11-15 18:59:50.000000000 +0100
++++ monodevelop-0.9/Core/src/MonoDevelop.Core/Makefile.am 2006-03-19 19:28:38.925077088 +0100
+@@ -127,7 +127,7 @@
+ REFS = -r:Mono.Posix.dll \
+ -r:System.Runtime.Remoting \
+ -r:ICSharpCode.SharpZipLib.dll \
+- -r:$(top_builddir)/build/bin/log4net.dll \
++ `pkg-config --libs log4net` \
+ -r:$(top_builddir)/build/bin/Mono.Cecil.dll
+
+ all: $(DLL) $(ADDIN_BUILD)/$(ADDIN)
+--- ../monodevelop-0.9/Core/src/MonoDevelop.Core/Makefile.in 2005-11-23 21:45:11.000000000 +0100
++++ monodevelop-0.9/Core/src/MonoDevelop.Core/Makefile.in 2006-03-19 19:27:17.123512816 +0100
+@@ -366,7 +366,7 @@
+ REFS = -r:Mono.Posix.dll \
+ -r:System.Runtime.Remoting \
+ -r:ICSharpCode.SharpZipLib.dll \
+- -r:$(top_builddir)/build/bin/log4net.dll \
++ `pkg-config --libs log4net` \
+ -r:$(top_builddir)/build/bin/Mono.Cecil.dll
+
+ ADDIN = MonoDevelop.Core.addin.xml
+--- ../monodevelop-0.9/Core/src/MonoDevelop.Ide/Makefile.am 2005-11-15 11:37:23.000000000 +0100
++++ monodevelop-0.9/Core/src/MonoDevelop.Ide/Makefile.am 2006-03-19 19:30:12.766810976 +0100
+@@ -10,7 +10,7 @@
+ /r:Mono.Posix.dll \
+ /r:Mono.GetOptions.dll \
+ /r:System.Runtime.Remoting \
+- /r:$(top_builddir)/build/bin/log4net.dll \
++ `pkg-config --libs log4net` \
+ $(GTK_SHARP_LIBS) \
+ $(GNOME_SHARP_LIBS) \
+ $(GNOME_VFS_SHARP_LIBS) \
+--- ../monodevelop-0.9/Core/src/MonoDevelop.Ide/Makefile.in 2005-11-23 21:45:12.000000000 +0100
++++ monodevelop-0.9/Core/src/MonoDevelop.Ide/Makefile.in 2006-03-19 19:30:35.479358144 +0100
+@@ -253,7 +253,7 @@
+ /r:Mono.Posix.dll \
+ /r:Mono.GetOptions.dll \
+ /r:System.Runtime.Remoting \
+- /r:$(top_builddir)/build/bin/log4net.dll \
++ `pkg-config --libs log4net` \
+ $(GTK_SHARP_LIBS) \
+ $(GNOME_SHARP_LIBS) \
+ $(GNOME_VFS_SHARP_LIBS) \
+--- ../monodevelop-0.9/Extras/MonoQuery/Mono.Data.Sql/Makefile.am 2005-09-23 22:11:15.000000000 +0200
++++ monodevelop-0.9/Extras/MonoQuery/Mono.Data.Sql/Makefile.am 2006-03-19 19:37:12.247040288 +0100
+@@ -44,7 +44,7 @@
+ -r:Mono.Data.SqliteClient \
+ -r:System.Data.OracleClient \
+ -r:Mono.Data.SybaseClient \
+--r:$(top_srcdir)/contrib/FirebirdSql.Data.Firebird.dll
++-r:FirebirdSql.Data.Firebird
+
+ ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoQuery
+
+--- ../monodevelop-0.9/Extras/MonoQuery/Mono.Data.Sql/Makefile.in 2005-11-23 21:45:18.000000000 +0100
++++ monodevelop-0.9/Extras/MonoQuery/Mono.Data.Sql/Makefile.in 2006-03-19 19:37:23.302359624 +0100
+@@ -282,7 +282,7 @@
+ -r:Mono.Data.SqliteClient \
+ -r:System.Data.OracleClient \
+ -r:Mono.Data.SybaseClient \
+--r:$(top_srcdir)/contrib/FirebirdSql.Data.Firebird.dll
++-r:FirebirdSql.Data.Firebird
+
+ ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoQuery
+ DLL = $(ADDIN_BUILD)/Mono.Data.Sql.dll
+
+--- ../monodevelop-0.9/contrib/Makefile.am 2005-09-23 22:11:15.000000000 +0200
++++ monodevelop-0.9/contrib/Makefile.am 2006-03-19 19:40:43.207969352 +0100
+@@ -1,34 +1,17 @@
+
+ BINDIR=$(top_builddir)/build/bin
+-LOG4NET_DLL=log4net.dll
+-LOG4NET = $(BINDIR)/$(LOG4NET_DLL)
+ CECIL_DLL=Mono.Cecil.dll
+ CECIL = $(BINDIR)/$(CECIL_DLL)
+
+-# We need to copy Firebird to the same directory as where
+-# mono.data.sql builds. otherwise, mono.data.sql cant find the
+-# firebird provider when monoquery links against mono.data.sql.
+-FIREBIRDDIR=$(top_builddir)/build/AddIns/MonoQuery
+-FIREBIRD_DLL=FirebirdSql.Data.Firebird.dll
+-FIREBIRD = $(FIREBIRDDIR)/$(FIREBIRD_DLL)
+-
+-all: $(LOG4NET) $(CECIL) $(FIREBIRD)
+-
+-$(LOG4NET): $(srcdir)/$(LOG4NET_DLL)
+- mkdir -p $(BINDIR)
+- cp $(srcdir)/$(LOG4NET_DLL) $(LOG4NET)
++all: $(CECIL)
+
+ $(CECIL): $(srcdir)/$(CECIL_DLL)
+ mkdir -p $(BINDIR)
+ cp $(srcdir)/$(CECIL_DLL) $(CECIL)
+
+-$(FIREBIRD): $(srcdir)/$(FIREBIRD_DLL)
+- mkdir -p $(FIREBIRDDIR)
+- cp $(srcdir)/$(FIREBIRD_DLL) $(FIREBIRD)
+-
+ assemblydir = $(MD_ASSEMBLY_DIR)
+-assembly_DATA = $(LOG4NET) $(CECIL) $(FIREBIRD)
++assembly_DATA = $(CECIL)
+
+-CLEANFILES = $(LOG4NET) $(CECIL) $(FIREBIRD)
+-EXTRA_DIST = $(LOG4NET_DLL) $(CECIL_DLL) $(FIREBIRD_DLL)
++CLEANFILES = $(CECIL)
++EXTRA_DIST = $(CECIL_DLL)
+
+--- ../monodevelop-0.9/contrib/Makefile.in 2005-11-23 21:45:23.000000000 +0100
++++ monodevelop-0.9/contrib/Makefile.in 2006-03-19 19:41:25.750501904 +0100
+@@ -238,21 +238,16 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ BINDIR = $(top_builddir)/build/bin
+-LOG4NET_DLL = log4net.dll
+-LOG4NET = $(BINDIR)/$(LOG4NET_DLL)
+ CECIL_DLL = Mono.Cecil.dll
+ CECIL = $(BINDIR)/$(CECIL_DLL)
+
+ # We need to copy Firebird to the same directory as where
+ # mono.data.sql builds. otherwise, mono.data.sql cant find the
+ # firebird provider when monoquery links against mono.data.sql.
+-FIREBIRDDIR = $(top_builddir)/build/AddIns/MonoQuery
+-FIREBIRD_DLL = FirebirdSql.Data.Firebird.dll
+-FIREBIRD = $(FIREBIRDDIR)/$(FIREBIRD_DLL)
+ assemblydir = $(MD_ASSEMBLY_DIR)
+-assembly_DATA = $(LOG4NET) $(CECIL) $(FIREBIRD)
+-CLEANFILES = $(LOG4NET) $(CECIL) $(FIREBIRD)
+-EXTRA_DIST = $(LOG4NET_DLL) $(CECIL_DLL) $(FIREBIRD_DLL)
++assembly_DATA = $(CECIL)
++CLEANFILES = $(CECIL)
++EXTRA_DIST = $(CECIL_DLL)
+ all: all-am
+
+ .SUFFIXES:
+@@ -426,19 +421,12 @@
+ uninstall-info-am
+
+
+-all: $(LOG4NET) $(CECIL) $(FIREBIRD)
+-
+-$(LOG4NET): $(srcdir)/$(LOG4NET_DLL)
+- mkdir -p $(BINDIR)
+- cp $(srcdir)/$(LOG4NET_DLL) $(LOG4NET)
++all: $(CECIL)
+
+ $(CECIL): $(srcdir)/$(CECIL_DLL)
+ mkdir -p $(BINDIR)
+ cp $(srcdir)/$(CECIL_DLL) $(CECIL)
+
+-$(FIREBIRD): $(srcdir)/$(FIREBIRD_DLL)
+- mkdir -p $(FIREBIRDDIR)
+- cp $(srcdir)/$(FIREBIRD_DLL) $(FIREBIRD)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Property changes on: non-group/monodevelop/trunk/debian/patches/use_real_log4net_and_firebird.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: non-group/monodevelop/trunk/debian/rules
===================================================================
--- non-group/monodevelop/trunk/debian/rules 2006-04-10 17:55:49 UTC (rev 2419)
+++ non-group/monodevelop/trunk/debian/rules 2006-04-10 22:07:17 UTC (rev 2420)
@@ -13,13 +13,14 @@
--disable-update-mimedb --disable-update-desktopdb \
--enable-boo --enable-java --enable-nunit --enable-versioncontrol \
--disable-monoextensions
- # debugger is not ready yet, needs mono from SVN
+ # debugger is not ready yet, monodevelop 0.10 maybe?
# --enable-debugger
touch configure-stamp
build: build-stamp
build-stamp: configure-stamp
dh_testdir
+ mkdir -p build/AddIns
$(MAKE) RUNTIME=/usr/bin/cli
touch build-stamp
@@ -49,18 +50,15 @@
dh_link
dh_install
# remove boo files (shipped in monodevelop-boo)
- rm -f debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/Boo*
- rm -f debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/templates/Boo*
- rm -f debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/templates/EmptyBoo*
+ rm debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/Boo*
# remove java files (shipped in monodevelop-java)
- rm -f debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/Java*
- rm -f debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/templates/Java*
- rm -f debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/templates/EmptyJava*
- rm -f debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/templates/Ikvm*
+ rm debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/Java*
# remove nunit files (shipped in monodevelop-nunit)
- rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/NUnit
+ rm -r debian/monodevelop/usr/lib/monodevelop/AddIns/NUnit/
# remove versioncontrol files (shipped in monodevelop-versioncontrol)
- rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/VersionControl
+ rm -r debian/monodevelop/usr/lib/monodevelop/AddIns/VersionControl/
+ # remove query files (shipped in monodevelop-query)
+ rm -r debian/monodevelop/usr/lib/monodevelop/AddIns/MonoQuery/
cp $(CURDIR)/ChangeLog $(CURDIR)/changelog
dh_installchangelogs
dh_installdocs
More information about the Pkg-mono-svn-commits
mailing list