Package: tomboy
Version: 0.12.0-0ubuntu1
Severity: normal
Tags: patch
Usertags: mono2transition
Hi,
I've prepared a patch to transition Tomboy. I'm just the conduit though
- James Westby did the real work :).
You'll find it attached here, please consider applying it.
Iain
-- System Information:
Debian Release: lenny/sid
APT prefers intrepid-updates
APT policy: (500, 'intrepid-updates'), (500, 'intrepid-security'), (500,
'intrepid-proposed'), (500, 'intrepid-backports'), (500, 'intrepid')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.27-10-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Index: debian/control
===================================================================
--- debian/control (revision 4347)
+++ debian/control (working copy)
@@ -5,12 +5,11 @@
Build-Depends: cdbs,
debhelper (>= 5),
autotools-dev,
- mono-gmcs (>= 1.1.13.4),
+ mono-devel (>= 2.0),
libgtk2.0-cil (>= 2.10.4-2),
libgnome2.0-cil (>= 2.16.1),
libgconf2.0-cil,
libgtkspell-dev (>= 2.0.9),
- libmono-dev (>= 1.1.13.4),
intltool,
libpanel-applet2-dev,
libgnomeprint2.2-dev,
Index: debian/patches/02_configurable_compiler.patch
===================================================================
--- debian/patches/02_configurable_compiler.patch (revision 0)
+++ debian/patches/02_configurable_compiler.patch (revision 0)
@@ -0,0 +1,261 @@
+diff -Nur -x '*.orig' -x '*~' tomboy-0.12.0/Makefile.include
tomboy-0.12.0.new/Makefile.include
+--- tomboy-0.12.0/Makefile.include 2008-09-22 13:11:22.000000000 +0100
++++ tomboy-0.12.0.new/Makefile.include 2008-12-01 00:48:36.000000000 +0000
+@@ -23,7 +23,7 @@
+ ## Build
+
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+
+ ## Runtime
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Mono.Addins/Mono.Addins/Makefile.in
tomboy-0.12.0.new/Mono.Addins/Mono.Addins/Makefile.in
+--- tomboy-0.12.0/Mono.Addins/Mono.Addins/Makefile.in 2008-09-22
13:11:44.000000000 +0100
++++ tomboy-0.12.0.new/Mono.Addins/Mono.Addins/Makefile.in 2008-12-01
00:49:52.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Mono.Addins/Mono.Addins.Gui/Makefile.in
tomboy-0.12.0.new/Mono.Addins/Mono.Addins.Gui/Makefile.in
+--- tomboy-0.12.0/Mono.Addins/Mono.Addins.Gui/Makefile.in 2008-09-22
13:11:44.000000000 +0100
++++ tomboy-0.12.0.new/Mono.Addins/Mono.Addins.Gui/Makefile.in 2008-12-01
00:49:46.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Mono.Addins/Mono.Addins.Setup/Makefile.in
tomboy-0.12.0.new/Mono.Addins/Mono.Addins.Setup/Makefile.in
+--- tomboy-0.12.0/Mono.Addins/Mono.Addins.Setup/Makefile.in 2008-09-22
13:11:44.000000000 +0100
++++ tomboy-0.12.0.new/Mono.Addins/Mono.Addins.Setup/Makefile.in
2008-12-01 00:49:01.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~' tomboy-0.12.0/test/Makefile.am
tomboy-0.12.0.new/test/Makefile.am
+--- tomboy-0.12.0/test/Makefile.am 2008-09-22 13:11:13.000000000 +0100
++++ tomboy-0.12.0.new/test/Makefile.am 2008-12-01 00:51:23.000000000 +0000
+@@ -1,4 +1,4 @@
+-CSC = gmcs
++CSC = $(GMCS)
+
+ TARGET = TomboyTest.dll
+
+diff -Nur -x '*.orig' -x '*~' tomboy-0.12.0/test/Makefile.in
tomboy-0.12.0.new/test/Makefile.in
+--- tomboy-0.12.0/test/Makefile.in 2008-09-22 13:11:46.000000000 +0100
++++ tomboy-0.12.0.new/test/Makefile.in 2008-12-01 00:50:00.000000000 +0000
+@@ -230,7 +230,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-CSC = gmcs
++CSC = $(GMCS)
+ TARGET = TomboyTest.dll
+ CSFLAGS = \
+ -debug \
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/Backlinks/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/Backlinks/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/Backlinks/Makefile.in 2008-09-22
13:11:44.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/Backlinks/Makefile.in 2008-12-01
00:50:03.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~' tomboy-0.12.0/Tomboy/Addins/Bugzilla/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/Bugzilla/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/Bugzilla/Makefile.in 2008-09-22
13:11:44.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/Bugzilla/Makefile.in 2008-12-01
00:50:08.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/Evolution/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/Evolution/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/Evolution/Makefile.in 2008-09-22
13:11:44.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/Evolution/Makefile.in 2008-12-01
00:50:10.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/ExportToHtml/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/ExportToHtml/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/ExportToHtml/Makefile.in 2008-09-22
13:11:44.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/ExportToHtml/Makefile.in 2008-12-01
00:50:13.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/FileSystemSyncService/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/FileSystemSyncService/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/FileSystemSyncService/Makefile.in
2008-09-22 13:11:44.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/FileSystemSyncService/Makefile.in
2008-12-01 00:50:16.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/FixedWidth/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/FixedWidth/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/FixedWidth/Makefile.in 2008-09-22
13:11:44.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/FixedWidth/Makefile.in 2008-12-01
00:50:19.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/GalagoPresence/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/GalagoPresence/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/GalagoPresence/Makefile.in 2008-09-22
13:11:44.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/GalagoPresence/Makefile.in 2008-12-01
00:50:23.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/InsertTimestamp/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/InsertTimestamp/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/InsertTimestamp/Makefile.in 2008-09-22
13:11:45.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/InsertTimestamp/Makefile.in
2008-12-01 00:50:26.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/NoteOfTheDay/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/NoteOfTheDay/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/NoteOfTheDay/Makefile.in 2008-09-22
13:11:45.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/NoteOfTheDay/Makefile.in 2008-12-01
00:50:32.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/PrintNotes/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/PrintNotes/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/PrintNotes/Makefile.in 2008-09-22
13:11:45.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/PrintNotes/Makefile.in 2008-12-01
00:50:35.000000000 +0000
+@@ -279,7 +279,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/Sketching/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/Sketching/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/Sketching/Makefile.in 2008-09-22
13:11:45.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/Sketching/Makefile.in 2008-12-01
00:50:39.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/SshSyncService/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/SshSyncService/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/SshSyncService/Makefile.in 2008-09-22
13:11:45.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/SshSyncService/Makefile.in 2008-12-01
00:50:41.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/StickyNoteImport/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/StickyNoteImport/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/StickyNoteImport/Makefile.in 2008-09-22
13:11:45.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/StickyNoteImport/Makefile.in
2008-12-01 00:50:44.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~' tomboy-0.12.0/Tomboy/Addins/Tasque/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/Tasque/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/Tasque/Makefile.in 2008-09-22
13:11:45.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/Tasque/Makefile.in 2008-12-01
00:50:46.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~'
tomboy-0.12.0/Tomboy/Addins/WebDavSyncService/Makefile.in
tomboy-0.12.0.new/Tomboy/Addins/WebDavSyncService/Makefile.in
+--- tomboy-0.12.0/Tomboy/Addins/WebDavSyncService/Makefile.in 2008-09-22
13:11:45.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Addins/WebDavSyncService/Makefile.in
2008-12-01 00:50:50.000000000 +0000
+@@ -254,7 +254,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+diff -Nur -x '*.orig' -x '*~' tomboy-0.12.0/Tomboy/Makefile.in
tomboy-0.12.0.new/Tomboy/Makefile.in
+--- tomboy-0.12.0/Tomboy/Makefile.in 2008-09-22 13:11:45.000000000 +0100
++++ tomboy-0.12.0.new/Tomboy/Makefile.in 2008-12-01 00:50:55.000000000
+0000
+@@ -269,7 +269,7 @@
+
+ @external_mono_addins_t...@link_mono_addins = $(MONO_ADDINS_LIBS)
+ CSC_FLAGS = -debug
+-CSC = gmcs $(CSC_FLAGS) -target:exe
++CSC = $(GMCS) $(CSC_FLAGS) -target:exe
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
Index: debian/changelog
===================================================================
--- debian/changelog (revision 4347)
+++ debian/changelog (working copy)
@@ -5,10 +5,17 @@
* Don't install la files
* Update debian/copyright to reflect tomboykeybinder tomboyutil
- [ Sebastian Dröge ]
- *
+ [ Iain Lane ]
+ * debian/rules, debian/control,
+ debian/patches/02_configurable_compiler.patch:
+ + Update for Mono 2.0 transition.
+ + Replace mono-gmcs build-dep with mono-devel to pull in csc
+ + Remove obsolote libmono-dev build-dep
+ + Pass GMCS=/usr/bin/csc to configure to use csc for the build
+ + Patch the build system to respect the passed compiler (Patch from James
+ Westby)
- -- Sebastian Dröge <sl...@debian.org> Mon, 24 Nov 2008 12:53:03 +0100
+ -- Iain Lane <la...@ubuntu.com> Wed, 17 Dec 2008 21:29:40 +0000
tomboy (0.12.1-1) experimental; urgency=low
Index: debian/rules
===================================================================
--- debian/rules (revision 4347)
+++ debian/rules (working copy)
@@ -9,7 +9,7 @@
LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
DEB_INSTALL_DOCS_ALL := README NEWS
-DEB_CONFIGURE_EXTRA_FLAGS += --with-mono-addins=system
+DEB_CONFIGURE_EXTRA_FLAGS += --with-mono-addins=system GMCS=/usr/bin/csc
common-configure-indep::
mkdir -p $(MONO_SHARED_DIR)/.wapi
