[Pkg-cli-apps-commits] [SCM] monodevelop-boo branch, master, updated. debian/2.4-2

[Jo Shields]

The following commit has been merged in the master branch:
commit 2c2db4e54e1314d1ac9ca5a65bba745bc1e14473
Author: Jo Shields <directhex at apebox.org>
Date:   Wed Jun 16 22:28:42 2010 +0100

    remove obsolete patch

diff --git a/debian/changelog b/debian/changelog
index 5e00e70..48fc714 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ monodevelop-boo (2.4-1) UNRELEASED; urgency=low
     + Don't use version number hack in dependencies, since it's 2.4 everywhere
   * debian/patches/allow_minimal_configure_for_clean.dpatch:
     + Refreshed
+  * debian/patches/build_against_gtksourceview2-sharp.dpatch:
+    + Remove patch (GtkSourceview is no longer used)
 
  -- Jo Shields <directhex at apebox.org>  Wed, 16 Jun 2010 22:04:16 +0100
 
diff --git a/debian/patches/00list b/debian/patches/00list
index dc180ca..b996803 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1 @@
 allow_minimal_configure_for_clean
-build_against_gtksourceview2-sharp
diff --git a/debian/patches/build_against_gtksourceview2-sharp.dpatch b/debian/patches/build_against_gtksourceview2-sharp.dpatch
deleted file mode 100755
index dbfcb49..0000000
--- a/debian/patches/build_against_gtksourceview2-sharp.dpatch
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build_against_gtksourceview2-sharp.dpatch by Jo Shields <directhex at apebox.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Port Boo addin to use GTKSourceView2 API. Thanks to Peter Johanson for
-## DP: providing the port for ShellTextView.boo
-
- at DPATCH@
-diff -urNad monodevelop-boo-2.2~/BooBinding.make monodevelop-boo-2.2/BooBinding.make
---- monodevelop-boo-2.2~/BooBinding.make	2010-01-11 14:08:38.000000000 +0000
-+++ monodevelop-boo-2.2/BooBinding.make	2010-01-11 14:09:56.000000000 +0000
-@@ -93,7 +93,7 @@
- 	-pkg:boo \
- 	-pkg:gconf-sharp-2.0 \
- 	-pkg:gtk-sharp-2.0 \
--	-pkg:gtksourceview-sharp-2.0 \
-+	-pkg:gtksourceview2-sharp \
- 	-pkg:mono-addins \
- 	-pkg:monodevelop \
- 	-pkg:monodevelop-core-addins \
-diff -urNad monodevelop-boo-2.2~/configure monodevelop-boo-2.2/configure
---- monodevelop-boo-2.2~/configure	2010-01-11 14:08:38.000000000 +0000
-+++ monodevelop-boo-2.2/configure	2010-01-11 14:11:28.000000000 +0000
-@@ -4,7 +4,7 @@
- prefix=/usr/local
- config=DEBUG
- configurations=" RELEASE DEBUG"
--required_packages="gtk-sharp-2.0;2.12.8 monodevelop;2.2 mono-addins;0.3 glib-sharp-2.0;2.12.8 monodevelop-core-addins;2.2 boo;0.7.9.2659 gconf-sharp-2.0;2.12.8 gtksourceview-sharp-2.0;0.11"
-+required_packages="gtk-sharp-2.0;2.12.8 monodevelop;2.2 mono-addins;0.3 glib-sharp-2.0;2.12.8 monodevelop-core-addins;2.2 boo;0.7.9.2659 gconf-sharp-2.0;2.12.8 gtksourceview2-sharp;2.20"
- 
- usage ()
- {
-diff -urNad monodevelop-boo-2.2~/Gui/ShellTextView.boo monodevelop-boo-2.2/Gui/ShellTextView.boo
---- monodevelop-boo-2.2~/Gui/ShellTextView.boo	2010-01-11 14:08:38.000000000 +0000
-+++ monodevelop-boo-2.2/Gui/ShellTextView.boo	2010-01-11 14:10:43.000000000 +0000
-@@ -76,17 +76,26 @@
- 	
- 	def constructor(model as IShellModel):
- 		
--		manager = SourceLanguagesManager()
--		lang = manager.GetLanguageFromMimeType(model.MimeType)
-+		manager = SourceLanguageManager()
-+		for id in manager.LanguageIds:
-+			lang = manager.GetLanguage(id)
-+			continue if not lang
-+
-+			if Array.IndexOf (lang.MimeTypes, model.MimeType) < 0:
-+				lang = null
-+				continue
-+			else:
-+				break
-+
- 		if lang != null:
- 			buf = SourceBuffer(lang)
- 		else:
--			buf = SourceBuffer(GtkSourceView.SourceTagTable())
-+			buf = SourceBuffer(TextTagTable ())
- 
- 		// This freaks out booc for some reason.
--		//super(buf, Highlight: true)
-+		//super(buf, HighlightSyntax: true)
- 		super(buf)
--		buf.Highlight = true
-+		buf.HighlightSyntax = true
- 
- 		self.model = model
- 		self.WrapMode = Gtk.WrapMode.Word

-- 
monodevelop-boo