[Pkg-cli-apps-commits] r3648 - in /packages/monodevelop/trunk/debian: ./ patches/
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Sun Dec 30 16:57:25 UTC 2007
Author: meebey
Date: Sun Dec 30 16:57:25 2007
New Revision: 3648
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3648
Log:
monodevelop 0.18.1-1 release
Added:
packages/monodevelop/trunk/debian/MonoDevelop.Gettext.dll.config
packages/monodevelop/trunk/debian/MonoDevelop.SourceEditor.dll.config
packages/monodevelop/trunk/debian/patches/link_system_nunit2.2.6.dpatch
- copied, changed from r3588, packages/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch
packages/monodevelop/trunk/debian/patches/update_templates_for_gtk-sharp_2.10.dpatch
- copied, changed from r3588, packages/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.8.x.dpatch
packages/monodevelop/trunk/debian/update_src_for_link_system_libs.sh
- copied, changed from r3588, packages/monodevelop/trunk/debian/update_src_for_use_real_libs.sh
packages/monodevelop/trunk/debian/update_src_for_link_system_nunit2.2.6.sh (with props)
packages/monodevelop/trunk/debian/update_src_templates_for_gtk-sharp_2.10.sh (with props)
Removed:
packages/monodevelop/trunk/debian/monodevelop-boo.install
packages/monodevelop/trunk/debian/monodevelop-java.install
packages/monodevelop/trunk/debian/monodevelop-query.install
packages/monodevelop/trunk/debian/patches/fix_dllmaps.dpatch
packages/monodevelop/trunk/debian/patches/fix_registering_2.0_system_assemblies.dpatch
packages/monodevelop/trunk/debian/patches/mono-addins0.2_forwardport.dpatch
packages/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.8.x.dpatch
packages/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch
packages/monodevelop/trunk/debian/patches/use_real_libs.dpatch
packages/monodevelop/trunk/debian/update_src_for_use_real_libs.sh
Modified:
packages/monodevelop/trunk/debian/NEWS
packages/monodevelop/trunk/debian/changelog
packages/monodevelop/trunk/debian/control
packages/monodevelop/trunk/debian/monodevelop.menu
packages/monodevelop/trunk/debian/patches/00list
packages/monodevelop/trunk/debian/patches/glade_wrong_file_extension.dpatch
packages/monodevelop/trunk/debian/patches/use_libapr1.dpatch
packages/monodevelop/trunk/debian/patches/use_libsvn1.dpatch
packages/monodevelop/trunk/debian/rules
Added: packages/monodevelop/trunk/debian/MonoDevelop.Gettext.dll.config
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/MonoDevelop.Gettext.dll.config?rev=3648&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/MonoDevelop.Gettext.dll.config (added)
+++ packages/monodevelop/trunk/debian/MonoDevelop.Gettext.dll.config Sun Dec 30 16:57:25 2007
@@ -1,0 +1,3 @@
+<configuration>
+ <dllmap dll="libgtkspell" target="libgtkspell.so.0"/>
+</configuration>
Added: packages/monodevelop/trunk/debian/MonoDevelop.SourceEditor.dll.config
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/MonoDevelop.SourceEditor.dll.config?rev=3648&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/MonoDevelop.SourceEditor.dll.config (added)
+++ packages/monodevelop/trunk/debian/MonoDevelop.SourceEditor.dll.config Sun Dec 30 16:57:25 2007
@@ -1,0 +1,5 @@
+<configuration>
+ <dllmap dll="libglibsharpglue-2.so" target="/usr/lib/mono/gtk-sharp-2.0/libglibsharpglue-2.so"/>
+ <dllmap dll="libglib-2.0.so" target="libglib-2.0.so.0"/>
+ <dllmap dll="gtksourceview-1.0" target="libgtksourceview-1.0.so.0"/>
+</configuration>
Modified: packages/monodevelop/trunk/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/NEWS?rev=3648&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/NEWS (original)
+++ packages/monodevelop/trunk/debian/NEWS Sun Dec 30 16:57:25 2007
@@ -1,3 +1,24 @@
+monodevelop (0.18.1-1) unstable; urgency=low
+
+ * Upgrading MonoDevelop 0.14 to 0.18.1 is not updating the addins database
+ correctly resulting in a crash with the folling console output:
+
+ Add-in error (MonoDevelop.Core,0.18.0): Add-in could not be loaded: Could
+ not read add-in file: $HOME/.config/MonoDevelop/addin-db-001/addin-data/1/
+ MonoDevelop.Core,0.18.0.maddin
+ ...
+ Unhandled Exception: System.InvalidOperationException: Could not read
+ add-in description
+
+ You can fix this issue by running (at least that worked for me):
+ mdtool setup reg-build
+
+ If you are still getting that InvalidOperationException, then you can try
+ to delete the addin database (monodevelop will rebuild it then) using:
+ rm -r ~/.config/MonoDevelop/addin-db-*/
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 30 Dec 2007 16:49:19 +0100
+
monodevelop (0.7-2) unstable; urgency=low
* The 0.7 release of MonoDevelop has some major changes:
Modified: packages/monodevelop/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/changelog?rev=3648&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/changelog (original)
+++ packages/monodevelop/trunk/debian/changelog Sun Dec 30 16:57:25 2007
@@ -1,3 +1,55 @@
+monodevelop (0.18.1-1) unstable; urgency=low
+
+ * The "With a lot of Love: Merry Christmas!" release
+ * DFSG version of MonoDevelop 0.18.1
+ (deleted all pre-compiled binaries from the tarball)
+ + For the record here a list of the deleted files:
+ src/addins/NUnit/lib/nunit.core.dll
+ src/addins/NUnit/lib/nunit.framework.dll
+ * New upstream release
+ + Upstream split MonoDevelop into 4 tarballs:
+ - monodevelop
+ - monodevelop-boo
+ - monodevelop-database
+ - monodevelop-java
+ thus we split up the monodevelop source package into 4 pieces too.
+ * debian/rules:
+ + Enabled C/C++ project support and GNOME platform support in configure
+ call.
+ * debian/control:
+ + Added C and C++ to package descriptions.
+ + Changed suggests monodevelop-query to monodevelop-database.
+ * debian/control
+ debian/monodevelop-boo.install
+ debian/monodevelop-java.install
+ debian/monodevelop-query.install:
+ + Removed monodevelop-boo, monodevelop-java and monodevelop-query packages.
+ * debian/patches/use_nunit2.2.dpatch:
+ + Updated and renamed to link_system_nunit2.2.6.dpatch
+ * debian/patches/use_real_libs.dpatch:
+ + Dropped, the only lib that is included is Mono.Cecil(.Mdb), which is
+ has no public releases and is bundled in source form.
+ * debian/patches/use_libsvn1.dpatch
+ debian/patches/use_libapr1.dpatch:
+ + Updated
+ * debian/patches/update_templates_for_gtk_sharp_2.8.x.dpatch:
+ + Updated and renamed to update_templates_for_gtk-sharp_2.10.dpatch
+ * debian/patches/fix_registering_2.0_system_assemblies.dpatch:
+ + Dropped, unneeded as MonoDevelop runs on a CLI 2.0 runtime, and thus it
+ must be present.
+ * debian/patches/fix_dllmaps.dpatch:
+ + Dropped, upstream doesn't ship a dllmap anymore, thus we need to provide
+ it completly.
+ * debian/MonoDevelop.Gettext.dll.config
+ debian/MonoDevelop.SourceEditor.dll.config:
+ + Added dllmaps so MonoDevelop uses the right libraries at runtime.
+ * debian/patches/mono-addins0.2_forwardport.dpatch:
+ + Dropped, already applied upstream.
+ * debian/monodevelop.menu:
+ + Updated, Apps -> Applications
+
+ -- Mirco Bauer <meebey at debian.org> Tue, 25 Dec 2007 18:58:51 +0100
+
monodevelop (0.14+dfsg-3) unstable; urgency=low
* Added desktop-file-utils to build dependencies. (Closes. #443778)
Modified: packages/monodevelop/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/control?rev=3648&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/control (original)
+++ packages/monodevelop/trunk/debian/control Sun Dec 30 16:57:25 2007
@@ -3,46 +3,29 @@
Priority: optional
Maintainer: Mirco Bauer <meebey at debian.org>
Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gmcs (>= 1.1.10) | c-sharp-2.0-compiler, libmono-dev (>= 1.1.10), boo (>= 0.7.6.2237-6), ikvm (>= 0.10), monodoc-base (>= 1.1.9), intltool, gtk-sharp2-gapi (>= 2.4.0), libgtk2.0-cil (>= 2.4.0), libmono-cairo2.0-cil, 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.6-cil, libmono-system-runtime2.0-cil, libmono-oracle2.0-cil, libmono-bytefx0.7.6.2-cil, libmono-npgsql2.0-cil, libmono-sqlite2.0-cil, libmono-cecil0.5-cil, liblog4net1.2-cil, libmono-firebirdsql1.7-cil, libmono-addins0.2-cil, libmono-addins-gui0.2-cil, libmetacity-dev, libsvn-dev, libapr1-dev, stetic (>= 0.1.0~svn.81552), mono-xsp, mono-xsp2, desktop-file-utils
-Standards-Version: 3.7.2
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gmcs (>= 1.1.10) | c-sharp-2.0-compiler, libmono-dev (>= 1.1.10), boo (>= 0.7.6.2237-6), ikvm (>= 0.10), monodoc-base (>= 1.1.9), intltool, gtk-sharp2-gapi (>= 2.8), libgtk2.0-cil (>= 2.8), libmono-cairo2.0-cil, 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.6-cil, libmono-system-runtime2.0-cil, libmono-oracle2.0-cil, libmono-bytefx0.7.6.2-cil, libmono-npgsql2.0-cil, libmono-sqlite2.0-cil, libmono-cecil0.5-cil, liblog4net1.2-cil, libmono-firebirdsql1.7-cil, libmono-addins0.2-cil (>= 0.3), libmono-addins-gui0.2-cil (>= 0.3), libmetacity-dev, libsvn-dev, libapr1-dev, mono-xsp, mono-xsp2, desktop-file-utils
+Standards-Version: 3.7.3
Package: monodevelop
Architecture: all
-Suggests: monodevelop-boo, monodevelop-java, monodevelop-nunit, monodevelop-versioncontrol, monodevelop-query, nemerle, mono-gmcs, mono-xsp, mono-xsp2
+Suggests: monodevelop-boo, monodevelop-java, monodevelop-nunit, monodevelop-versioncontrol, monodevelop-database, nemerle, mono-xsp, mono-xsp2
+Recommends: mono-gmcs | mono-mcs,
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/ASP.NET Development Environment
- MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
+Description: C/C++/C#/Boo/Java/Nemerle/ILasm/ASP.NET Development Environment
+ MonoDevelop is a GNOME IDE primarily designed for C# and other CLI (.NET)
languages.
.
Features: Debugger Integration, Class Browser, Monodoc Integration,
- Code Completion, Embedded HTML viewer, Gettext support, Boo project support,
- Java project support, Nemerle project support, ILAsm project support,
- ASP.NET project support.
-
-Package: monodevelop-boo
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, monodevelop (= ${source:Version})
-Description: Boo plugin for MonoDevelop
- MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
- languages.
- .
- This package enables Boo integration for MonoDevelop.
-
-Package: monodevelop-java
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, monodevelop (= ${source:Version}), ikvm (>= 0.10)
-Description: Java plugin for MonoDevelop
- MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
- languages.
- .
- This package enables Java integration for MonoDevelop.
+ Code Completion, Embedded HTML viewer, Gettext support, C/C++ project support,
+ C# project support, Boo project support, Java project support, Nemerle project
+ support, ILAsm project support, ASP.NET project support.
Package: monodevelop-nunit
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, monodevelop (= ${source:Version})
Description: NUnit plugin for MonoDevelop
- MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
+ MonoDevelop is a GNOME IDE primarily designed for C# and other CLI (.NET)
languages.
.
This package enables NUnit integration for MonoDevelop.
@@ -52,18 +35,8 @@
Replaces: monodevelop (<< 0.13.1)
Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, monodevelop (= ${source:Version})
Description: VersionControl plugin for MonoDevelop
- MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
+ MonoDevelop is a GNOME IDE primarily designed for C# and other CLI (.NET)
languages.
.
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: packages/monodevelop/trunk/debian/monodevelop.menu
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/monodevelop.menu?rev=3648&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/monodevelop.menu (original)
+++ packages/monodevelop/trunk/debian/monodevelop.menu Sun Dec 30 16:57:25 2007
@@ -1,3 +1,3 @@
-?package(monodevelop):needs="X11" section="Apps/Programming"\
+?package(monodevelop):needs="X11" section="Applications/Programming"\
title="MonoDevelop" command="/usr/bin/monodevelop"\
icon="/usr/share/pixmaps/monodevelop.png"
Modified: packages/monodevelop/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/00list?rev=3648&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/00list (original)
+++ packages/monodevelop/trunk/debian/patches/00list Sun Dec 30 16:57:25 2007
@@ -1,15 +1,7 @@
-use_nunit2.2
-use_real_libs
+link_system_nunit2.2.6
use_libsvn1
use_libapr1
#use_x-terminal-emulator
-update_templates_for_gtk_sharp_2.8.x
+update_templates_for_gtk-sharp_2.10
boo_mimetype
-glade_wrong_file_extension
-#use_xulrunner
-fix_registering_2.0_system_assemblies
-#libstetic-dllmap
-#fix_aspnetedit_build_system
-fix_dllmaps
-mono-addins0.2_forwardport
-cecil_0.5_backport
+#glade_wrong_file_extension
Modified: packages/monodevelop/trunk/debian/patches/glade_wrong_file_extension.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/glade_wrong_file_extension.dpatch?rev=3648&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/glade_wrong_file_extension.dpatch (original)
+++ packages/monodevelop/trunk/debian/patches/glade_wrong_file_extension.dpatch Sun Dec 30 16:57:25 2007
@@ -1,10 +1,10 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
@DPATCH@
-
---- monodevelop-0.10/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs.old 2006-04-13 15:48:14.088000000 +0200
-+++ monodevelop-0.10/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs 2006-04-13 15:48:23.776000000 +0200
-@@ -102,7 +102,7 @@
+diff -urNad monodevelop-0.18.1+dfsg~/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs monodevelop-0.18.1+dfsg/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
+--- monodevelop-0.18.1+dfsg~/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs 2007-12-20 20:05:11.000000000 +0100
++++ monodevelop-0.18.1+dfsg/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs 2007-12-25 19:11:49.000000000 +0100
+@@ -113,7 +113,7 @@
throw new InvalidOperationException ("Only single-file templates can be used to generate resource files");
try {
@@ -13,4 +13,3 @@
ProjectFile resource = new ProjectFile (fileName);
resource.BuildAction = BuildAction.EmbedAsResource;
-
Copied: packages/monodevelop/trunk/debian/patches/link_system_nunit2.2.6.dpatch (from r3588, packages/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch)
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/link_system_nunit2.2.6.dpatch?rev=3648&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch (original)
+++ packages/monodevelop/trunk/debian/patches/link_system_nunit2.2.6.dpatch Sun Dec 30 16:57:25 2007
@@ -5,57 +5,81 @@
## DP: No description.
@DPATCH@
-diff -urNad monodevelop-0.14~/Extras/NUnit/Makefile.am monodevelop-0.14/Extras/NUnit/Makefile.am
---- monodevelop-0.14~/Extras/NUnit/Makefile.am 2007-07-07 15:46:07.000000000 +0200
-+++ monodevelop-0.14/Extras/NUnit/Makefile.am 2007-07-07 15:46:52.000000000 +0200
-@@ -11,8 +11,7 @@
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
- -r:$(top_srcdir)/contrib/Mono.Addins.dll \
-- -r:$(top_srcdir)/Extras/NUnit/lib/nunit.core.dll \
-- -r:$(top_srcdir)/Extras/NUnit/lib/nunit.framework.dll \
+diff -urNad monodevelop-0.18.1+dfsg~/src/addins/NUnit/Makefile.am monodevelop-0.18.1+dfsg/src/addins/NUnit/Makefile.am
+--- monodevelop-0.18.1+dfsg~/src/addins/NUnit/Makefile.am 2007-12-25 20:06:18.000000000 +0100
++++ monodevelop-0.18.1+dfsg/src/addins/NUnit/Makefile.am 2007-12-25 20:06:53.000000000 +0100
+@@ -10,8 +10,8 @@
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
++ $(shell pkg-config --libs nunit) \
+ $(shell pkg-config --libs nunit) \
-r:System \
-r:System.Xml
-@@ -69,9 +68,7 @@
- templates/NUnitTestClass.xft.xml
+@@ -78,7 +78,7 @@
+ SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
+ BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
+
+-all: $(ASSEMBLY) $(BUILD_NUNIT_FILES)
++all: $(ASSEMBLY)
+
+ $(ADDIN_BUILD)/%: $(srcdir)/lib/%
+ mkdir -p $(ADDIN_BUILD)
+@@ -90,9 +90,9 @@
--NUNIT_FILES = \
--nunit.core.dll \
--nunit.framework.dll
-+NUNIT_FILES =
+ assemblydir = $(MD_ADDIN_DIR)/NUnit
+-assembly_DATA = $(ASSEMBLY) $(SRC_NUNIT_FILES)
++assembly_DATA = $(ASSEMBLY)
- SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
- BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
-diff -urNad monodevelop-0.14~/Extras/NUnit/Makefile.in monodevelop-0.14/Extras/NUnit/Makefile.in
---- monodevelop-0.14~/Extras/NUnit/Makefile.in 2007-07-07 15:46:07.000000000 +0200
-+++ monodevelop-0.14/Extras/NUnit/Makefile.in 2007-07-07 15:46:58.000000000 +0200
-@@ -287,8 +287,7 @@
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
- -r:$(top_srcdir)/contrib/Mono.Addins.dll \
-- -r:$(top_srcdir)/Extras/NUnit/lib/nunit.core.dll \
-- -r:$(top_srcdir)/Extras/NUnit/lib/nunit.framework.dll \
+-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
+-EXTRA_DIST = $(FILES) $(RES) $(SRC_NUNIT_FILES)
++CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
++EXTRA_DIST = $(FILES) $(RES)
+
+ include $(top_srcdir)/Makefile.include
+diff -urNad monodevelop-0.18.1+dfsg~/src/addins/NUnit/Makefile.in monodevelop-0.18.1+dfsg/src/addins/NUnit/Makefile.in
+--- monodevelop-0.18.1+dfsg~/src/addins/NUnit/Makefile.in 2007-12-25 20:06:18.000000000 +0100
++++ monodevelop-0.18.1+dfsg/src/addins/NUnit/Makefile.in 2007-12-25 20:07:34.000000000 +0100
+@@ -249,8 +249,8 @@
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
++ $(shell pkg-config --libs nunit) \
+ $(shell pkg-config --libs nunit) \
-r:System \
-r:System.Xml
-@@ -344,9 +343,7 @@
- templates/NUnitProject.xpt.xml \
- templates/NUnitTestClass.xft.xml
-
--NUNIT_FILES = \
--nunit.core.dll \
--nunit.framework.dll
-+NUNIT_FILES =
-
+@@ -316,9 +316,9 @@
SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
-diff -urNad monodevelop-0.14~/Extras/NUnit/MonoDevelopNUnit.addin.xml monodevelop-0.14/Extras/NUnit/MonoDevelopNUnit.addin.xml
---- monodevelop-0.14~/Extras/NUnit/MonoDevelopNUnit.addin.xml 2007-07-07 15:46:07.000000000 +0200
-+++ monodevelop-0.14/Extras/NUnit/MonoDevelopNUnit.addin.xml 2007-07-07 15:46:22.000000000 +0200
+ assemblydir = $(MD_ADDIN_DIR)/NUnit
+-assembly_DATA = $(ASSEMBLY) $(SRC_NUNIT_FILES)
+-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
+-EXTRA_DIST = $(FILES) $(RES) $(SRC_NUNIT_FILES)
++assembly_DATA = $(ASSEMBLY)
++CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
++EXTRA_DIST = $(FILES) $(RES)
+ build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES)
+ build_resources = $(addprefix $(srcdir)/, $(RES))
+ build_test_sources = $(addprefix $(srcdir)/, $(TESTFILES)) $(GENERATED_FILES)
+@@ -504,7 +504,7 @@
+ pdf-am ps ps-am uninstall uninstall-am uninstall-assemblyDATA
+
+
+-all: $(ASSEMBLY) $(BUILD_NUNIT_FILES)
++all: $(ASSEMBLY)
+
+ $(ADDIN_BUILD)/%: $(srcdir)/lib/%
+ mkdir -p $(ADDIN_BUILD)
+diff -urNad monodevelop-0.18.1+dfsg~/src/addins/NUnit/MonoDevelopNUnit.addin.xml monodevelop-0.18.1+dfsg/src/addins/NUnit/MonoDevelopNUnit.addin.xml
+--- monodevelop-0.18.1+dfsg~/src/addins/NUnit/MonoDevelopNUnit.addin.xml 2007-12-25 20:06:18.000000000 +0100
++++ monodevelop-0.18.1+dfsg/src/addins/NUnit/MonoDevelopNUnit.addin.xml 2007-12-25 20:06:26.000000000 +0100
@@ -10,8 +10,6 @@
<Runtime>
Copied: packages/monodevelop/trunk/debian/patches/update_templates_for_gtk-sharp_2.10.dpatch (from r3588, packages/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.8.x.dpatch)
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/update_templates_for_gtk-sharp_2.10.dpatch?rev=3648&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/update_templates_for_gtk_sharp_2.8.x.dpatch (original)
+++ packages/monodevelop/trunk/debian/patches/update_templates_for_gtk-sharp_2.10.dpatch Sun Dec 30 16:57:25 2007
@@ -1,24 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
@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
+diff -urNad monodevelop-0.18.1+dfsg~/src/addins/CSharpBinding/templates/GladeSharp2Project.xpt.xml monodevelop-0.18.1+dfsg/src/addins/CSharpBinding/templates/GladeSharp2Project.xpt.xml
+--- monodevelop-0.18.1+dfsg~/src/addins/CSharpBinding/templates/GladeSharp2Project.xpt.xml 2007-12-20 20:04:58.000000000 +0100
++++ monodevelop-0.18.1+dfsg/src/addins/CSharpBinding/templates/GladeSharp2Project.xpt.xml 2007-12-25 19:07:05.000000000 +0100
@@ -28,11 +28,11 @@
<References>
@@ -28,17 +13,17 @@
- <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" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.10.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
+diff -urNad monodevelop-0.18.1+dfsg~/src/addins/CSharpBinding/templates/GnomeSharp2Project.xpt.xml monodevelop-0.18.1+dfsg/src/addins/CSharpBinding/templates/GnomeSharp2Project.xpt.xml
+--- monodevelop-0.18.1+dfsg~/src/addins/CSharpBinding/templates/GnomeSharp2Project.xpt.xml 2007-12-20 20:04:58.000000000 +0100
++++ monodevelop-0.18.1+dfsg/src/addins/CSharpBinding/templates/GnomeSharp2Project.xpt.xml 2007-12-25 19:07:05.000000000 +0100
@@ -28,12 +28,12 @@
<References>
@@ -49,18 +34,18 @@
- <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" />
++ <Reference type="Gac" refto="gnome-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.10.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
+diff -urNad monodevelop-0.18.1+dfsg~/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml monodevelop-0.18.1+dfsg/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml
+--- monodevelop-0.18.1+dfsg~/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2007-12-20 20:04:58.000000000 +0100
++++ monodevelop-0.18.1+dfsg/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2007-12-25 19:07:05.000000000 +0100
@@ -28,11 +28,11 @@
<References>
@@ -70,99 +55,17 @@
- <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" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.10.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
+diff -urNad monodevelop-0.18.1+dfsg~/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml monodevelop-0.18.1+dfsg/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml
+--- monodevelop-0.18.1+dfsg~/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2007-12-20 20:04:56.000000000 +0100
++++ monodevelop-0.18.1+dfsg/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2007-12-25 19:07:05.000000000 +0100
@@ -27,11 +27,11 @@
<Options/>
@@ -172,11 +75,11 @@
- <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" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</References>
<Files>
Modified: packages/monodevelop/trunk/debian/patches/use_libapr1.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/use_libapr1.dpatch?rev=3648&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/use_libapr1.dpatch (original)
+++ packages/monodevelop/trunk/debian/patches/use_libapr1.dpatch Sun Dec 30 16:57:25 2007
@@ -5,21 +5,26 @@
## DP: No description.
@DPATCH@
-diff -urNad monodevelop-0.14~/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs monodevelop-0.14/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs
---- monodevelop-0.14~/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs 2007-06-12 01:11:00.000000000 +0200
-+++ monodevelop-0.14/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs 2007-07-07 14:36:01.000000000 +0200
-@@ -13,10 +13,6 @@
-
- public static LibApr GetLib ()
+diff -urNad monodevelop-0.18.1+dfsg~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs monodevelop-0.18.1+dfsg/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs
+--- monodevelop-0.18.1+dfsg~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs 2007-12-20 20:04:42.000000000 +0100
++++ monodevelop-0.18.1+dfsg/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs 2007-12-25 18:56:29.000000000 +0100
+@@ -14,15 +14,6 @@
+ public static LibApr GetLib (int ver)
{
-- try {
-- return new LibApr0 ();
-- } catch {}
--
- return new LibApr1 ();
- }
-
-@@ -52,37 +48,6 @@
+ try {
+- if (ver == 0)
+- return new LibApr0 ();
+- else if (ver == 1)
+- return new LibApr1 ();
+-
+- try {
+- return new LibApr0 ();
+- } catch {}
+-
+ return new LibApr1 ();
+ }
+ catch {
+@@ -63,37 +54,6 @@
public const int APR_OS_START_USEERR = APR_OS_START_USERERR;
}
Modified: packages/monodevelop/trunk/debian/patches/use_libsvn1.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/use_libsvn1.dpatch?rev=3648&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/use_libsvn1.dpatch (original)
+++ packages/monodevelop/trunk/debian/patches/use_libsvn1.dpatch Sun Dec 30 16:57:25 2007
@@ -5,30 +5,45 @@
## DP: No description.
@DPATCH@
-diff -urNad monodevelop-0.14~/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs monodevelop-0.14/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs
---- monodevelop-0.14~/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs 2007-06-12 01:11:00.000000000 +0200
-+++ monodevelop-0.14/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs 2007-07-07 14:31:46.000000000 +0200
-@@ -21,10 +21,6 @@
-
+diff -urNad monodevelop-0.18.1+dfsg~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs monodevelop-0.18.1+dfsg/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs
+--- monodevelop-0.18.1+dfsg~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs 2007-12-20 20:04:42.000000000 +0100
++++ monodevelop-0.18.1+dfsg/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs 2007-12-25 18:54:53.000000000 +0100
+@@ -22,10 +22,6 @@
public static LibSvnClient GetLib ()
{
-- try {
+ try {
- return new LibSvnClient0 ();
- } catch {}
-
- return new LibSvnClient1 ();
- }
-
-@@ -494,273 +490,6 @@
+- try {
+ return new LibSvnClient1 ();
+ } catch {}
+
+@@ -501,291 +497,6 @@
IntPtr baton, IntPtr pool);
}
- public class LibSvnClient0 : LibSvnClient {
- private const string svnclientlib = "libsvn_client-1.so.0";
-
+- public override void config_ensure (string config_dir, IntPtr pool)
+- {
+- svn_config_ensure (config_dir, pool);
+- }
+-
- public override void auth_open (out IntPtr auth_baton, IntPtr providers, IntPtr pool)
- {
- svn_auth_open (out auth_baton, providers, pool);
+- }
+-
+- public override void auth_set_parameter (IntPtr auth_baton, string name, IntPtr value)
+- {
+- svn_auth_set_parameter (auth_baton, name, value);
+- }
+-
+- public override IntPtr auth_get_parameter (IntPtr auth_baton, string name)
+- {
+- return svn_auth_get_parameter (auth_baton, name);
- }
-
- public override void client_get_simple_provider (IntPtr item, IntPtr pool)
@@ -187,10 +202,10 @@
- return svn_client_move (ref commit_info_p, srcPath, ref rev, destPath, force, ctx, pool);
- }
-
-- public override IntPtr client_checkout (out Rev revision, string url, string path, ref Rev rev,
+- public override IntPtr client_checkout (IntPtr result_rev, string url, string path, ref Rev rev,
- int recurse, IntPtr ctx, IntPtr pool)
- {
-- return svn_client_checkout (out revision, url, path, ref rev, recurse, ctx, pool);
+- return svn_client_checkout (result_rev, url, path, ref rev, recurse, ctx, pool);
- }
-
- public override IntPtr client_mkdir2 (ref IntPtr commit_info, IntPtr apr_array_paths, IntPtr ctx, IntPtr pool)
@@ -208,7 +223,10 @@
- no_diff_deleted, outfile, errfile, ctx, pool);
- }
-
+- [DllImport(svnclientlib)] static extern void svn_config_ensure (string config_dir, IntPtr pool);
- [DllImport(svnclientlib)] static extern void svn_auth_open (out IntPtr auth_baton, IntPtr providers, IntPtr pool);
+- [DllImport(svnclientlib)] static extern void svn_auth_set_parameter (IntPtr auth_baton, string name, IntPtr value);
+- [DllImport(svnclientlib)] static extern IntPtr svn_auth_get_parameter (IntPtr auth_baton, string name);
- [DllImport(svnclientlib)] static extern void svn_client_get_simple_provider (IntPtr item, IntPtr pool);
- [DllImport(svnclientlib)] static extern void svn_client_get_simple_prompt_provider (IntPtr item, svn_auth_simple_prompt_func_t prompt_func, IntPtr prompt_batton, [MarshalAs (UnmanagedType.SysInt)] int retry_limit, IntPtr pool);
- [DllImport(svnclientlib)] static extern void svn_client_get_username_provider (IntPtr item, IntPtr pool);
@@ -274,7 +292,7 @@
- [DllImport(svnclientlib)] static extern IntPtr svn_client_move (ref IntPtr commit_info_p, string srcPath, ref Rev rev,
- string destPath, int force, IntPtr ctx, IntPtr pool);
-
-- [DllImport(svnclientlib)] static extern IntPtr svn_client_checkout (out Rev revision, string url, string path, ref Rev rev,
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_checkout (IntPtr result_rev, string url, string path, ref Rev rev,
- int recurse, IntPtr ctx, IntPtr pool);
-
- [DllImport(svnclientlib)] static extern IntPtr svn_client_mkdir2 (ref IntPtr commit_info, IntPtr apr_array_paths, IntPtr ctx, IntPtr pool);
Modified: packages/monodevelop/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/rules?rev=3648&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/rules (original)
+++ packages/monodevelop/trunk/debian/rules Sun Dec 30 16:57:25 2007
@@ -11,25 +11,14 @@
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--disable-update-mimedb --disable-update-desktopdb \
- --enable-boo --enable-java \
- --enable-nunit \
+ --disable-monoextensions \
--enable-versioncontrol --enable-subversion \
- --enable-aspnet \
- --disable-monoextensions \
- BOOC=/usr/bin/booc2
- # needs nemerle >= 0.9.3.99
- # --enable-nemerle
- # needs too buggy libjscall0.0-cil
- # --enable-aspnetedit
- # debugger is not ready yet, monodevelop 0.10 maybe?
- # --enable-debugger
+ --enable-aspnet --enable-gnomeplatform --enable-c
touch configure-stamp
build: configure build-stamp
build-stamp:
dh_testdir
- cp /usr/lib/stetic/libstetic* ./Extras/MonoDevelop.GtkCore/lib/
- mkdir -p build/AddIns
$(MAKE) RUNTIME=/usr/bin/cli
touch build-stamp
@@ -49,6 +38,9 @@
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ # install missing DLL maps
+ cp debian/MonoDevelop.SourceEditor.dll.config debian/tmp/usr/lib/monodevelop/AddIns/
+ cp debian/MonoDevelop.Gettext.dll.config debian/tmp/usr/lib/monodevelop/AddIns/MonoDevelop.Gettext/
chmod -x debian/tmp/usr/share/pixmaps/monodevelop.png
binary-indep: build install
@@ -56,18 +48,12 @@
dh_testroot
dh_link
dh_install
- # remove boo files (shipped in monodevelop-boo)
- rm debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/Boo*
- # remove java files (shipped in monodevelop-java)
- rm debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/Java*
# remove nunit files (shipped in monodevelop-nunit)
rm -r debian/monodevelop/usr/lib/monodevelop/AddIns/NUnit/
# remove versioncontrol files (shipped in monodevelop-versioncontrol)
rm -r debian/monodevelop/usr/lib/monodevelop/AddIns/VersionControl/
# remove ChangeLogAddIn files (shipped in monodevelop-versioncontrol)
rm -r debian/monodevelop/usr/lib/monodevelop/AddIns/ChangeLogAddIn/
- # 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
Copied: packages/monodevelop/trunk/debian/update_src_for_link_system_libs.sh (from r3588, packages/monodevelop/trunk/debian/update_src_for_use_real_libs.sh)
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/update_src_for_link_system_libs.sh?rev=3648&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/update_src_for_use_real_libs.sh (original)
+++ packages/monodevelop/trunk/debian/update_src_for_link_system_libs.sh Sun Dec 30 16:57:25 2007
@@ -1,7 +1,17 @@
#!/bin/sh
-find . \( -name "*.am" -or -name "*.in" \) -exec perl -pe 's!-r\:\$\(top_(src|build)dir\)/(contrib|build/bin)/Mono\.Addins\.(Gui\.|Setup\.)?dll!-r:/usr/lib/cli/mono-addins-0.2/Mono.Addins.${3}dll!g' -i {} \;
+#echo "Updating Mono.Addins references"
+##find . \( -name "*.am" -or -name "*.in" \) -exec perl -pe 's!-r\:\$\(top_(src|build)dir\)/(contrib|build/bin)/Mono\.Addins\.(Gui\.|Setup\.)?dll!-r:/usr/lib/cli/mono-addins-0.2/Mono.Addins.${3}dll!g' -i {} \;
+#find . \( -name "*.am" -or -name "*.in" \) -exec perl -pe 's!-r\:\$\(top_(src|build)dir\)/(contrib|build/bin)/Mono\.Addins\.dll!\$(shell pkg-config --libs mono-addins)!g' -i {} \;
+#find . \( -name "*.am" -or -name "*.in" \) -exec perl -pe 's!-r\:\$\(top_(src|build)dir\)/(contrib|build/bin)/Mono\.Addins\.Gui\.dll!\$(shell pkg-config --libs mono-addins-gui)!g' -i {} \;
+#find . \( -name "*.am" -or -name "*.in" \) -exec perl -pe 's!-r\:\$\(top_(src|build)dir\)/(contrib|build/bin)/Mono\.Addins\.Setup\.dll!\$(shell pkg-config --libs mono-addins-setup)!g' -i {} \;
+echo "Updating Mono.Cecil references"
find . \( -name "*.am" -or -name "*.in" \) -exec perl -pe 's!-r:\$\(top_(src|build)dir\)/(contrib|build/bin)/Mono.Cecil.dll!\$(shell pkg-config --libs mono-cecil)!g' -i {} \;
+find . \( -name "*.am" -or -name "*.in" \) -exec perl -pe 's!-r:\$\(top_(src|build)dir\)/(contrib|build/bin)/Mono.Cecil.Mdb.dll!!g' -i {} \;
-find . \( -name "*.am" -or -name "*.in" \) -exec perl -pe 's!-r:\$\(top_(src|build)dir\)/(contrib|build/bin)/log4net.dll!\$(shell pkg-config --libs log4net)!g' -i {} \;
+#echo "Updating log4net references"
+#find . \( -name "*.am" -or -name "*.in" \) -exec perl -pe 's!-r:\$\(top_(src|build)dir\)/(contrib|build/bin)/log4net.dll!\$(shell pkg-config --libs log4net)!g' -i {} \;
+
+echo "Deleting reject files (*.rej)"
+find -name "*.rej" -delete
Added: packages/monodevelop/trunk/debian/update_src_for_link_system_nunit2.2.6.sh
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/update_src_for_link_system_nunit2.2.6.sh?rev=3648&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/update_src_for_link_system_nunit2.2.6.sh (added)
+++ packages/monodevelop/trunk/debian/update_src_for_link_system_nunit2.2.6.sh Sun Dec 30 16:57:25 2007
@@ -1,0 +1,5 @@
+#!/bin/sh
+
+echo "Updating nunit refereces"
+find . \( -name "*.am" -or -name "*.in" \) -exec perl -pe 's!-r:\$\(top_srcdir\)/src/addins/NUnit/lib/nunit.core.dll!\$(shell pkg-config --libs nunit)!g' -i {} \;
+find . \( -name "*.am" -or -name "*.in" \) -exec perl -pe 's!-r:\$\(top_srcdir\)/src/addins/NUnit/lib/nunit.framework.dll!\$(shell pkg-config --libs nunit)!g' -i {} \;
Propchange: packages/monodevelop/trunk/debian/update_src_for_link_system_nunit2.2.6.sh
------------------------------------------------------------------------------
svn:executable = *
Added: packages/monodevelop/trunk/debian/update_src_templates_for_gtk-sharp_2.10.sh
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/update_src_templates_for_gtk-sharp_2.10.sh?rev=3648&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/update_src_templates_for_gtk-sharp_2.10.sh (added)
+++ packages/monodevelop/trunk/debian/update_src_templates_for_gtk-sharp_2.10.sh Sun Dec 30 16:57:25 2007
@@ -1,0 +1,4 @@
+#!/bin/sh
+
+echo "Updating templates"
+find . -name "*.xpt.xml" -exec perl -pe 's!Version=2.4.0.0!Version=2.10.0.0!g' -i {} \;
Propchange: packages/monodevelop/trunk/debian/update_src_templates_for_gtk-sharp_2.10.sh
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-cli-apps-commits
mailing list