[Pkg-cli-apps-commits] r5095 - in /packages/monodevelop/trunk/debian: ./ patches/
sebner-guest at users.alioth.debian.org
sebner-guest at users.alioth.debian.org
Sat Sep 19 16:49:37 UTC 2009
Author: sebner-guest
Date: Sat Sep 19 16:49:37 2009
New Revision: 5095
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5095
Log:
MD, quilt upload
Added:
packages/monodevelop/trunk/debian/patches/boo_mimetype.patch
packages/monodevelop/trunk/debian/patches/link_system_nunit.patch (with props)
packages/monodevelop/trunk/debian/patches/monodevelop_fix_addin_highlights_r130904.patch (with props)
packages/monodevelop/trunk/debian/patches/series
packages/monodevelop/trunk/debian/patches/update_templates_for_gtk-sharp_2.12.patch (with props)
packages/monodevelop/trunk/debian/patches/use_csc.patch (with props)
packages/monodevelop/trunk/debian/patches/use_libapr1.patch (with props)
packages/monodevelop/trunk/debian/patches/use_libsvn1.patch (with props)
packages/monodevelop/trunk/debian/patches/use_x-terminal-emulator.patch
Modified:
packages/monodevelop/trunk/debian/changelog
packages/monodevelop/trunk/debian/control
packages/monodevelop/trunk/debian/rules
Modified: packages/monodevelop/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/changelog?rev=5095&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/changelog (original)
+++ packages/monodevelop/trunk/debian/changelog Sat Sep 19 16:49:37 2009
@@ -27,12 +27,18 @@
+ Add dependency on libmono-microsoft-build2.0-cil
[ Stefan Ebner ]
- * debian/control:
+ * debian/control:
+ Delete the optional dependency on libgconf2-24-cil
since Ubuntu fixed this issue
- + Bump Standards-Version to 3.8.3
-
- -- Jo Shields <directhex at apebox.org> Fri, 11 Sep 2009 09:31:26 +0100
+ + Bump Standards-Version to 3.8.3
+ + Bump debhelper versioning to >= 7.0.50
+ + Replace dpatch build-dependecy with versioned quilt one
+ * debian/patch:
+ + Convert everything from dpatch to quilt
+ * debian/rules:
+ + Rewrite with new dh7 features (e.g dh_override, --with quilt)
+
+ -- Jo Shields <directhex at apebox.org> Sat, 19 Sep 2009 17:45:49 +0200
monodevelop (2.0+dfsg-2) unstable; urgency=low
Modified: packages/monodevelop/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/control?rev=5095&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/control (original)
+++ packages/monodevelop/trunk/debian/control Sat Sep 19 16:49:37 2009
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~)
Build-Depends-Indep: cli-common-dev (>= 0.5.7),
mono-devel (>= 2.4.2.3),
libmono-dev (>= 1.1.10),
Added: packages/monodevelop/trunk/debian/patches/boo_mimetype.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/boo_mimetype.patch?rev=5095&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/boo_mimetype.patch (added)
+++ packages/monodevelop/trunk/debian/patches/boo_mimetype.patch Sat Sep 19 16:49:37 2009
@@ -1,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- monodevelop-0.10/monodevelop.xml.old 2006-04-13 12:12:05.676000000 +0200
++++ monodevelop-0.10/monodevelop.xml 2006-04-13 12:12:54.376000000 +0200
+@@ -12,6 +12,10 @@
+ <comment xml:lang="en">Nemerle source</comment>
+ <glob pattern="*.n"/>
+ </mime-type>
++ <mime-type type="text/x-boo">
++ <comment xml:lang="en">Boo source</comment>
++ <glob pattern="*.boo"/>
++ </mime-type>
+ <mime-type type="text/x-vb">
+ <comment xml:lang="en">VB source</comment>
+ <glob pattern="*.vb"/>
Added: packages/monodevelop/trunk/debian/patches/link_system_nunit.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/link_system_nunit.patch?rev=5095&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/link_system_nunit.patch (added)
+++ packages/monodevelop/trunk/debian/patches/link_system_nunit.patch Sat Sep 19 16:49:37 2009
@@ -1,0 +1,98 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## link_system_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-2.1.0~/src/addins/NUnit/Makefile.am monodevelop-2.1.0/src/addins/NUnit/Makefile.am
+--- monodevelop-2.1.0~/src/addins/NUnit/Makefile.am 2009-09-11 09:35:08.628794292 +0100
++++ monodevelop-2.1.0/src/addins/NUnit/Makefile.am 2009-09-11 09:37:57.567794632 +0100
+@@ -16,10 +16,7 @@
+ $(GLIB_SHARP_LIBS) \
+ $(GTK_SHARP_LIBS) \
+ $(MONO_ADDINS_LIBS) \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.interfaces.dll \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.util.dll \
++ $(shell pkg-config --libs nunit) \
+ -r:Mono.Cairo \
+ -r:Mono.Posix \
+ -r:System \
+@@ -86,16 +83,7 @@
+ templates/NUnitTestClass.xft.xml
+
+
+-NUNIT_FILES = \
+-nunit.core.dll \
+-nunit.framework.dll \
+-nunit.core.interfaces.dll \
+-nunit.util.dll
+-
+-SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
+-BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
+-
+-all: $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
++all: $(ASSEMBLY) $(ASSEMBLY).mdb
+
+ $(ADDIN_BUILD)/%: $(srcdir)/lib/%
+ mkdir -p $(ADDIN_BUILD)
+@@ -108,9 +96,9 @@
+ $(ASSEMBLY).mdb: $(ASSEMBLY)
+
+ assemblydir = $(MD_ADDIN_DIR)/NUnit
+-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(SRC_NUNIT_FILES)
++assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
+
+-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-2.1.0~/src/addins/NUnit/MonoDevelopNUnit.addin.xml monodevelop-2.1.0/src/addins/NUnit/MonoDevelopNUnit.addin.xml
+--- monodevelop-2.1.0~/src/addins/NUnit/MonoDevelopNUnit.addin.xml 2009-09-11 09:35:08.628794292 +0100
++++ monodevelop-2.1.0/src/addins/NUnit/MonoDevelopNUnit.addin.xml 2009-09-11 09:38:41.715795575 +0100
+@@ -10,10 +10,6 @@
+
+ <Runtime>
+ <Import assembly="MonoDevelop.NUnit.dll" />
+- <Import assembly="nunit.core.dll" />
+- <Import assembly="nunit.core.interfaces.dll" />
+- <Import assembly="nunit.framework.dll" />
+- <Import assembly="nunit.util.dll" />
+ </Runtime>
+
+ <Dependencies>
+@@ -67,16 +63,6 @@
+
+ <!-- Extensions -->
+
+- <Extension path="/MonoDevelop/Core/SupportPackages">
+- <Condition id="PackageNotInstalled" name="mono-nunit" version="2.4">
+- <Package name="nunit" version="2.4" clrVersion="Default">
+- <Assembly file="nunit.core.dll" />
+- <Assembly file="nunit.core.interfaces.dll" />
+- <Assembly file="nunit.framework.dll" />
+- </Package>
+- </Condition>
+- </Extension>
+-
+ <Extension path = "/MonoDevelop/Ide/Pads">
+ <SolutionPad id = "MonoDevelop.NUnit.TestPad" defaultPlacement = "Left" _label = "Unit Tests" icon = "nunit-pad-icon" class = "MonoDevelop.NUnit.TestPad">
+ <PadOption id = "ShowTestTime" _label = "Show Test Time" defaultValue = "False" />
+diff -urNad monodevelop-2.1.0~/src/addins/NUnit/NUnitRunner/Makefile.am monodevelop-2.1.0/src/addins/NUnit/NUnitRunner/Makefile.am
+--- monodevelop-2.1.0~/src/addins/NUnit/NUnitRunner/Makefile.am 2009-09-11 09:35:08.628794292 +0100
++++ monodevelop-2.1.0/src/addins/NUnit/NUnitRunner/Makefile.am 2009-09-11 09:39:13.959795707 +0100
+@@ -1,9 +1,7 @@
+ FILES = NUnitTestRunner.cs
+
+ REFS = \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.interfaces.dll \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
++ $(shell pkg-config --libs nunit) \
+ -r:System \
+ -r:System.Xml
+
Propchange: packages/monodevelop/trunk/debian/patches/link_system_nunit.patch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/monodevelop/trunk/debian/patches/monodevelop_fix_addin_highlights_r130904.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/monodevelop_fix_addin_highlights_r130904.patch?rev=5095&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/monodevelop_fix_addin_highlights_r130904.patch (added)
+++ packages/monodevelop/trunk/debian/patches/monodevelop_fix_addin_highlights_r130904.patch Sat Sep 19 16:49:37 2009
@@ -1,0 +1,168 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## monodevelop_fix_addin_highlights_r130904.dpatch by Jo Shields <directhex at apebox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport from 2.0 branch to fix highlights (and possible resource leakage
+## DP: in addin highlighing)
+
+ at DPATCH@
+Index: 2.0/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs
+===================================================================
+--- 2.0/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs (revision 130903)
++++ 2.0/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs (revision 130904)
+@@ -46,7 +46,7 @@
+ resource = file = null;
+ }
+
+- public XmlTextReader Open ()
++ public XmlReader Open ()
+ {
+ Stream stream;
+ if (!string.IsNullOrEmpty (file)) {
+@@ -59,9 +59,9 @@
+ throw new InvalidOperationException ("Template file or resource not provided");
+ }
+
+- using (stream) {
+- return new XmlTextReader (stream);
+- }
++ XmlReaderSettings settings = new XmlReaderSettings ();
++ settings.CloseInput = true;
++ return XmlTextReader.Create (stream, settings);
+ }
+ }
+ }
+Index: 2.0/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxModeService.cs
+===================================================================
+--- 2.0/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxModeService.cs (revision 130903)
++++ 2.0/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxModeService.cs (revision 130904)
+@@ -88,7 +88,7 @@
+ {
+ if (!styleLookup.ContainsKey (name))
+ throw new System.ArgumentException ("Style " + name + " not found", "name");
+- XmlTextReader reader = styleLookup [name].Open ();
++ XmlReader reader = styleLookup [name].Open ();
+ try {
+ styles [name] = Style.LoadFrom (reader);
+ } finally {
+@@ -100,7 +100,7 @@
+ {
+ if (!syntaxModeLookup.ContainsKey (mimeType))
+ throw new System.ArgumentException ("Syntax mode for mime:" + mimeType + " not found", "mimeType");
+- XmlTextReader reader = syntaxModeLookup [mimeType].Open ();
++ XmlReader reader = syntaxModeLookup [mimeType].Open ();
+ try {
+ SyntaxMode mode = SyntaxMode.Read (reader);
+ foreach (string mime in mode.MimeType.Split (';')) {
+@@ -463,7 +463,7 @@
+ queueSignal.Set ();
+ }
+
+- static string Scan (XmlTextReader reader, string attribute)
++ static string Scan (XmlReader reader, string attribute)
+ {
+ while (reader.Read () && !reader.IsStartElement ())
+ ;
+@@ -524,25 +524,29 @@
+ if (!resource.EndsWith (".xml"))
+ continue;
+ if (resource.EndsWith ("SyntaxMode.xml")) {
+- XmlTextReader reader = new XmlTextReader (assembly.GetManifestResourceStream (resource));
+- string mimeTypes = Scan (reader, SyntaxMode.MimeTypesAttribute);
+- ResourceXmlProvider provider = new ResourceXmlProvider (assembly, resource);
+- foreach (string mimeType in mimeTypes.Split (';')) {
+- syntaxModeLookup [mimeType] = provider;
++ using (Stream stream = assembly.GetManifestResourceStream (resource)) {
++ XmlTextReader reader = new XmlTextReader (stream);
++ string mimeTypes = Scan (reader, SyntaxMode.MimeTypesAttribute);
++ ResourceXmlProvider provider = new ResourceXmlProvider (assembly, resource);
++ foreach (string mimeType in mimeTypes.Split (';')) {
++ syntaxModeLookup [mimeType] = provider;
++ }
++ reader.Close ();
+ }
+- reader.Close ();
+ } else if (resource.EndsWith ("Style.xml")) {
+- XmlTextReader reader = new XmlTextReader (assembly.GetManifestResourceStream (resource));
+- string styleName = Scan (reader, Style.NameAttribute);
+- styleLookup [styleName] = new ResourceXmlProvider (assembly, resource);
+- reader.Close ();
++ using (Stream stream = assembly.GetManifestResourceStream (resource)) {
++ XmlTextReader reader = new XmlTextReader (stream);
++ string styleName = Scan (reader, Style.NameAttribute);
++ styleLookup [styleName] = new ResourceXmlProvider (assembly, resource);
++ reader.Close ();
++ }
+ }
+ }
+ }
+
+ public static void AddSyntaxMode (IXmlProvider provider)
+ {
+- using (XmlTextReader reader = provider.Open ()) {
++ using (XmlReader reader = provider.Open ()) {
+ string mimeTypes = Scan (reader, SyntaxMode.MimeTypesAttribute);
+ foreach (string mimeType in mimeTypes.Split (';')) {
+ syntaxModeLookup [mimeType] = provider;
+@@ -552,7 +556,7 @@
+
+ public static void RemoveSyntaxMode (IXmlProvider provider)
+ {
+- using (XmlTextReader reader = provider.Open ()) {
++ using (XmlReader reader = provider.Open ()) {
+ string mimeTypes = Scan (reader, SyntaxMode.MimeTypesAttribute);
+ foreach (string mimeType in mimeTypes.Split (';')) {
+ syntaxModeLookup.Remove (mimeType);
+@@ -562,14 +566,14 @@
+
+ public static void AddStyle (IXmlProvider provider)
+ {
+- using (XmlTextReader reader = provider.Open ()) {
++ using (XmlReader reader = provider.Open ()) {
+ string styleName = Scan (reader, Style.NameAttribute);
+ styleLookup [styleName] = provider;
+ }
+ }
+ public static void RemoveStyle (IXmlProvider provider)
+ {
+- using (XmlTextReader reader = provider.Open ()) {
++ using (XmlReader reader = provider.Open ()) {
+ string styleName = Scan (reader, Style.NameAttribute);
+ styleLookup.Remove (styleName);
+ }
+Index: 2.0/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/IXmlProvider.cs
+===================================================================
+--- 2.0/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/IXmlProvider.cs (revision 130903)
++++ 2.0/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/IXmlProvider.cs (revision 130904)
+@@ -32,7 +32,7 @@
+ {
+ public interface IXmlProvider
+ {
+- XmlTextReader Open ();
++ XmlReader Open ();
+ }
+
+ public class ResourceXmlProvider : IXmlProvider
+@@ -58,9 +58,11 @@
+ this.manifestResourceName = manifestResourceName;
+ }
+
+- public XmlTextReader Open ()
++ public XmlReader Open ()
+ {
+- return new XmlTextReader (this.assembly.GetManifestResourceStream (this.ManifestResourceName));
++ XmlReaderSettings settings = new XmlReaderSettings ();
++ settings.CloseInput = true;
++ return XmlTextReader.Create (this.assembly.GetManifestResourceStream (this.ManifestResourceName), settings);
+ }
+ }
+
+@@ -79,7 +81,7 @@
+ this.url = url;
+ }
+
+- public XmlTextReader Open ()
++ public XmlReader Open ()
+ {
+ return new XmlTextReader (url);
+ }
Propchange: packages/monodevelop/trunk/debian/patches/monodevelop_fix_addin_highlights_r130904.patch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/monodevelop/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/series?rev=5095&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/series (added)
+++ packages/monodevelop/trunk/debian/patches/series Sat Sep 19 16:49:37 2009
@@ -1,0 +1,9 @@
+link_system_nunit.patch
+use_libsvn1.patch
+use_libapr1.patch
+#use_x-terminal-emulator.patch
+update_templates_for_gtk-sharp_2.12.patch
+boo_mimetype.patch
+use_csc.patch
+#monodevelop_fix_addin_highlights_r130904.patch
+
Added: packages/monodevelop/trunk/debian/patches/update_templates_for_gtk-sharp_2.12.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/update_templates_for_gtk-sharp_2.12.patch?rev=5095&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/update_templates_for_gtk-sharp_2.12.patch (added)
+++ packages/monodevelop/trunk/debian/patches/update_templates_for_gtk-sharp_2.12.patch Sat Sep 19 16:49:37 2009
@@ -1,0 +1,93 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## update_templates_for_gtk-sharp_2.12.dpatch by Jo Shields <directhex at apebox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update projects to ensure the version of GTK# it uses for new projects matches
+## DP: the version we ship in the archive
+
+
+ at DPATCH@
+diff -urNad monodevelop-2.1.0~/src/addins/CSharpBinding/templates/GladeSharp2Project.xpt.xml monodevelop-2.1.0/src/addins/CSharpBinding/templates/GladeSharp2Project.xpt.xml
+--- monodevelop-2.1.0~/src/addins/CSharpBinding/templates/GladeSharp2Project.xpt.xml 2009-09-11 09:47:09.839797641 +0100
++++ monodevelop-2.1.0/src/addins/CSharpBinding/templates/GladeSharp2Project.xpt.xml 2009-09-11 09:48:07.519797259 +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.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+
+ <Resources>
+diff -urNad monodevelop-2.1.0~/src/addins/CSharpBinding/templates/GnomeSharp2Project.xpt.xml monodevelop-2.1.0/src/addins/CSharpBinding/templates/GnomeSharp2Project.xpt.xml
+--- monodevelop-2.1.0~/src/addins/CSharpBinding/templates/GnomeSharp2Project.xpt.xml 2009-09-11 09:47:09.839797641 +0100
++++ monodevelop-2.1.0/src/addins/CSharpBinding/templates/GnomeSharp2Project.xpt.xml 2009-09-11 09:48:33.431794172 +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.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+
+ <Files>
+diff -urNad monodevelop-2.1.0~/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml monodevelop-2.1.0/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml
+--- monodevelop-2.1.0~/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2009-09-11 09:47:09.839797641 +0100
++++ monodevelop-2.1.0/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2009-09-11 09:49:45.719797271 +0100
+@@ -28,12 +28,12 @@
+
+ <References>
+ <Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+- <Reference type="Gac" SpecificVersion="false" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" SpecificVersion="false" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" SpecificVersion="false" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" SpecificVersion="false" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" SpecificVersion="false" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" SpecificVersion="false" refto="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" SpecificVersion="false" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" SpecificVersion="false" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" SpecificVersion="false" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" SpecificVersion="false" refto="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" SpecificVersion="false" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" SpecificVersion="false" refto="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+
+ <Files>
+diff -urNad monodevelop-2.1.0~/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml monodevelop-2.1.0/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml
+--- monodevelop-2.1.0~/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2009-09-11 09:47:09.899795904 +0100
++++ monodevelop-2.1.0/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2009-09-11 09:50:08.140794351 +0100
+@@ -28,11 +28,11 @@
+
+ <References>
+ <Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+- <Reference type="Gac" SpecificVersion="false" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" SpecificVersion="false" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" SpecificVersion="false" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" SpecificVersion="false" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" SpecificVersion="false" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" SpecificVersion="false" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" SpecificVersion="false" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" SpecificVersion="false" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" SpecificVersion="false" refto="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
++ <Reference type="Gac" SpecificVersion="false" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </References>
+
+ <Files>
Propchange: packages/monodevelop/trunk/debian/patches/update_templates_for_gtk-sharp_2.12.patch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/monodevelop/trunk/debian/patches/use_csc.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/use_csc.patch?rev=5095&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/use_csc.patch (added)
+++ packages/monodevelop/trunk/debian/patches/use_csc.patch Sat Sep 19 16:49:37 2009
@@ -1,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use_csc.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad monodevelop-1.9.2~/contrib/Mono.Cecil/Makefile.am monodevelop-1.9.2/contrib/Mono.Cecil/Makefile.am
+--- monodevelop-1.9.2~/contrib/Mono.Cecil/Makefile.am 2009-02-04 22:50:58.000000000 +0100
++++ monodevelop-1.9.2/contrib/Mono.Cecil/Makefile.am 2009-02-14 17:44:07.000000000 +0100
+@@ -1,4 +1,5 @@
+ BINDIR=$(top_builddir)/build/bin
++MCS=@CSC@
+
+ all: $(CECIL)
+
+@@ -11,7 +12,7 @@
+
+ $(CECIL): $(CECIL_CSFILES)
+ mkdir -p $(BINDIR)
+- mcs $(CECIL_CSFILES) /debug /target:library /out:$(CECIL)
++ $(MCS) $(CECIL_CSFILES) /debug /target:library /out:$(CECIL)
+
+ $(CECIL_DEBUG): $(CECIL)
+
+@@ -24,7 +25,7 @@
+
+ $(CECIL_MDB): $(CECIL_MDB_CSFILES) $(CECIL)
+ mkdir -p $(BINDIR)
+- mcs $(CECIL_MDB_CSFILES) /debug /target:library /r:$(CECIL) /d:CECIL /out:$(CECIL_MDB)
++ $(CSC) $(CECIL_MDB_CSFILES) /debug /target:library /r:$(CECIL) /d:CECIL /out:$(CECIL_MDB)
+
+ $(CECIL_MDB_DEBUG): $(CECIL_MDB)
+
Propchange: packages/monodevelop/trunk/debian/patches/use_csc.patch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/monodevelop/trunk/debian/patches/use_libapr1.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/use_libapr1.patch?rev=5095&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/use_libapr1.patch (added)
+++ packages/monodevelop/trunk/debian/patches/use_libapr1.patch Sat Sep 19 16:49:37 2009
@@ -1,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use_libapr1.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+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 {
+- 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;
+ }
+
+- public class LibApr0: LibApr
+- {
+- private const string aprlib = "libapr-0.so.0";
+-
+- public override void initialize() { apr_initialize (); }
+- public override IntPtr pool_create_ex (out IntPtr pool, IntPtr parent, IntPtr abort, IntPtr allocator) { return apr_pool_create_ex(out pool, parent, abort, allocator); }
+- public override void pool_destroy(IntPtr pool) { apr_pool_destroy (pool); }
+- public override IntPtr hash_first(IntPtr pool, IntPtr hash) { return apr_hash_first (pool, hash); }
+- public override IntPtr hash_next(IntPtr hashindex) { return apr_hash_next(hashindex); }
+- public override void hash_this(IntPtr hashindex, out IntPtr key, out int keylen, out IntPtr val) { apr_hash_this(hashindex, out key, out keylen, out val); }
+- public override IntPtr array_make(IntPtr pool, int nelts, int elt_size) { return apr_array_make(pool, nelts, elt_size); }
+- public override IntPtr array_push(IntPtr arr) { return apr_array_push (arr); }
+- public override IntPtr pstrdup(IntPtr pool, string s) { return apr_pstrdup(pool, s); }
+- public override IntPtr pcalloc (IntPtr pool, [MarshalAs (UnmanagedType.SysInt)] int size) { return apr_pcalloc (pool, size); }
+- public override int file_open(ref IntPtr newf, string fname, int flag, int perm, IntPtr pool) { return apr_file_open(ref newf, fname, flag, perm, pool); }
+- public override int file_close (IntPtr file) { return apr_file_close (file); }
+-
+- [DllImport(aprlib)] static extern void apr_initialize();
+- [DllImport(aprlib)] static extern IntPtr apr_pool_create_ex(out IntPtr pool, IntPtr parent, IntPtr abort, IntPtr allocator);
+- [DllImport(aprlib)] static extern void apr_pool_destroy(IntPtr pool);
+- [DllImport(aprlib)] static extern IntPtr apr_hash_first(IntPtr pool, IntPtr hash);
+- [DllImport(aprlib)] static extern IntPtr apr_hash_next(IntPtr hashindex);
+- [DllImport(aprlib)] static extern void apr_hash_this(IntPtr hashindex, out IntPtr key, out int keylen, out IntPtr val);
+- [DllImport(aprlib)] static extern IntPtr apr_array_make(IntPtr pool, int nelts, int elt_size);
+- [DllImport(aprlib)] static extern IntPtr apr_array_push(IntPtr arr);
+- [DllImport(aprlib)] static extern IntPtr apr_pstrdup(IntPtr pool, string s);
+- [DllImport(aprlib)] static extern IntPtr apr_pcalloc(IntPtr pool, [MarshalAs (UnmanagedType.SysInt)] int size);
+- [DllImport(aprlib)] static extern int apr_file_open(ref IntPtr newf, string fname, int flag, int perm, IntPtr pool);
+- [DllImport(aprlib)] static extern int apr_file_close (IntPtr file);
+- }
+-
+ public class LibApr1: LibApr
+ {
+ private const string aprlib = "libapr-1.so.0";
Propchange: packages/monodevelop/trunk/debian/patches/use_libapr1.patch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/monodevelop/trunk/debian/patches/use_libsvn1.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/use_libsvn1.patch?rev=5095&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/use_libsvn1.patch (added)
+++ packages/monodevelop/trunk/debian/patches/use_libsvn1.patch Sat Sep 19 16:49:37 2009
@@ -1,0 +1,388 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use_libsvn1.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad monodevelop-2.1.0~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs monodevelop-2.1.0/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs
+--- monodevelop-2.1.0~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs 2009-09-11 09:43:09.807796091 +0100
++++ monodevelop-2.1.0/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs 2009-09-11 09:44:56.076602736 +0100
+@@ -22,10 +22,6 @@
+ public static LibSvnClient GetLib ()
+ {
+ try {
+- return new LibSvnClient0 ();
+- } catch {}
+-
+- try {
+ return new LibSvnClient1 ();
+ } catch {}
+
+@@ -578,366 +574,6 @@
+ public delegate IntPtr svn_client_blame_receiver_t (IntPtr baton, long line_no, int revision, string author, string date, string line, 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 config_get_config (ref IntPtr cfg_hash, string config_dir, IntPtr pool)
+- {
+- svn_config_get_config (ref cfg_hash, 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)
+- {
+- svn_client_get_simple_provider (item, pool);
+- }
+-
+- public override void client_get_simple_prompt_provider (IntPtr item, svn_auth_simple_prompt_func_t prompt_func, IntPtr prompt_batton, int retry_limit, IntPtr pool)
+- {
+- svn_client_get_simple_prompt_provider (item, prompt_func, prompt_batton, retry_limit, pool);
+- }
+-
+- public override void client_get_username_provider (IntPtr item, IntPtr pool)
+- {
+- svn_client_get_username_provider (item, pool);
+- }
+-
+- public override void client_get_username_prompt_provider (IntPtr item, svn_auth_username_prompt_func_t prompt_func, IntPtr prompt_batton, int retry_limit, IntPtr pool)
+- {
+- svn_client_get_username_prompt_provider (item, prompt_func, prompt_batton, retry_limit, pool);
+- }
+-
+- public override void client_get_ssl_server_trust_file_provider (IntPtr item, IntPtr pool)
+- {
+- svn_client_get_ssl_server_trust_file_provider (item, pool);
+- }
+-
+- public override void client_get_ssl_client_cert_file_provider (IntPtr item, IntPtr pool)
+- {
+- svn_client_get_ssl_client_cert_file_provider (item, pool);
+- }
+-
+- public override void client_get_ssl_client_cert_pw_file_provider (IntPtr item, IntPtr pool)
+- {
+- svn_client_get_ssl_client_cert_pw_file_provider (item, pool);
+- }
+-
+- public override void client_get_ssl_server_trust_prompt_provider (IntPtr item, svn_auth_ssl_server_trust_prompt_func_t prompt_func, IntPtr prompt_batton, IntPtr pool)
+- {
+- svn_client_get_ssl_server_trust_prompt_provider (item, prompt_func, prompt_batton, pool);
+- }
+-
+- public override void client_get_ssl_client_cert_prompt_provider (IntPtr item, svn_auth_ssl_client_cert_prompt_func_t prompt_func, IntPtr prompt_batton, int retry_limit, IntPtr pool)
+- {
+- svn_client_get_ssl_client_cert_prompt_provider (item, prompt_func, prompt_batton, retry_limit, pool);
+- }
+-
+- public override void client_get_ssl_client_cert_pw_prompt_provider (IntPtr item, svn_auth_ssl_client_cert_pw_prompt_func_t prompt_func, IntPtr prompt_batton, int retry_limit, IntPtr pool)
+- {
+- svn_client_get_ssl_client_cert_pw_prompt_provider (item, prompt_func, prompt_batton, retry_limit, pool);
+- }
+-
+- public override IntPtr client_version ()
+- {
+- return svn_client_version ();
+- }
+-
+- public override IntPtr client_create_context (out IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_create_context (out ctx, pool);
+- }
+-
+- public override IntPtr client_ls (out IntPtr dirents, string path_or_url,
+- ref Rev revision, int recurse, IntPtr ctx,
+- IntPtr pool)
+- {
+- return svn_client_ls (out dirents, path_or_url, ref revision, recurse, ctx, pool);
+- }
+-
+- public override IntPtr client_status (IntPtr result_rev, string path, ref Rev revision,
+- svn_wc_status_func_t status_func, IntPtr status_baton,
+- int descend, int get_all, int update, int no_ignore,
+- IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_status (result_rev, path, ref revision, status_func, status_baton,
+- descend, get_all, update, no_ignore, ctx, pool);
+- }
+-
+- public override IntPtr client_log (IntPtr apr_array_header_t_targets,
+- ref Rev rev_start, ref Rev rev_end,
+- int discover_changed_paths,
+- int strict_node_history,
+- svn_log_message_receiver_t receiver,
+- IntPtr receiver_baton,
+- IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_log (apr_array_header_t_targets, ref rev_start, ref rev_end,
+- discover_changed_paths, strict_node_history, receiver,
+- receiver_baton,ctx, pool);
+- }
+-
+- public override IntPtr time_from_cstring (out long aprtime, string time, IntPtr pool)
+- {
+- return svn_time_from_cstring (out aprtime, time, pool);
+- }
+-
+- public override IntPtr client_url_from_path (ref IntPtr url, string path_or_url, IntPtr pool)
+- {
+- return svn_client_url_from_path (ref url, path_or_url, pool);
+- }
+-
+- public override IntPtr client_cat2 (IntPtr stream, string path_or_url,
+- ref Rev peg_revision,
+- ref Rev revision,
+- IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_cat2 (stream, path_or_url, ref peg_revision, ref revision, ctx, pool);
+- }
+-
+- public override IntPtr stream_create (IntPtr baton, IntPtr pool)
+- {
+- return svn_stream_create (baton, pool);
+- }
+-
+- //public override IntPtr stream_set_read (IntPtr stream, svn_readwrite_fn_t reader);
+-
+- public override IntPtr stream_set_write (IntPtr stream, svn_readwrite_fn_t writer)
+- {
+- return svn_stream_set_write (stream, writer);
+- }
+-
+- public override IntPtr client_update (IntPtr result_rev, string path, ref Rev revision,
+- int recurse, IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_update (result_rev, path, ref revision, recurse, ctx, pool);
+- }
+-
+- public override IntPtr client_delete (ref IntPtr commit_info_p, IntPtr apr_array_header_t_targets,
+- int force, IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_delete (ref commit_info_p, apr_array_header_t_targets, force, ctx, pool);
+- }
+-
+- public override IntPtr client_add3 (string path, int recurse, int force, int no_ignore, IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_add3 (path, recurse, force, no_ignore, ctx, pool);
+- }
+-
+- public override IntPtr client_commit (ref IntPtr svn_client_commit_info_t_commit_info,
+- IntPtr apr_array_header_t_targets, int nonrecursive,
+- IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_commit (ref svn_client_commit_info_t_commit_info, apr_array_header_t_targets,
+- nonrecursive, ctx, pool);
+- }
+-
+- public override IntPtr client_revert (IntPtr apr_array_header_t_targets, int recursive,
+- IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_revert (apr_array_header_t_targets, recursive, ctx, pool);
+- }
+-
+- public override IntPtr client_resolved (string path, int recursive, IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_resolved (path, recursive, ctx, pool);
+- }
+-
+- public override IntPtr client_move (ref IntPtr commit_info_p, string srcPath, ref Rev rev,
+- string destPath, int force, IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_move (ref commit_info_p, srcPath, ref rev, destPath, force, ctx, pool);
+- }
+-
+- 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 (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)
+- {
+- return svn_client_mkdir2 (ref commit_info, apr_array_paths, ctx, pool);
+- }
+-
+- public override IntPtr client_diff (IntPtr diff_options, string path1, ref Rev revision1,
+- string path2, ref Rev revision2, int recurse,
+- int ignore_ancestry, int no_diff_deleted,
+- IntPtr outfile, IntPtr errfile,
+- IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_diff (diff_options, path1, ref revision1, path2, ref revision2, recurse, ignore_ancestry,
+- no_diff_deleted, outfile, errfile, ctx, pool);
+- }
+-
+- public override IntPtr client_merge_peg2 (
+- string source,
+- ref Rev revision1,
+- ref Rev revision2,
+- ref Rev peg_revision,
+- string target_wcpath,
+- bool recurse,
+- bool ignore_ancestry,
+- bool force,
+- bool dry_run,
+- IntPtr merge_options,
+- IntPtr ctx,
+- IntPtr pool)
+- {
+- // svn_boolean_t == int
+- return svn_client_merge_peg2 (source, ref revision1, ref revision2, ref peg_revision, target_wcpath,
+- recurse ? 1: 0, ignore_ancestry ? 1 : 0, force ? 1 : 0, dry_run ? 1 : 0,
+- merge_options, ctx, pool);
+- }
+-
+- public override IntPtr client_lock (IntPtr apr_array_header_t_targets, string comment, int steal_lock, IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_lock (apr_array_header_t_targets, comment, steal_lock, ctx, pool);
+- }
+-
+- public override IntPtr client_unlock (IntPtr apr_array_header_t_targets, int break_lock, IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_unlock (apr_array_header_t_targets, break_lock, ctx, pool);
+- }
+-
+- public override IntPtr client_prop_get (out IntPtr value, string name, string target, ref Rev revision, int recurse, IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_prop_get (out value, name, target, ref revision, recurse, ctx, pool);
+- }
+-
+- public override IntPtr client_blame (string path, ref Rev rev_start, ref Rev rev_end, svn_client_blame_receiver_t receiver, System.IntPtr baton, System.IntPtr ctx, System.IntPtr pool)
+- {
+- return svn_client_blame (path, ref rev_start, ref rev_end, receiver, baton, ctx, pool);
+- }
+-
+-
+- [DllImport(svnclientlib)] static extern void svn_config_ensure (string config_dir, IntPtr pool);
+- [DllImport(svnclientlib)] static extern void svn_config_get_config (ref IntPtr cfg_hash, 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);
+- [DllImport(svnclientlib)] static extern void svn_client_get_username_prompt_provider (IntPtr item, svn_auth_username_prompt_func_t prompt_func, IntPtr prompt_batton, [MarshalAs (UnmanagedType.SysInt)] int retry_limit, IntPtr pool);
+- [DllImport(svnclientlib)] static extern void svn_client_get_ssl_server_trust_file_provider (IntPtr item, IntPtr pool);
+- [DllImport(svnclientlib)] static extern void svn_client_get_ssl_client_cert_file_provider (IntPtr item, IntPtr pool);
+- [DllImport(svnclientlib)] static extern void svn_client_get_ssl_client_cert_pw_file_provider (IntPtr item, IntPtr pool);
+- [DllImport(svnclientlib)] static extern void svn_client_get_ssl_server_trust_prompt_provider (IntPtr item, svn_auth_ssl_server_trust_prompt_func_t prompt_func, IntPtr prompt_batton, IntPtr pool);
+- [DllImport(svnclientlib)] static extern void svn_client_get_ssl_client_cert_prompt_provider (IntPtr item, svn_auth_ssl_client_cert_prompt_func_t prompt_func, IntPtr prompt_batton, [MarshalAs (UnmanagedType.SysInt)] int retry_limit, IntPtr pool);
+- [DllImport(svnclientlib)] static extern void svn_client_get_ssl_client_cert_pw_prompt_provider (IntPtr item, svn_auth_ssl_client_cert_pw_prompt_func_t prompt_func, IntPtr prompt_batton, [MarshalAs (UnmanagedType.SysInt)] int retry_limit, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_version();
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_create_context(out IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_ls (out IntPtr dirents, string path_or_url,
+- ref Rev revision, int recurse, IntPtr ctx,
+- IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_status (IntPtr result_rev, string path, ref Rev revision,
+- svn_wc_status_func_t status_func, IntPtr status_baton,
+- int descend, int get_all, int update, int no_ignore,
+- IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_log (IntPtr apr_array_header_t_targets,
+- ref Rev rev_start, ref Rev rev_end,
+- int discover_changed_paths,
+- int strict_node_history,
+- svn_log_message_receiver_t receiver,
+- IntPtr receiver_baton,
+- IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_time_from_cstring (out long aprtime, string time, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_url_from_path (ref IntPtr url, string path_or_url, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_cat2 (IntPtr stream, string path_or_url,
+- ref Rev peg_revision,
+- ref Rev revision,
+- IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_stream_create (IntPtr baton, IntPtr pool);
+-
+- //[DllImport(svnclientlib)] static extern IntPtr svn_stream_set_read (IntPtr stream, svn_readwrite_fn_t reader);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_stream_set_write (IntPtr stream, svn_readwrite_fn_t writer);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_update (IntPtr result_rev, string path, ref Rev revision,
+- int recurse, IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_delete (ref IntPtr commit_info_p, IntPtr apr_array_header_t_targets,
+- int force, IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_add3 (string path, int recurse, int force, int no_ignore, IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_commit (ref IntPtr svn_client_commit_info_t_commit_info,
+- IntPtr apr_array_header_t_targets, int nonrecursive,
+- IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_revert (IntPtr apr_array_header_t_targets, int recursive,
+- IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_resolved (string path, int recursive, IntPtr ctx, IntPtr pool);
+-
+- [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 (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);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_diff (IntPtr diff_options, string path1,
+- ref Rev revision1, string path2,
+- ref Rev revision2, int recurse,
+- int ignore_ancestry,
+- int no_diff_deleted,
+- IntPtr outfile,
+- IntPtr errfile,
+- IntPtr ctx,
+- IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_merge_peg2 (string source,
+- ref Rev revision1,
+- ref Rev revision2,
+- ref Rev peg_revision,
+- string target_wcpath,
+- int recurse,
+- int ignore_ancestry,
+- int force,
+- int dry_run,
+- IntPtr merge_options,
+- IntPtr ctx,
+- IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_lock (IntPtr apr_array_header_t_targets, string comment, int steal_lock, IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_unlock (IntPtr apr_array_header_t_targets, int break_lock, IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_prop_get (out IntPtr value, string name, string target, ref Rev revision, int recurse, IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_blame (string path, ref Rev rev_start, ref Rev rev_end, svn_client_blame_receiver_t receiver, IntPtr baton, IntPtr ctx, IntPtr pool);
+- }
+-
+ public class LibSvnClient1 : LibSvnClient {
+ private const string svnclientlib = "libsvn_client-1.so.1";
+
Propchange: packages/monodevelop/trunk/debian/patches/use_libsvn1.patch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/monodevelop/trunk/debian/patches/use_x-terminal-emulator.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/use_x-terminal-emulator.patch?rev=5095&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/use_x-terminal-emulator.patch (added)
+++ packages/monodevelop/trunk/debian/patches/use_x-terminal-emulator.patch Sat Sep 19 16:49:37 2009
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use_x-terminal-emulator.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.13.1~/Core/src/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessService.cs monodevelop-0.13.1/Core/src/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessService.cs
+--- monodevelop-0.13.1~/Core/src/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessService.cs 2007-03-08 00:02:14.000000000 +0100
++++ monodevelop-0.13.1/Core/src/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessService.cs 2007-04-01 22:57:37.000000000 +0200
+@@ -116,8 +116,8 @@
+ string additionalCommands = "";
+ if (!console.CloseOnDispose)
+ additionalCommands = @"echo; read -p 'Press any key to continue...' -n1;";
+- ProcessStartInfo psi = new ProcessStartInfo("xterm",
+- String.Format (@"-e ""cd {3} ; '{0}' {1} ; {2}""", command, arguments, additionalCommands, workingDirectory.Replace (" ", "\\ ")));
++ ProcessStartInfo psi = new ProcessStartInfo("x-terminal-emulator",
++ String.Format (@"-e /bin/sh -c ""cd {3} ; '{0}' {1} ; {2}""", command, arguments, additionalCommands, workingDirectory.Replace (" ", "\\ ")));
+ psi.UseShellExecute = false;
+
+ if (workingDirectory != null)
Modified: packages/monodevelop/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/rules?rev=5095&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/rules (original)
+++ packages/monodevelop/trunk/debian/rules Sat Sep 19 16:49:37 2009
@@ -10,11 +10,9 @@
VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
include /usr/share/cli-common/cli.make
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
-build: build-stamp
-build-stamp: patch-stamp
- dh build --before configure
+override_dh_auto_configure:
aclocal -I.
autoconf
automake --add-missing --copy
@@ -26,39 +24,31 @@
--enable-aspnet \
--enable-gnomeplatform \
--enable-c MCS=/usr/bin/mono-csc CSC=/usr/bin/mono-csc
+
+
+override_dh_auto_test:
# skip "make test"
- dh build --before dh_auto_test
- dh build --after dh_auto_test
- touch build-stamp
-clean: clean-patched unpatch
-clean-patched:
- dh clean
+override_dh_clean:
+ dh_clean
rm -rf configure config.sub config.guess ltmain.sh aclocal.m4 autom4te.cache/
find . -name "Makefile.in" -delete
-install: build
- dh $@ --before dh_install
+override_dh_auto_install:
+ dh_auto_install
# 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/
# fix permissions of .mo files
cd $(CURDIR)/debian/tmp/usr/share/locale && find -name "*.mo" -exec chmod -x {} \;
- dh $@ --remaining
-binary: binary-arch binary-indep
-
-binary-arch:
-
-binary-indep: build install
- dh $@ --until dh_install
+override_dh_install:
# remove nunit files (shipped in monodevelop-nunit)
rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/NUnit/
# remove versioncontrol files (shipped in monodevelop-versioncontrol)
rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/VersionControl/
# remove ChangeLogAddIn files (shipped in monodevelop-versioncontrol)
rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/ChangeLogAddIn/
- dh $@ --after dh_install
get-orig-source:
mkdir -p ../tarballs
@@ -84,6 +74,6 @@
rm -r $(DEB_SOURCE_NAME)-$(VERSION)
%:
- dh $@
+ dh --with quilt $@
-.PHONY: patch clean clean-patched binary binary-arch binary-indep get-orig-source install
+.PHONY: get-orig-source
More information about the Pkg-cli-apps-commits
mailing list