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

[Eduard Bloch]

Author: blade
Date: 2004-06-28 13:04:07 -0600 (Mon, 28 Jun 2004)
New Revision: 1158

Added:
   monodevelop/trunk/debian/patches/
   monodevelop/trunk/debian/patches/00list
   monodevelop/trunk/debian/patches/01_motd_crash.dpatch
Modified:
   monodevelop/trunk/debian/control
   monodevelop/trunk/debian/rules
Log:
Dpatch for the icewm-vs.-MOTD crash


Modified: monodevelop/trunk/debian/control
===================================================================
--- monodevelop/trunk/debian/control	2004-06-28 18:18:05 UTC (rev 1157)
+++ monodevelop/trunk/debian/control	2004-06-28 19:04:07 UTC (rev 1158)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade@debian.org>, Mirco 'meebey' Bauer <mail@meebey.net>, Michael Schiansky <ms@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libmono-dev (>= 0.95), libglade2-dev (>= 2.0.0), mono-mcs (>= 0.95) | c-sharp-compiler, mono-mint [powerpc], mono-utils (>> 0.96), libgnome2-dev, libgtksourceview-dev (>= 0.7), libgnomevfs2-dev (>= 2.0), liborbit2-dev (>= 2.8.3), intltool, mozilla-dev, gtk-sharp-gapi (>= 0.93), libgtk-cil (>= 0.93), libgnome-cil (>= 0.93), libgconf-cil (>= 0.93), libglade-cil (>= 0.93), libgtksourceview-cil (>= 0.3), libgecko-cil (>= 0.4), monodoc-base (>= 0.16)
+Build-Depends: debhelper (>= 4.0.0), libmono-dev (>= 0.95), libglade2-dev (>= 2.0.0), mono-mcs (>= 0.95) | c-sharp-compiler, mono-mint [powerpc], mono-utils (>> 0.96), libgnome2-dev, libgtksourceview-dev (>= 0.7), libgnomevfs2-dev (>= 2.0), liborbit2-dev (>= 2.8.3), intltool, mozilla-dev, gtk-sharp-gapi (>= 0.93), libgtk-cil (>= 0.93), libgnome-cil (>= 0.93), libgconf-cil (>= 0.93), libglade-cil (>= 0.93), libgtksourceview-cil (>= 0.3), libgecko-cil (>= 0.4), monodoc-base (>= 0.16), dpatch
 Standards-Version: 3.6.1
 
 Package: monodevelop

Added: monodevelop/trunk/debian/patches/00list
===================================================================
--- monodevelop/trunk/debian/patches/00list	2004-06-28 18:18:05 UTC (rev 1157)
+++ monodevelop/trunk/debian/patches/00list	2004-06-28 19:04:07 UTC (rev 1158)
@@ -0,0 +1 @@
+01_motd_crash

Added: monodevelop/trunk/debian/patches/01_motd_crash.dpatch
===================================================================
--- monodevelop/trunk/debian/patches/01_motd_crash.dpatch	2004-06-28 18:18:05 UTC (rev 1157)
+++ monodevelop/trunk/debian/patches/01_motd_crash.dpatch	2004-06-28 19:04:07 UTC (rev 1158)
@@ -0,0 +1,43 @@
+#! /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 ();

Modified: monodevelop/trunk/debian/rules
===================================================================
--- monodevelop/trunk/debian/rules	2004-06-28 18:18:05 UTC (rev 1157)
+++ monodevelop/trunk/debian/rules	2004-06-28 19:04:07 UTC (rev 1158)
@@ -3,9 +3,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
+include /usr/share/dpatch/dpatch.make
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
 	# piece of crap
 	perl -pe ' \
@@ -21,7 +22,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f configure-stamp