diff -Nru monodevelop-2.8.6.3+dfsg/debian/changelog monodevelop-2.8.6.3+dfsg/debian/changelog --- monodevelop-2.8.6.3+dfsg/debian/changelog 2012-02-05 10:02:43.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/changelog 2012-02-18 15:00:10.000000000 +0000 @@ -1,3 +1,19 @@ +monodevelop (2.8.6.3+dfsg-2) unstable; urgency=low + + * Team upload. + * [3b97509] fix nunit port patch. + Needed a small logic change for the TestSuiteResult -> TestResult merge + in 2.5 + Added a ProjectService needed by nunit's DomainManager service + Removed some line ending fuzz + * [ad86e5e] refresh all patches + * [226a326] treat new Error TestResult as a failure to get it displayed + * [be03336] use dh $@ --with cli instead of cli.make + * [f475710] wrap-and-sort debian/ + * [2635858] use dh-autoreconf + + -- Julian Taylor Sat, 18 Feb 2012 22:59:35 +0800 + monodevelop (2.8.6.3+dfsg-1) unstable; urgency=low * [1840cc1] Imported Upstream version 2.8.6.3+dfsg diff -Nru monodevelop-2.8.6.3+dfsg/debian/control monodevelop-2.8.6.3+dfsg/debian/control --- monodevelop-2.8.6.3+dfsg/debian/control 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/control 2012-02-18 15:00:10.000000000 +0000 @@ -4,27 +4,28 @@ Maintainer: Debian CLI Applications Team Uploaders: Mirco Bauer , Jo Shields Build-Depends: debhelper (>= 7.0.50) -Build-Depends-Indep: cli-common-dev (>= 0.8~), - mono-devel (>= 2.10), - monodoc-base (>= 1.1.9), - intltool, - autoconf, - automake, - autotools-dev, - gtk-sharp2-gapi (>= 2.12.8), - libgtk2.0-cil-dev, - libglade2.0-cil-dev, - libgconf2.0-cil-dev, - libgnome2.0-cil-dev, - libnunit-cil-dev (>= 2.5), - libmono-cecil-cil-dev, - libmono-addins-cil-dev (>= 0.6), - libmono-addins-gui-cil-dev (>= 0.6), - libmetacity-dev, - libsvn-dev, - libapr1-dev, - libgtkspell-dev, - desktop-file-utils +Build-Depends-Indep: autoconf, + automake, + autotools-dev, + cli-common-dev (>= 0.8~), + desktop-file-utils, + dh-autoreconf, + gtk-sharp2-gapi (>= 2.12.8), + intltool, + libapr1-dev, + libgconf2.0-cil-dev, + libglade2.0-cil-dev, + libgnome2.0-cil-dev, + libgtk2.0-cil-dev, + libgtkspell-dev, + libmetacity-dev, + libmono-addins-cil-dev (>= 0.6), + libmono-addins-gui-cil-dev (>= 0.6), + libmono-cecil-cil-dev, + libnunit-cil-dev (>= 2.5), + libsvn-dev, + mono-devel (>= 2.10), + monodoc-base (>= 1.1.9) Standards-Version: 3.9.2 Homepage: http://www.monodevelop.com/ Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/monodevelop.git @@ -32,30 +33,28 @@ Package: monodevelop Architecture: all -Suggests: monodevelop-java, - monodevelop-vala, - monodevelop-nunit, - monodevelop-versioncontrol, +Suggests: exuberant-ctags, + gcc, + gettext, + make, + mono-vbnc, + mono-xsp | mono-xsp4, monodevelop-database, monodevelop-debugger-gdb, - mono-xsp | mono-xsp4, - mono-vbnc, + monodevelop-java, + monodevelop-nunit, + monodevelop-vala, + monodevelop-versioncontrol, monodoc-browser, - exuberant-ctags, - gcc, - make, - zip, - gettext -Recommends: mono-devel, - libgtk2.0-cil-dev, - libglade2.0-cil-dev -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${cli:Depends}, + zip +Recommends: libglade2.0-cil-dev, libgtk2.0-cil-dev, mono-devel +Depends: gnome-icon-theme (>= 1.1.3), monodoc-manual (>= 1.1.9), pkg-config, - gnome-icon-theme (>= 1.1.3), - xterm | x-terminal-emulator + xterm | x-terminal-emulator, + ${cli:Depends}, + ${misc:Depends}, + ${shlibs:Depends} Provides: monodoc-viewer Description: Development Environment for GNOME MonoDevelop is a GNOME IDE primarily designed for C# and other CLI (.NET) @@ -73,10 +72,10 @@ Package: monodevelop-nunit Architecture: all -Depends: ${shlibs:Depends}, - ${misc:Depends}, +Depends: monodevelop (= ${source:Version}), ${cli:Depends}, - monodevelop (= ${source:Version}) + ${misc:Depends}, + ${shlibs:Depends} Description: NUnit plugin for MonoDevelop MonoDevelop is a GNOME IDE primarily designed for C# and other CLI (.NET) languages. @@ -86,10 +85,10 @@ Package: monodevelop-versioncontrol Architecture: all Replaces: monodevelop (<< 0.13.1) -Depends: ${shlibs:Depends}, - ${misc:Depends}, +Depends: monodevelop (= ${source:Version}), ${cli:Depends}, - monodevelop (= ${source:Version}) + ${misc:Depends}, + ${shlibs:Depends} Description: VersionControl plugin for MonoDevelop MonoDevelop is a GNOME IDE primarily designed for C# and other CLI (.NET) languages. diff -Nru monodevelop-2.8.6.3+dfsg/debian/copyright monodevelop-2.8.6.3+dfsg/debian/copyright --- monodevelop-2.8.6.3+dfsg/debian/copyright 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/copyright 2012-02-18 15:00:10.000000000 +0000 @@ -7,7 +7,7 @@ It was downloaded from: http://www.monodevelop.com/ -Authors: +Authors: Alberto Paro Alejandro Serrano Alexandre Gomes diff -Nru monodevelop-2.8.6.3+dfsg/debian/monodevelop-versioncontrol.install monodevelop-2.8.6.3+dfsg/debian/monodevelop-versioncontrol.install --- monodevelop-2.8.6.3+dfsg/debian/monodevelop-versioncontrol.install 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/monodevelop-versioncontrol.install 2012-02-18 15:00:10.000000000 +0000 @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/monodevelop/AddIns/VersionControl/ debian/tmp/usr/lib/monodevelop/AddIns/ChangeLogAddIn/ +debian/tmp/usr/lib/monodevelop/AddIns/VersionControl/ diff -Nru monodevelop-2.8.6.3+dfsg/debian/patches/boo_mimetype.patch monodevelop-2.8.6.3+dfsg/debian/patches/boo_mimetype.patch --- monodevelop-2.8.6.3+dfsg/debian/patches/boo_mimetype.patch 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/patches/boo_mimetype.patch 2012-02-18 15:00:10.000000000 +0000 @@ -1,8 +1,5 @@ -Index: monodevelop-0.10/monodevelop.xml -Description: Add boo mimetype -=================================================================== ---- 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 +--- a/monodevelop.xml ++++ b/monodevelop.xml @@ -12,6 +12,10 @@ Nemerle source diff -Nru monodevelop-2.8.6.3+dfsg/debian/patches/generate_automake_1.11.2_compatible_makefiles.patch monodevelop-2.8.6.3+dfsg/debian/patches/generate_automake_1.11.2_compatible_makefiles.patch --- monodevelop-2.8.6.3+dfsg/debian/patches/generate_automake_1.11.2_compatible_makefiles.patch 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/patches/generate_automake_1.11.2_compatible_makefiles.patch 2012-02-18 15:00:10.000000000 +0000 @@ -1,7 +1,5 @@ -Index: monodevelop/src/addins/MonoDevelop.Autotools/templates/Makefile.include -=================================================================== ---- monodevelop.orig/src/addins/MonoDevelop.Autotools/templates/Makefile.include 2012-01-20 17:26:47.000000000 +0000 -+++ monodevelop/src/addins/MonoDevelop.Autotools/templates/Makefile.include 2012-01-20 17:27:20.000000000 +0000 +--- a/src/addins/MonoDevelop.Autotools/templates/Makefile.include ++++ b/src/addins/MonoDevelop.Autotools/templates/Makefile.include @@ -62,7 +62,8 @@ CLEANFILES += $(ASSEMBLY) $(ASSEMBLY).mdb $(BINARIES) $(build_resx_resources) $(build_satellite_assembly_list) DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/* diff -Nru monodevelop-2.8.6.3+dfsg/debian/patches/no_appmenu monodevelop-2.8.6.3+dfsg/debian/patches/no_appmenu --- monodevelop-2.8.6.3+dfsg/debian/patches/no_appmenu 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/patches/no_appmenu 2012-02-18 15:00:10.000000000 +0000 @@ -1,8 +1,6 @@ -Index: monodevelop-2.4+dfsg/monodevelop.in -=================================================================== ---- monodevelop-2.4+dfsg.orig/monodevelop.in 2010-09-30 17:35:57.824000003 +0200 -+++ monodevelop-2.4+dfsg/monodevelop.in 2010-09-30 17:36:37.764000005 +0200 -@@ -13,6 +13,9 @@ +--- a/monodevelop.in ++++ b/monodevelop.in +@@ -16,6 +16,9 @@ _MONO_OPTIONS=$MONO_OPTIONS fi diff -Nru monodevelop-2.8.6.3+dfsg/debian/patches/port_to_nunit_2.5.patch monodevelop-2.8.6.3+dfsg/debian/patches/port_to_nunit_2.5.patch --- monodevelop-2.8.6.3+dfsg/debian/patches/port_to_nunit_2.5.patch 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/patches/port_to_nunit_2.5.patch 2012-02-18 15:00:10.000000000 +0000 @@ -1,48 +1,5 @@ -Index: monodevelop/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs -=================================================================== ---- monodevelop.orig/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs 2011-07-03 16:33:08.000000000 +0100 -+++ monodevelop/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs 2011-07-03 16:33:37.000000000 +0100 -@@ -43,25 +43,25 @@ - public class NUnitTestRunner: MarshalByRefObject - { - public void Initialize (string nunitPath, string nunitCorePath) -- { -- // In some cases MS.NET can't properly resolve assemblies even if they -- // are already loaded. For example, when deserializing objects from remoting. -- AppDomain.CurrentDomain.AssemblyResolve += delegate (object s, ResolveEventArgs args) { -- foreach (Assembly am in AppDomain.CurrentDomain.GetAssemblies ()) { -- if (am.GetName ().FullName == args.Name) -- return am; -- } -- return null; -- }; -- -+ { -+ // In some cases MS.NET can't properly resolve assemblies even if they -+ // are already loaded. For example, when deserializing objects from remoting. -+ AppDomain.CurrentDomain.AssemblyResolve += delegate (object s, ResolveEventArgs args) { -+ foreach (Assembly am in AppDomain.CurrentDomain.GetAssemblies ()) { -+ if (am.GetName ().FullName == args.Name) -+ return am; -+ } -+ return null; -+ }; -+ - // Force the loading of the NUnit.Framework assembly. - // It's needed since that dll is not located in the test dll directory. - Assembly.LoadFrom (nunitCorePath); - Assembly.LoadFrom (nunitPath); -- -- // Initialize ExtensionHost if not already done -- if ( !CoreExtensions.Host.Initialized ) -- CoreExtensions.Host.InitializeService(); -+ -+ // Initialize ExtensionHost if not already done -+ if ( !CoreExtensions.Host.Initialized ) -+ CoreExtensions.Host.InitializeService(); - } - - public TestResult Run (EventListener listener, ITestFilter filter, string path, string suiteName, List supportAssemblies) +--- a/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs ++++ b/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs @@ -153,7 +153,7 @@ public bool Pass (ITest test) @@ -52,11 +9,9 @@ return true; if (test.Tests != null) { foreach (ITest ct in test.Tests) { -Index: monodevelop/src/addins/NUnit/Services/ExternalTestRunner.cs -=================================================================== ---- monodevelop.orig/src/addins/NUnit/Services/ExternalTestRunner.cs 2011-07-03 16:33:52.000000000 +0100 -+++ monodevelop/src/addins/NUnit/Services/ExternalTestRunner.cs 2011-07-03 16:34:34.000000000 +0100 -@@ -46,27 +46,27 @@ +--- a/src/addins/NUnit/Services/ExternalTestRunner.cs ++++ b/src/addins/NUnit/Services/ExternalTestRunner.cs +@@ -46,27 +46,28 @@ { class ExternalTestRunner: RemoteProcessObject { @@ -90,6 +45,7 @@ + // Preload the runner assembly. Required because TestNameFilter is implemented there string asm = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), "NUnitRunner.dll"); Assembly.LoadFrom (asm); ++ ServiceManager.Services.AddService( new ProjectService() ); } public UnitTestResult Run (IRemoteEventListener listener, ITestFilter filter, string path, string suiteName, List supportAssemblies) @@ -98,7 +54,7 @@ NUnitTestRunner runner = GetRunner (path); EventListenerWrapper listenerWrapper = listener != null ? new EventListenerWrapper (listener) : null; -@@ -81,7 +81,7 @@ +@@ -81,7 +82,7 @@ } NUnitTestRunner GetRunner (string assemblyPath) @@ -107,7 +63,7 @@ TestPackage package = new TestPackage (assemblyPath); package.Settings ["ShadowCopyFiles"] = false; DomainManager dm = new DomainManager (); -@@ -116,7 +116,7 @@ +@@ -116,7 +117,7 @@ { } @@ -116,7 +72,7 @@ { testSuites.Pop (); wrapped.SuiteFinished (GetTestName (result.Test), GetLocalTestResult (result)); -@@ -128,7 +128,7 @@ +@@ -129,7 +130,7 @@ wrapped.SuiteStarted (GetTestName (suite)); } @@ -125,19 +81,78 @@ { wrapped.TestFinished (GetTestName (result.Test), GetLocalTestResult (result)); } -@@ -182,9 +182,9 @@ +@@ -187,42 +188,42 @@ + { UnitTestResult res = new UnitTestResult (); res.Message = t.Message; - +- - if (t is TestSuiteResult) { -+ if (t is TestResult) { ++ ++ if (t.IsFailure || t.IsError) { ++ res.Status = ResultStatus.Failure; ++ res.TotalFailures = 1; ++ } ++ else if (!t.Executed) { ++ res.Status = ResultStatus.Ignored; ++ res.TotalIgnored = 1; ++ } ++ else { ++ res.Status = ResultStatus.Success; ++ res.TotalSuccess = 1; ++ } ++ ++ if (t.Results != null) { int s=0, f=0, i=0; - CountResults ((TestSuiteResult)t, ref s, ref f, ref i); +- res.TotalFailures = f; +- res.TotalSuccess = s; +- res.TotalIgnored = i; + CountResults ((TestResult)t, ref s, ref f, ref i); - res.TotalFailures = f; - res.TotalSuccess = s; - res.TotalIgnored = i; -@@ -232,21 +232,21 @@ ++ res.TotalFailures += f; ++ res.TotalSuccess += s; ++ res.TotalIgnored += i; + if (f > 0) + res.Status |= ResultStatus.Failure; + if (s > 0) + res.Status |= ResultStatus.Success; + if (i > 0) + res.Status |= ResultStatus.Ignored; +- } else { +- if (t.IsFailure) { +- res.Status = ResultStatus.Failure; +- res.TotalFailures = 1; +- } +- else if (!t.Executed) { +- res.Status = ResultStatus.Ignored; +- res.TotalIgnored = 1; +- } +- else { +- res.Status = ResultStatus.Success; +- res.TotalSuccess = 1; +- } ++ } + +- if (string.IsNullOrEmpty (res.Message)) { +- if (t.IsFailure) +- res.Message = GettextCatalog.GetString ("Test failed"); +- else if (!t.Executed) +- res.Message = GettextCatalog.GetString ("Test ignored"); +- else { +- res.Message = GettextCatalog.GetString ("Test successful") + "\n\n"; +- res.Message += GettextCatalog.GetString ("Execution time: {0:0.00}ms", t.Time); +- } ++ if (string.IsNullOrEmpty (res.Message)) { ++ if (t.IsFailure || t.IsError) ++ res.Message = GettextCatalog.GetString ("Test failed"); ++ else if (!t.Executed) ++ res.Message = GettextCatalog.GetString ("Test ignored"); ++ else { ++ res.Message = GettextCatalog.GetString ("Test successful") + "\n\n"; ++ res.Message += GettextCatalog.GetString ("Execution time: {0:0.00}ms", t.Time); + } + } + res.StackTrace = t.StackTrace; +@@ -238,21 +239,21 @@ return res; } @@ -149,8 +164,9 @@ foreach (TestResult t in ts.Results) { - if (t is TestCaseResult) { +- if (t.IsFailure) + if (t is TestResult) { - if (t.IsFailure) ++ if (t.IsFailure || t.IsError) f++; else if (!t.Executed) i++; diff -Nru monodevelop-2.8.6.3+dfsg/debian/patches/remove_support_for_moonlight.patch monodevelop-2.8.6.3+dfsg/debian/patches/remove_support_for_moonlight.patch --- monodevelop-2.8.6.3+dfsg/debian/patches/remove_support_for_moonlight.patch 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/patches/remove_support_for_moonlight.patch 2012-02-18 15:00:10.000000000 +0000 @@ -1,17 +1,13 @@ -Index: monodevelop/monodevelop-core-addins.pc.in -=================================================================== ---- monodevelop.orig/monodevelop-core-addins.pc.in 2011-11-08 00:30:37.000000000 +0000 -+++ monodevelop/monodevelop-core-addins.pc.in 2011-11-08 00:59:11.000000000 +0000 +--- a/monodevelop-core-addins.pc.in ++++ b/monodevelop-core-addins.pc.in @@ -6,4 +6,4 @@ Name: MonoDevelop Core Add-ins Description: MonoDevelop Core Add-ins Version: @VERSION@ -Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Moonlight/MonoDevelop.Moonlight.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll +Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll -Index: monodevelop/src/addins/Makefile.am -=================================================================== ---- monodevelop.orig/src/addins/Makefile.am 2011-11-08 00:33:54.000000000 +0000 -+++ monodevelop/src/addins/Makefile.am 2011-11-08 00:59:50.000000000 +0000 +--- a/src/addins/Makefile.am ++++ b/src/addins/Makefile.am @@ -26,7 +26,6 @@ MonoDevelop.RegexToolkit \ CBinding \ @@ -20,10 +16,8 @@ MonoDevelop.CodeMetrics \ MonoDevelop.Debugger.Soft \ WindowsPlatform \ -Index: monodevelop/configure.in -=================================================================== ---- monodevelop.orig/configure.in 2011-11-08 00:33:54.000000000 +0000 -+++ monodevelop/configure.in 2011-11-08 00:59:11.000000000 +0000 +--- a/configure.in ++++ b/configure.in @@ -331,7 +331,6 @@ src/addins/WindowsPlatform/Makefile src/addins/MonoDevelop.AssemblyBrowser/Makefile @@ -40,10 +34,8 @@ src/addins/MonoDevelop.HexEditor/Makefile src/addins/MonoDevelop.DocFood/Makefile src/addins/MonoDevelop.MacDev/Makefile -Index: monodevelop/src/addins/MonoDevelop.Debugger.Soft/Makefile.am -=================================================================== ---- monodevelop.orig/src/addins/MonoDevelop.Debugger.Soft/Makefile.am 2011-11-08 00:30:37.000000000 +0000 -+++ monodevelop/src/addins/MonoDevelop.Debugger.Soft/Makefile.am 2011-11-08 00:59:11.000000000 +0000 +--- a/src/addins/MonoDevelop.Debugger.Soft/Makefile.am ++++ b/src/addins/MonoDevelop.Debugger.Soft/Makefile.am @@ -1,5 +1,4 @@ SUBDIRS = \ Mono.Debugging.Soft \ diff -Nru monodevelop-2.8.6.3+dfsg/debian/patches/update_templates_for_gtk-sharp_2.12.patch monodevelop-2.8.6.3+dfsg/debian/patches/update_templates_for_gtk-sharp_2.12.patch --- monodevelop-2.8.6.3+dfsg/debian/patches/update_templates_for_gtk-sharp_2.12.patch 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/patches/update_templates_for_gtk-sharp_2.12.patch 2012-02-18 15:00:10.000000000 +0000 @@ -1,7 +1,5 @@ -Index: monodevelop/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml -=================================================================== ---- monodevelop.orig/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2011-11-08 00:33:54.000000000 +0000 -+++ monodevelop/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2011-11-08 00:53:24.000000000 +0000 +--- a/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml ++++ b/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml @@ -28,12 +28,12 @@ @@ -21,10 +19,8 @@ -Index: monodevelop/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml -=================================================================== ---- monodevelop.orig/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2011-11-08 00:33:54.000000000 +0000 -+++ monodevelop/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2011-11-08 00:53:53.000000000 +0000 +--- a/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml ++++ b/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml @@ -28,12 +28,12 @@ diff -Nru monodevelop-2.8.6.3+dfsg/debian/patches/use_csc.patch monodevelop-2.8.6.3+dfsg/debian/patches/use_csc.patch --- monodevelop-2.8.6.3+dfsg/debian/patches/use_csc.patch 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/patches/use_csc.patch 2012-02-18 15:00:10.000000000 +0000 @@ -1,7 +1,5 @@ -Index: monodevelop/contrib/Mono.Cecil/Makefile.am -=================================================================== ---- monodevelop.orig/contrib/Mono.Cecil/Makefile.am 2011-11-08 00:57:55.000000000 +0000 -+++ monodevelop/contrib/Mono.Cecil/Makefile.am 2011-11-08 00:58:07.000000000 +0000 +--- a/contrib/Mono.Cecil/Makefile.am ++++ b/contrib/Mono.Cecil/Makefile.am @@ -1,4 +1,5 @@ BINDIR=$(top_builddir)/build/bin +MCS=@CSC@ @@ -26,10 +24,8 @@ $(CECIL_MDB_DEBUG): $(CECIL_MDB) -Index: monodevelop/contrib/NGit/NGit.csproj -=================================================================== ---- monodevelop.orig/contrib/NGit/NGit.csproj 2011-11-08 00:57:55.000000000 +0000 -+++ monodevelop/contrib/NGit/NGit.csproj 2011-11-08 00:58:07.000000000 +0000 +--- a/contrib/NGit/NGit.csproj ++++ b/contrib/NGit/NGit.csproj @@ -9,7 +9,7 @@ Library NGit @@ -39,10 +35,8 @@ true -Index: monodevelop/contrib/NSch/NSch.csproj -=================================================================== ---- monodevelop.orig/contrib/NSch/NSch.csproj 2011-11-08 00:57:55.000000000 +0000 -+++ monodevelop/contrib/NSch/NSch.csproj 2011-11-08 00:58:07.000000000 +0000 +--- a/contrib/NSch/NSch.csproj ++++ b/contrib/NSch/NSch.csproj @@ -9,7 +9,7 @@ Library NSch @@ -52,10 +46,8 @@ true -Index: monodevelop/contrib/Sharpen/Sharpen.csproj -=================================================================== ---- monodevelop.orig/contrib/Sharpen/Sharpen.csproj 2011-11-08 00:57:55.000000000 +0000 -+++ monodevelop/contrib/Sharpen/Sharpen.csproj 2011-11-08 00:58:07.000000000 +0000 +--- a/contrib/Sharpen/Sharpen.csproj ++++ b/contrib/Sharpen/Sharpen.csproj @@ -9,7 +9,7 @@ Library Sharpen @@ -72,10 +64,8 @@ - \ No newline at end of file + -Index: monodevelop/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am -=================================================================== ---- monodevelop.orig/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am 2011-11-08 00:57:55.000000000 +0000 -+++ monodevelop/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am 2011-11-08 00:58:07.000000000 +0000 +--- a/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am ++++ b/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am @@ -4,7 +4,7 @@ REFS = \ -r:Microsoft.Build.Engine \ diff -Nru monodevelop-2.8.6.3+dfsg/debian/patches/use_libapr1.patch monodevelop-2.8.6.3+dfsg/debian/patches/use_libapr1.patch --- monodevelop-2.8.6.3+dfsg/debian/patches/use_libapr1.patch 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/patches/use_libapr1.patch 2012-02-18 15:00:10.000000000 +0000 @@ -1,7 +1,5 @@ -Index: monodevelop.git/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs -=================================================================== ---- monodevelop.git.orig/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs 2011-06-24 00:10:16.000000000 +0100 -+++ monodevelop.git/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs 2011-06-24 00:10:56.000000000 +0100 +--- a/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs ++++ b/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs @@ -14,15 +14,6 @@ public static LibApr GetLib (int ver) { diff -Nru monodevelop-2.8.6.3+dfsg/debian/patches/use_libsvn1.patch monodevelop-2.8.6.3+dfsg/debian/patches/use_libsvn1.patch --- monodevelop-2.8.6.3+dfsg/debian/patches/use_libsvn1.patch 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/patches/use_libsvn1.patch 2012-02-18 15:00:10.000000000 +0000 @@ -1,7 +1,5 @@ -Index: monodevelop/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient.cs -=================================================================== ---- monodevelop.orig/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient.cs 2011-12-19 11:11:30.000000000 +0000 -+++ monodevelop/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient.cs 2011-12-19 11:16:14.000000000 +0000 +--- a/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient.cs ++++ b/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient.cs @@ -22,10 +22,6 @@ public static LibSvnClient GetLib () { diff -Nru monodevelop-2.8.6.3+dfsg/debian/rules monodevelop-2.8.6.3+dfsg/debian/rules --- monodevelop-2.8.6.3+dfsg/debian/rules 2012-02-05 09:36:27.000000000 +0000 +++ monodevelop-2.8.6.3+dfsg/debian/rules 2012-02-18 15:00:10.000000000 +0000 @@ -9,12 +9,7 @@ DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2) VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//') -include /usr/share/cli-common/cli.make - override_dh_auto_configure: - aclocal -I. - autoconf - automake --add-missing --copy dh_auto_configure -- \ --disable-update-mimedb \ --disable-update-desktopdb \ @@ -37,11 +32,6 @@ override_dh_auto_test: # skip "make test" -override_dh_clean: - dh_clean - rm -rf configure config.sub config.guess ltmain.sh aclocal.m4 autom4te.cache/ - find . -name "Makefile.in" -delete - override_dh_auto_install: dh_auto_install # install missing DLL maps @@ -82,6 +72,6 @@ rm -r $(DEB_SOURCE_NAME)-$(VERSION) %: - dh $@ + dh $@ --with cli,autoreconf .PHONY: get-orig-source