[Pkg-telepathy-maintainers] Bug#517616: Changes required for Mono 2.0 transition

Sat Feb 28 21:37:01 UTC 2009

Package: telepathy-sharp
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu jaunty ubuntu-patch

Hi,

The Mono 2.0 transition is underway, and your package is affected:

  http://wiki.debian.org/Teams/DebianMonoGroup/Mono20Transition

The attached merge directive contains the necessary changes, please
consider merging it.

Thanks,

James
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jw+debian at jameswestby.net-20090228213230-\
#   2hxb09wuzow2nzhl
# target_branch: http://bzr.debian.org/pkg-telepathy/packages\
#   /unstable/telepathy-sharp/
# testament_sha1: bf815cc9a0050efceaa54b7662c526c173bed96b
# timestamp: 2009-02-28 21:32:49 +0000
# base_revision_id: bigon at bigon.be-20071108044647-oathxeuivpvjmzu9
# 
# Begin patch
=== modified file 'changelog'

--- changelog	2007-11-08 04:46:47 +0000
+++ changelog	2009-02-28 21:32:30 +0000
@@ -1,8 +1,19 @@
 telepathy-sharp (0.13.2~svn20070913-4) UNRELEASED; urgency=low
 
+  [ Laurent Bigonville ]
   * Use new Homepage field instead of old pseudo-field
   * Use now official Vcs-* field
 
+  [ James Westby ]
+  * Mono 2.0 transition:
+    - Build-Depend on libmono2.0-cil instead of the 1.0 version.
+    - Build-Depend on mono-devel instead of mono-gmcs and mono-gac so that
+      the default versions of the tools are available.
+    - Add DEB_CONFIGURE_EXTRA_FLAGS = CSC=/usr/bin/csc to debian/rules so
+      that the default compiler is used.
+    - Add debian/patches/03tests-compiler.patch so that the tests use the
+      compiler found by the configure script.
+
  -- Laurent Bigonville <bigon at bigon.be>  Thu, 08 Nov 2007 05:46:45 +0100
 
 telepathy-sharp (0.13.2~svn20070913-3) unstable; urgency=low

=== modified file 'control'
--- control	2007-11-08 04:46:47 +0000
+++ control	2009-02-28 21:32:30 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth.debian.org>
 Uploaders: Laurent Bigonville <bigon at bigon.be>, Riccardo Setti <giskard at debian.org>
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: libmono-dev (>= 1.1.17), mono-gmcs (>= 1.1.8) | c-sharp-2.0-compiler, libmono1.0-cil, mono-gac, cli-common-dev (>= 0.4.4), libndesk-dbus1.0-cil (>= 0.4.2)
+Build-Depends-Indep: libmono-dev (>= 1.1.17), mono-devel | c-sharp-2.0-compiler, libmono2.0-cil, cli-common-dev (>= 0.4.4), libndesk-dbus1.0-cil (>= 0.4.2)
 Standards-Version: 3.7.2
 Vcs-Bzr: http://bzr.debian.org/pkg-telepathy/packages/unstable/telepathy-sharp/
 Homepage: http://telepathy.freedesktop.org/wiki/TelepathySharp

=== added file 'patches/03tests-compiler.patch'
--- patches/03tests-compiler.patch	1970-01-01 00:00:00 +0000
+++ patches/03tests-compiler.patch	2009-02-28 21:32:30 +0000
@@ -0,0 +1,41 @@
+diff -Nur -x '*.orig' -x '*~' telepathy-sharp-0.13.2~svn20070913/test/Makefile.am telepathy-sharp-0.13.2~svn20070913.new/test/Makefile.am
+--- telepathy-sharp-0.13.2~svn20070913/test/Makefile.am	2007-09-13 11:28:30.000000000 +0100
++++ telepathy-sharp-0.13.2~svn20070913.new/test/Makefile.am	2009-02-28 21:27:26.000000000 +0000
+@@ -1,5 +1,4 @@
+-MCS = gmcs
+-MCS_FLAGS = -debug
++CSC_FLAGS = -debug
+ TEST_NAME = test
+ TEST = $(TEST_NAME).exe
+ TARGET = $(TEST)
+@@ -12,7 +11,7 @@
+ all-local: $(TARGET)
+ 
+ $(TARGET): $(test_sources)
+-	$(MCS) $(MCS_FLAGS) $(PKG_REFERENCES) $(test_sources) \
++	$(CSC) $(CSC_FLAGS) $(PKG_REFERENCES) $(test_sources) \
+ 	-target:exe -out:"$@"
+ 
+ CLEANFILES = *.exe*
+diff -Nur -x '*.orig' -x '*~' telepathy-sharp-0.13.2~svn20070913/test/Makefile.in telepathy-sharp-0.13.2~svn20070913.new/test/Makefile.in
+--- telepathy-sharp-0.13.2~svn20070913/test/Makefile.in	2007-09-13 11:29:14.000000000 +0100
++++ telepathy-sharp-0.13.2~svn20070913.new/test/Makefile.in	2009-02-28 21:27:51.000000000 +0000
+@@ -132,8 +132,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-MCS = gmcs
+-MCS_FLAGS = -debug
++CSC_FLAGS = -debug
+ TEST_NAME = test
+ TEST = $(TEST_NAME).exe
+ TARGET = $(TEST)
+@@ -299,7 +298,7 @@
+ all-local: $(TARGET)
+ 
+ $(TARGET): $(test_sources)
+-	$(MCS) $(MCS_FLAGS) $(PKG_REFERENCES) $(test_sources) \
++	$(CSC) $(CSC_FLAGS) $(PKG_REFERENCES) $(test_sources) \
+ 	-target:exe -out:"$@"
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

=== modified file 'rules'
--- rules	2007-09-13 20:13:51 +0000
+++ rules	2009-02-28 21:32:30 +0000
@@ -6,6 +6,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+DEB_CONFIGURE_EXTRA_FLAGS = CSC=/usr/bin/csc
+
 DEB_DESTDIR = $(CURDIR)/debian/tmp
 
 clean::

# Begin bundle
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
pwoSDxj+pqA=
