[Pkg-mono-svn-commits] rev 1289 - in monodevelop/trunk/debian: . patches
Mirco Bauer
meebey-guest@haydn.debian.org
Sun, 08 Aug 2004 06:34:05 -0600
Author: meebey-guest
Date: 2004-08-08 06:33:52 -0600 (Sun, 08 Aug 2004)
New Revision: 1289
Added:
monodevelop/trunk/debian/patches/01_spawn_xterm_fix.dpatch
Removed:
monodevelop/trunk/debian/patches/01_motd_crash.dpatch
Modified:
monodevelop/trunk/debian/changelog
monodevelop/trunk/debian/control
Log:
- Mono BSP, fixing x-terminal-emulator bug (Closes: #260404)
Modified: monodevelop/trunk/debian/changelog
===================================================================
--- monodevelop/trunk/debian/changelog 2004-08-08 12:26:00 UTC (rev 1288)
+++ monodevelop/trunk/debian/changelog 2004-08-08 12:33:52 UTC (rev 1289)
@@ -1,10 +1,17 @@
monodevelop (0.5-2) unstable; urgency=low
* NOT RELEASED YET
+ * Mono BSP
* Mirco 'meebey' Bauer
+ added pkg-config dependency (Closes: #262491)
+ + added 01_spawn_xterm_fix patch
+ upstream depends stricly on xterm to execute the programs compiled with
+ monodevelop. The command uses xterm -e and run a shell "read" at the
+ end. This doesn't work with other x-terminal-emulators, they don't spawn
+ a shell for the command. x-terminal-emulator -e with -c fixes this.
+ (Closes: #260404)
- -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org> Sat, 03 Jul 2004 16:34:14 +0200
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org> Sun, 08 Aug 2004 13:42:14 +0200
monodevelop (0.5-1) unstable; urgency=low
Modified: monodevelop/trunk/debian/control
===================================================================
--- monodevelop/trunk/debian/control 2004-08-08 12:26:00 UTC (rev 1288)
+++ monodevelop/trunk/debian/control 2004-08-08 12:33:52 UTC (rev 1289)
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>
Uploaders: Eduard Bloch <blade@debian.org>, Mirco Bauer <meebey@meebey.net>, Michael Schiansky <ms@debian.org>
-Build-Depends: debhelper (>= 4.0.0), mono-mcs (>= 1.0) | c-sharp-compiler, mono-utils (>= 0.96), libmono-dev (>= 1.0), libglade2-dev (>= 2.0.0), libgnome2-dev, libgtksourceview-dev (>= 0.7), libgnomevfs2-dev (>= 2.0), liborbit2-dev (>= 2.8.3), intltool, mozilla-dev, gtk-sharp-gapi (>= 1.0), libgtk-cil (>= 1.0), libgnome-cil (>= 1.0), libgconf-cil (>= 1.0), libglade-cil (>= 1.0), libgtksourceview-cil (>= 0.5), libgecko-cil (>= 0.5), monodoc-base (>= 1.0), dpatch
+Build-Depends: debhelper (>= 4.0.0), dpatch, mono-mcs (>= 1.0) | c-sharp-compiler, mono-utils (>= 0.96), libmono-dev (>= 1.0), libglade2-dev (>= 2.0.0), libgnome2-dev, libgtksourceview-dev (>= 0.7), libgnomevfs2-dev (>= 2.0), liborbit2-dev (>= 2.8.3), intltool, mozilla-dev, gtk-sharp-gapi (>= 1.0), libgtk-cil (>= 1.0), libgnome-cil (>= 1.0), libgconf-cil (>= 1.0), libglade-cil (>= 1.0), libgtksourceview-cil (>= 0.5), libgecko-cil (>= 0.5), monodoc-base (>= 1.0)
Standards-Version: 3.6.1
Package: monodevelop
Architecture: any
-Depends: ${net:Depends}, ${shlibs:Depends}, xterm | x-terminal-emulator, mono-mcs, monodoc-manual, pkg-config, gnome-icon-theme (>= 1.1.3)
+Depends: ${net:Depends}, ${shlibs:Depends}, x-terminal-emulator, mono-mcs, monodoc-manual, pkg-config, gnome-icon-theme (>= 1.1.3)
Provides: monodoc-viewer
Description: C#/Java/Nermele/ILasm Development Environment
MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
Deleted: monodevelop/trunk/debian/patches/01_motd_crash.dpatch
===================================================================
--- monodevelop/trunk/debian/patches/01_motd_crash.dpatch 2004-08-08 12:26:00 UTC (rev 1288)
+++ monodevelop/trunk/debian/patches/01_motd_crash.dpatch 2004-08-08 12:33:52 UTC (rev 1289)
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## 02_soname_map.dpatch by Eduard Bloch <blade@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix for the crash on displaying the MOTD
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p0 ${patch_opts} < $0;;
- -unpatch) patch -R -p0 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-Index: src/Main/Base/Commands/AutostartCommands.cs
-===================================================================
---- src/Main/Base/Commands/AutostartCommands.cs (revision 1799)
-+++ src/Main/Base/Commands/AutostartCommands.cs (revision 1800)
-@@ -197,10 +197,10 @@
- ((Gtk.Window)WorkbenchSingleton.Workbench).Present ();
-
- // Give Gtk time to display the workbench window before showing the TOTD.
-- while (Gtk.Application.EventsPending ())
-- Gtk.Application.RunIteration ();
-+ //while (Gtk.Application.EventsPending ())
-+ // Gtk.Application.RunIteration ();
-
-- ShowTipOfTheDay (null, null);
-+ //ShowTipOfTheDay (null, null);
-
- // finally run the workbench window ...
- Gtk.Application.Run ();
Added: monodevelop/trunk/debian/patches/01_spawn_xterm_fix.dpatch
===================================================================
--- monodevelop/trunk/debian/patches/01_spawn_xterm_fix.dpatch 2004-08-08 12:26:00 UTC (rev 1288)
+++ monodevelop/trunk/debian/patches/01_spawn_xterm_fix.dpatch 2004-08-08 12:33:52 UTC (rev 1289)
@@ -0,0 +1,105 @@
+#! /bin/sh -e
+## 01_spawn_xterm_fix.dpatch by <meebey@redbull.qnetp.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/meebey/data/projects/debian/pkg-mono/monodevelop/monodevelop-0.5/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs monodevelop-0.5/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs
+--- /home/meebey/data/projects/debian/pkg-mono/monodevelop/monodevelop-0.5/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs 2004-06-27 06:02:55.000000000 +0200
++++ monodevelop-0.5/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs 2004-08-08 14:26:00.000000000 +0200
+@@ -80,9 +80,9 @@
+ }
+
+ //if (parameters.CompileTarget != CompileTarget.WinExe && parameters.PauseConsoleOutput) {
+- psi = new ProcessStartInfo("xterm",
++ psi = new ProcessStartInfo("x-terminal-emulator",
+ string.Format (
+- @"-e ""{0} '{1}{2}' {3} ; echo; read -p 'press any key to continue...' -n1""",
++ @"-e /bin/sh -c ""{0} '{1}{2}' {3} ; echo; read -p 'press any key to continue...' -n1""",
+ runtimeStarter, directory, exe, args));
+ psi.UseShellExecute = false;
+ //} else {
+diff -urNad /home/meebey/data/projects/debian/pkg-mono/monodevelop/monodevelop-0.5/src/AddIns/BackendBindings/ILAsmBinding/ILAsmExecutionManager.cs monodevelop-0.5/src/AddIns/BackendBindings/ILAsmBinding/ILAsmExecutionManager.cs
+--- /home/meebey/data/projects/debian/pkg-mono/monodevelop/monodevelop-0.5/src/AddIns/BackendBindings/ILAsmBinding/ILAsmExecutionManager.cs 2004-06-27 06:02:52.000000000 +0200
++++ monodevelop-0.5/src/AddIns/BackendBindings/ILAsmBinding/ILAsmExecutionManager.cs 2004-08-08 14:26:45.000000000 +0200
+@@ -45,9 +45,9 @@
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+
+ string exe = Path.GetFullPath(Path.Combine(parameters.OutputDirectory, parameters.OutputAssembly) + ".exe");
+- string fullCommand = String.Format ("-e \"mono {0};read -p 'press any key to continue...' -n1\"", exe);
++ string fullCommand = String.Format ("-e /bin/sh -c \"mono {0};read -p 'press any key to continue...' -n1\"", exe);
+ Console.WriteLine (fullCommand);
+- ProcessStartInfo psi = new ProcessStartInfo("xterm", fullCommand);
++ ProcessStartInfo psi = new ProcessStartInfo("x-terminal-emulator", fullCommand);
+ psi.WorkingDirectory = Path.GetDirectoryName (exe);
+ psi.UseShellExecute = false;
+ Process p = Process.Start (psi);
+diff -urNad /home/meebey/data/projects/debian/pkg-mono/monodevelop/monodevelop-0.5/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs monodevelop-0.5/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs
+--- /home/meebey/data/projects/debian/pkg-mono/monodevelop/monodevelop-0.5/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs 2004-06-27 06:02:56.000000000 +0200
++++ monodevelop-0.5/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs 2004-08-08 14:29:10.000000000 +0200
+@@ -51,25 +51,25 @@
+ string javaExec;
+ switch (parameters.Runtime) {
+ case JavaRuntime.Ikvm:
+- javaExec = "-e \"ikvm -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
++ javaExec = "-e /bin/sh -c \"ikvm -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
+ break;
+ // FIXME: need to both compile with ikvmc
+ // and then run with mono
+ case JavaRuntime.Mono:
+- javaExec = "-e \"ikvm -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
++ javaExec = "-e /bin/sh -c \"ikvm -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
+ break;
+ case JavaRuntime.Java:
+- javaExec = "-e \"java -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
++ javaExec = "-e /bin/sh -c \"java -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
+ break;
+ case JavaRuntime.Gij:
+- javaExec = "-e \"gij -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
++ javaExec = "-e /bin/sh -c \"gij -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
+ break;
+ default:
+- javaExec = "-e \"ikvm -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
++ javaExec = "-e /bin/sh -c \"ikvm -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
+ break;
+ }
+
+- ProcessStartInfo psi = new ProcessStartInfo("xterm", javaExec);
++ ProcessStartInfo psi = new ProcessStartInfo("x-terminal-emulator", javaExec);
+
+ try {
+ psi.WorkingDirectory = Path.GetDirectoryName (directory);
+diff -urNad /home/meebey/data/projects/debian/pkg-mono/monodevelop/monodevelop-0.5/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs monodevelop-0.5/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs
+--- /home/meebey/data/projects/debian/pkg-mono/monodevelop/monodevelop-0.5/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs 2004-06-27 06:02:53.000000000 +0200
++++ monodevelop-0.5/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs 2004-08-08 14:27:19.000000000 +0200
+@@ -40,9 +40,9 @@
+ exe += " " + p.OutputAssembly + ".exe " + p.Parameters;
+
+ try {
+- ProcessStartInfo psi = new ProcessStartInfo("xterm",
++ ProcessStartInfo psi = new ProcessStartInfo("x-terminal-emulator",
+ string.Format (
+- @"-e ""{0} ;echo;read -p 'press any key to continue...' -n1""",
++ @"-e /bin/sh -c ""{0} ;echo;read -p 'press any key to continue...' -n1""",
+ exe));
+ psi.WorkingDirectory = fus.GetDirectoryNameWithSeparator(p.OutputDirectory);
+ psi.UseShellExecute = false;
Property changes on: monodevelop/trunk/debian/patches/01_spawn_xterm_fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *