[Pkg-cli-apps-commits] [SCM] monodevelop branch, master-experimental, updated. debian/2.6+dfsg-1-10-gdfdeb30

[Jo Shields]

The following commit has been merged in the master-experimental branch:
commit 6d742974813a94a507eed36ced290ba4b7ce6af1
Author: Jo Shields <directhex at apebox.org>
Date:   Tue Nov 8 01:00:06 2011 +0000

    Refresh debian/patches/remove_support_for_moonlight.patch.

diff --git a/debian/patches/remove_support_for_moonlight.patch b/debian/patches/remove_support_for_moonlight.patch
index a622e18..05318ba 100644
--- a/debian/patches/remove_support_for_moonlight.patch
+++ b/debian/patches/remove_support_for_moonlight.patch
@@ -1,88 +1,30 @@
-Index: monodevelop.git/monodevelop-core-addins.pc.in
+Index: monodevelop/monodevelop-core-addins.pc.in
 ===================================================================
---- monodevelop.git.orig/monodevelop-core-addins.pc.in	2011-06-23 23:07:39.000000000 +0100
-+++ monodevelop.git/monodevelop-core-addins.pc.in	2011-06-24 00:19:06.000000000 +0100
+--- 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
 @@ -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.git/src/addins/Makefile.am
+Index: monodevelop/src/addins/Makefile.am
 ===================================================================
---- monodevelop.git.orig/src/addins/Makefile.am	2011-06-23 23:13:22.000000000 +0100
-+++ monodevelop.git/src/addins/Makefile.am	2011-06-24 00:19:22.000000000 +0100
-@@ -1,34 +1,33 @@
- 
--SUBDIRS = \
--	MacPlatform \
--	GnomePlatform \
--	MonoDevelop.DesignerSupport \
--	MonoDevelop.Debugger \
--	Deployment \
--	MonoDevelop.Refactoring \
--	MonoDevelop.SourceEditor2 \
--	VersionControl \
--	MonoDevelop.Autotools \
--	MonoDevelop.Gettext \
--	MonoDevelop.XmlEditor \
--	TextTemplating \
--	AspNet \
--	CSharpBinding \
--	ILAsmBinding \
--	NUnit \
--	MonoDeveloperExtensions \
--	VBNetBinding \
--	prj2make-sharp-lib \
--	WelcomePage \
--	MonoDevelop.GtkCore \
--	ChangeLogAddIn \
--	MonoDevelop.WebReferences \
--	MonoDevelop.RegexToolkit \
--	CBinding \
--	MonoDevelop.AssemblyBrowser \
--	MonoDevelop.Moonlight \
--	MonoDevelop.CodeMetrics \
--	MonoDevelop.Debugger.Soft \
--	WindowsPlatform \
-+SUBDIRS = \
-+	MacPlatform \
-+	GnomePlatform \
-+	MonoDevelop.DesignerSupport \
-+	MonoDevelop.Debugger \
-+	Deployment \
-+	MonoDevelop.Refactoring \
-+	MonoDevelop.SourceEditor2 \
-+	VersionControl \
-+	MonoDevelop.Autotools \
-+	MonoDevelop.Gettext \
-+	MonoDevelop.XmlEditor \
-+	TextTemplating \
-+	AspNet \
-+	CSharpBinding \
-+	ILAsmBinding \
-+	NUnit \
-+	MonoDeveloperExtensions \
-+	VBNetBinding \
-+	prj2make-sharp-lib \
-+	WelcomePage \
-+	MonoDevelop.GtkCore \
-+	ChangeLogAddIn \
-+	MonoDevelop.WebReferences \
-+	MonoDevelop.RegexToolkit \
-+	CBinding \
-+	MonoDevelop.AssemblyBrowser \
-+	MonoDevelop.CodeMetrics \
-+	MonoDevelop.Debugger.Soft \
-+	WindowsPlatform \
- 	MonoDevelop.HexEditor \
--	MonoDevelop.DocFood
-+	MonoDevelop.DocFood
-Index: monodevelop.git/configure.in
+--- 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
+@@ -26,7 +26,6 @@
+ 	MonoDevelop.RegexToolkit \
+ 	CBinding \
+ 	MonoDevelop.AssemblyBrowser \
+-	MonoDevelop.Moonlight \
+ 	MonoDevelop.CodeMetrics \
+ 	MonoDevelop.Debugger.Soft \
+ 	WindowsPlatform \
+Index: monodevelop/configure.in
 ===================================================================
---- monodevelop.git.orig/configure.in	2011-06-23 23:13:22.000000000 +0100
-+++ monodevelop.git/configure.in	2011-06-24 00:19:06.000000000 +0100
-@@ -323,7 +323,6 @@
+--- monodevelop.orig/configure.in	2011-11-08 00:33:54.000000000 +0000
++++ monodevelop/configure.in	2011-11-08 00:59:11.000000000 +0000
+@@ -331,7 +331,6 @@
  src/addins/WindowsPlatform/Makefile
  src/addins/MonoDevelop.AssemblyBrowser/Makefile
  src/addins/MonoDevelop.SourceEditor2/Makefile
@@ -90,18 +32,18 @@ Index: monodevelop.git/configure.in
  src/addins/MonoDevelop.XmlEditor/Makefile
  src/addins/MonoDevelop.CodeMetrics/Makefile
  src/addins/MonoDevelop.Refactoring/Makefile
-@@ -332,7 +331,6 @@
+@@ -340,7 +339,6 @@
  src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Makefile
  src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile
  src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile
 -src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile
  src/addins/MonoDevelop.HexEditor/Makefile
  src/addins/MonoDevelop.DocFood/Makefile
- tests/Makefile
-Index: monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/Makefile.am
+ src/addins/MonoDevelop.MacDev/Makefile
+Index: monodevelop/src/addins/MonoDevelop.Debugger.Soft/Makefile.am
 ===================================================================
---- monodevelop.git.orig/src/addins/MonoDevelop.Debugger.Soft/Makefile.am	2011-06-23 23:07:40.000000000 +0100
-+++ monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/Makefile.am	2011-06-24 00:19:06.000000000 +0100
+--- 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
 @@ -1,5 +1,4 @@
  SUBDIRS = \
  	Mono.Debugging.Soft \

-- 
monodevelop