[Pkg-cli-apps-commits] [SCM] monodevelop branch, master, updated. debian/2.8.6.3+dfsg-1-2-gad86e5e
Julian Taylor
jtaylor.debian at googlemail.com
Sun Feb 12 21:45:10 UTC 2012
The following commit has been merged in the master branch:
commit ad86e5e80831fab833b053a0637c56a01c274314
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Feb 12 22:40:33 2012 +0100
refresh all patches
diff --git a/debian/patches/boo_mimetype.patch b/debian/patches/boo_mimetype.patch
index ad449f6..0eae67d 100644
--- a/debian/patches/boo_mimetype.patch
+++ b/debian/patches/boo_mimetype.patch
@@ -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 @@
<comment xml:lang="en">Nemerle source</comment>
<glob pattern="*.n"/>
diff --git a/debian/patches/generate_automake_1.11.2_compatible_makefiles.patch b/debian/patches/generate_automake_1.11.2_compatible_makefiles.patch
index 317f414..2a5c763 100644
--- a/debian/patches/generate_automake_1.11.2_compatible_makefiles.patch
+++ b/debian/patches/generate_automake_1.11.2_compatible_makefiles.patch
@@ -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 --git a/debian/patches/no_appmenu b/debian/patches/no_appmenu
index fa1e06b..d8fefe0 100644
--- a/debian/patches/no_appmenu
+++ b/debian/patches/no_appmenu
@@ -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 --git a/debian/patches/remove_support_for_moonlight.patch b/debian/patches/remove_support_for_moonlight.patch
index 05318ba..60240fc 100644
--- a/debian/patches/remove_support_for_moonlight.patch
+++ b/debian/patches/remove_support_for_moonlight.patch
@@ -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 @@ Index: monodevelop/src/addins/Makefile.am
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 @@ Index: monodevelop/configure.in
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 --git a/debian/patches/update_templates_for_gtk-sharp_2.12.patch b/debian/patches/update_templates_for_gtk-sharp_2.12.patch
index 4c6bc1b..efa3316 100644
--- a/debian/patches/update_templates_for_gtk-sharp_2.12.patch
+++ b/debian/patches/update_templates_for_gtk-sharp_2.12.patch
@@ -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 @@
<References>
@@ -21,10 +19,8 @@ Index: monodevelop/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml
</References>
<Files>
-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 @@
<References>
diff --git a/debian/patches/use_csc.patch b/debian/patches/use_csc.patch
index 31d5fd6..bdf1ab3 100644
--- a/debian/patches/use_csc.patch
+++ b/debian/patches/use_csc.patch
@@ -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 @@ Index: monodevelop/contrib/Mono.Cecil/Makefile.am
$(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 @@
<OutputType>Library</OutputType>
<RootNamespace>NGit</RootNamespace>
@@ -39,10 +35,8 @@ Index: monodevelop/contrib/NGit/NGit.csproj
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
-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 @@
<OutputType>Library</OutputType>
<RootNamespace>NSch</RootNamespace>
@@ -52,10 +46,8 @@ Index: monodevelop/contrib/NSch/NSch.csproj
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
-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 @@
<OutputType>Library</OutputType>
<RootNamespace>Sharpen</RootNamespace>
@@ -72,10 +64,8 @@ Index: monodevelop/contrib/Sharpen/Sharpen.csproj
-</Project>
\ No newline at end of file
+</Project>
-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 --git a/debian/patches/use_libapr1.patch b/debian/patches/use_libapr1.patch
index 4083574..8278bc0 100644
--- a/debian/patches/use_libapr1.patch
+++ b/debian/patches/use_libapr1.patch
@@ -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 --git a/debian/patches/use_libsvn1.patch b/debian/patches/use_libsvn1.patch
index 02b318b..7a290cd 100644
--- a/debian/patches/use_libsvn1.patch
+++ b/debian/patches/use_libsvn1.patch
@@ -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 ()
{
--
monodevelop
More information about the Pkg-cli-apps-commits
mailing list