[Pkg-cli-apps-commits] [SCM] monodevelop branch, master-experimental, updated. debian/2.4.1+dfsg-1-11-g28a6814

[Jo Shields]

The following commit has been merged in the master-experimental branch:
commit 0f7e9bf326cbb11e455349eb3655de610ed848f0
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Jun 24 00:19:49 2011 +0100

    Refresh debian/patches/remove_support_for_moonlight

diff --git a/debian/patches/remove_support_for_moonlight.patch b/debian/patches/remove_support_for_moonlight.patch
index 08a6caf..a622e18 100644
--- a/debian/patches/remove_support_for_moonlight.patch
+++ b/debian/patches/remove_support_for_moonlight.patch
@@ -1,7 +1,7 @@
 Index: monodevelop.git/monodevelop-core-addins.pc.in
 ===================================================================
---- monodevelop.git.orig/monodevelop-core-addins.pc.in	2010-06-11 13:52:00.848569868 +0100
-+++ monodevelop.git/monodevelop-core-addins.pc.in	2010-06-16 12:36:47.158579102 +0100
+--- 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
 @@ -6,4 +6,4 @@
  Name: MonoDevelop Core Add-ins
  Description: MonoDevelop Core Add-ins
@@ -10,9 +10,9 @@ Index: monodevelop.git/monodevelop-core-addins.pc.in
 +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
 ===================================================================
---- monodevelop.git.orig/src/addins/Makefile.am	2010-06-11 13:52:01.068569754 +0100
-+++ monodevelop.git/src/addins/Makefile.am	2010-06-16 12:36:47.168582259 +0100
-@@ -1,33 +1,32 @@
+--- 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 \
@@ -45,7 +45,6 @@ Index: monodevelop.git/src/addins/Makefile.am
 -	MonoDevelop.CodeMetrics \
 -	MonoDevelop.Debugger.Soft \
 -	WindowsPlatform \
--	MonoDevelop.HexEditor
 +SUBDIRS = \
 +	MacPlatform \
 +	GnomePlatform \
@@ -76,12 +75,14 @@ Index: monodevelop.git/src/addins/Makefile.am
 +	MonoDevelop.CodeMetrics \
 +	MonoDevelop.Debugger.Soft \
 +	WindowsPlatform \
-+	MonoDevelop.HexEditor
+ 	MonoDevelop.HexEditor \
+-	MonoDevelop.DocFood
++	MonoDevelop.DocFood
 Index: monodevelop.git/configure.in
 ===================================================================
---- monodevelop.git.orig/configure.in	2010-06-16 12:37:35.958569809 +0100
-+++ monodevelop.git/configure.in	2010-06-16 12:37:49.308571279 +0100
-@@ -366,7 +366,6 @@
+--- 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 @@
  src/addins/WindowsPlatform/Makefile
  src/addins/MonoDevelop.AssemblyBrowser/Makefile
  src/addins/MonoDevelop.SourceEditor2/Makefile
@@ -89,20 +90,20 @@ Index: monodevelop.git/configure.in
  src/addins/MonoDevelop.XmlEditor/Makefile
  src/addins/MonoDevelop.CodeMetrics/Makefile
  src/addins/MonoDevelop.Refactoring/Makefile
-@@ -376,7 +375,6 @@
+@@ -332,7 +331,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
- tests/UnitTests/Makefile
 Index: monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/Makefile.am
 ===================================================================
---- monodevelop.git.orig/src/addins/MonoDevelop.Debugger.Soft/Makefile.am	2010-06-16 12:37:20.778579690 +0100
-+++ monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/Makefile.am	2010-06-16 12:37:28.488580745 +0100
-@@ -2,5 +2,4 @@
- 	Mono.Debugger.Soft \
+--- 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
+@@ -1,5 +1,4 @@
+ SUBDIRS = \
  	Mono.Debugging.Soft \
  	MonoDevelop.Debugger.Soft \
 -	MonoDevelop.Debugger.Soft.AspNet \

-- 
monodevelop