[Pkg-mono-svn-commits] rev 2662 - in non-group/monodevelop/trunk/debian: . patches

Mirco Bauer meebey-guest at costa.debian.org
Mon Aug 14 20:23:48 UTC 2006


Author: meebey-guest
Date: 2006-08-14 20:23:46 +0000 (Mon, 14 Aug 2006)
New Revision: 2662

Added:
   non-group/monodevelop/trunk/debian/patches/fix_registering_2.0_system_assemblies.dpatch
Modified:
   non-group/monodevelop/trunk/debian/changelog
   non-group/monodevelop/trunk/debian/control
   non-group/monodevelop/trunk/debian/patches/00list
Log:
- CLR 2.0 bugfix.
- boo bugfix.



Modified: non-group/monodevelop/trunk/debian/changelog
===================================================================
--- non-group/monodevelop/trunk/debian/changelog	2006-08-12 16:57:56 UTC (rev 2661)
+++ non-group/monodevelop/trunk/debian/changelog	2006-08-14 20:23:46 UTC (rev 2662)
@@ -1,3 +1,19 @@
+monodevelop (0.11-1pre1) unstable; urgency=medium
+
+   * debian/patches/fix_registering_2.0_system_assemblies.dpatch:
+     + When the /usr/lib/mono/2.0 directory doesn't exist, the
+       initialization of the references failed. (Closes: #381598)
+   * debian/patches/libstetic-dllmap.dpatch:
+     + Adds libmetacity-private.so.0 to dllmap
+       (thanks to Sebastian 'slomo' Dröge)
+   * debian/control:
+     + Added libmetactiy-dev to build-deps
+     + Added boo (= 0.7.6.2237-3) to Build-Conflicts-Indep, as that version
+       accidentlly links against CLR 2.0 which breaks the monodevelop-boo
+       plugin. (for more details check this boo bugreport: #382700)
+
+ -- Mirco Bauer <meebey at meebey.net>  Sat, 12 Aug 2006 20:14:18 +0200
+
 monodevelop (0.11-1) unstable; urgency=low
 
    * New upstream release

Modified: non-group/monodevelop/trunk/debian/control
===================================================================
--- non-group/monodevelop/trunk/debian/control	2006-08-12 16:57:56 UTC (rev 2661)
+++ non-group/monodevelop/trunk/debian/control	2006-08-14 20:23:46 UTC (rev 2662)
@@ -3,13 +3,14 @@
 Priority: optional
 Maintainer: Mirco Bauer <meebey at meebey.net>
 Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.4.0), mono-mcs (>= 1.1.10) | c-sharp-compiler, libmono-dev (>= 1.1.10), boo (>= 0.7.5.2013), ikvm (>= 0.10), monodoc-base (>= 1.1.9), intltool, gtk-sharp2-gapi (>= 2.4.0), libgtk2.0-cil (>= 2.4.0), libgnome2.0-cil (>= 2.4.0), libgconf2.0-cil (>= 2.4.0), libglade2.0-cil (>= 2.4.0), libvte2.0-cil (>= 2.4.0), libgtksourceview2.0-cil (>= 0.10), libgecko2.0-cil (>= 0.10), libnunit2.2-cil (>= 2.2.0), libmono-oracle1.0-cil, libmono-bytefx0.7.6.1-cil, libmono-npgsql1.0-cil, libmono-sqlite1.0-cil, libmono-cecil0.4-cil (>= 0.4.1+svn20060703-2), liblog4net1.2-cil, libmono-firebirdsql1.7-cil
+Build-Depends-Indep: cli-common-dev (>= 0.4.0), mono-mcs (>= 1.1.10) | c-sharp-compiler, libmono-dev (>= 1.1.10), boo (>= 0.7.5.2013), ikvm (>= 0.10), monodoc-base (>= 1.1.9), intltool, gtk-sharp2-gapi (>= 2.4.0), libgtk2.0-cil (>= 2.4.0), libgnome2.0-cil (>= 2.4.0), libgconf2.0-cil (>= 2.4.0), libglade2.0-cil (>= 2.4.0), libvte2.0-cil (>= 2.4.0), libgtksourceview2.0-cil (>= 0.10), libgecko2.0-cil (>= 0.10), libnunit2.2-cil (>= 2.2.0), libmono-oracle1.0-cil, libmono-bytefx0.7.6.1-cil, libmono-npgsql1.0-cil, libmono-sqlite1.0-cil, libmono-cecil0.4-cil (>= 0.4.1+svn20060703-2), liblog4net1.2-cil, libmono-firebirdsql1.7-cil, libmetacity-dev
+Build-Conflicts-Indep: boo (= 0.7.6.2237-3)
 Standards-Version: 3.6.2.1
 
 Package: monodevelop
 Architecture: all
 Suggests: monodevelop-boo, monodevelop-java, monodevelop-nunit, monodevelop-versioncontrol, monodevelop-query, nemerle
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, mono-mcs (>= 1.1.10), monodoc-manual (>= 1.1.9), pkg-config, gnome-icon-theme (>= 1.1.3), xterm | x-terminal-emulator
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, mono-mcs (>= 1.1.10), monodoc-manual (>= 1.1.9), pkg-config, gnome-icon-theme (>= 1.1.3), xterm | x-terminal-emulator, metacity
 Provides: monodoc-viewer
 Description: C#/Boo/Java/Nemerle/ILasm Development Environment
  MonoDevelop is a GNOME IDE primarily designed for C# and other .NET

Modified: non-group/monodevelop/trunk/debian/patches/00list
===================================================================
--- non-group/monodevelop/trunk/debian/patches/00list	2006-08-12 16:57:56 UTC (rev 2661)
+++ non-group/monodevelop/trunk/debian/patches/00list	2006-08-14 20:23:46 UTC (rev 2662)
@@ -5,3 +5,5 @@
 remove_gtk-sharp-1.0_support
 glade_wrong_file_extension
 use_xulrunner
+fix_registering_2.0_system_assemblies
+libstetic-dllmap

Added: non-group/monodevelop/trunk/debian/patches/fix_registering_2.0_system_assemblies.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/fix_registering_2.0_system_assemblies.dpatch	2006-08-12 16:57:56 UTC (rev 2661)
+++ non-group/monodevelop/trunk/debian/patches/fix_registering_2.0_system_assemblies.dpatch	2006-08-14 20:23:46 UTC (rev 2662)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_registering_2.0_system_assemblies.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.11~/Core/src/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs monodevelop-0.11/Core/src/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs
+--- monodevelop-0.11~/Core/src/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs	2006-08-12 20:15:56.000000000 +0200
++++ monodevelop-0.11/Core/src/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs	2006-08-12 20:16:22.000000000 +0200
+@@ -173,7 +173,9 @@
+ 				prefix = Path.GetDirectoryName (prefix);
+ 			
+ 			RegisterSystemAssemblies (prefix, "1.0", ClrVersion.Net_1_1);
+-			RegisterSystemAssemblies (prefix, "2.0", ClrVersion.Net_2_0);
++
++			if (Directory.Exists (Path.Combine (prefix, "2.0")))
++				RegisterSystemAssemblies (prefix, "2.0", ClrVersion.Net_2_0);
+ 
+ 			string search_dirs = Environment.GetEnvironmentVariable ("PKG_CONFIG_PATH");
+ 			string libpath = Environment.GetEnvironmentVariable ("PKG_CONFIG_LIBPATH");


Property changes on: non-group/monodevelop/trunk/debian/patches/fix_registering_2.0_system_assemblies.dpatch
___________________________________________________________________
Name: svn:executable
   + *




More information about the Pkg-mono-svn-commits mailing list