[SCM] Git repository for pkg-virtuoso branch, master, updated. upstream/6.0.1.cvs20091210+dfsg2-206-g3565d20

[José Manuel Santamar?==?UTF-8?Q?ía Lema]

The following commit has been merged in the master branch:
commit 3565d202a81ca11c06b921895696717d006e07be
Author: Jo Shields <directhex at apebox.org>
Date:   Tue May 22 16:42:15 2012 +0200

    NMU with fixes wrt mono.

diff --git a/debian/changelog b/debian/changelog
index d370b87..3e56905 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+virtuoso-opensource (6.1.3+dfsg1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Refresh list of Mono architectures in debian/control
+    (Closes: #657781)
+  * Use system default Mono compiler by using the mono-devel package
+    and the mono-csc command therein (Closes: #658166)
+
+ -- Jo Shields <directhex at apebox.org>  Tue, 31 Jan 2012 18:25:09 +0000
+
 virtuoso-opensource (6.1.3+dfsg1-2) unstable; urgency=low
 
   * Apply wide char encoding fix from KDE bug 271664,
diff --git a/debian/control b/debian/control
index d83eab1..d121406 100644
--- a/debian/control
+++ b/debian/control
@@ -11,11 +11,8 @@ Build-Depends: cdbs, debhelper (>= 7), quilt, autotools-dev, autoconf (>=2.57),
  gperf (>=2.7.2), gawk (>=3.1.1), m4 (>=1.4.1), make (>=3.79.1),
  libssl-dev (>=0.9.7), libreadline-dev, zlib1g-dev, libxml2-dev, libpcre3-dev,
  libldap2-dev, net-tools,
- mono-gmcs (>= 1.0) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
- cli-common-dev (>= 0.4.4) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
- libmono-corlib2.0-cil (>= 1.2.6) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
- libmono-system-data2.0-cil (>= 1.0) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
- libmono-system2.0-cil (>= 1.2.6) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
+ mono-devel (>= 2.4.3) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armhf armel sparc s390x ppc64],
+ cli-common-dev (>= 0.4.4) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armhf armel sparc s390x ppc64],
  docbook2x, po-debconf, libwbxml2-dev, libmagickwand-dev
 
 Package: virtuoso-opensource
@@ -268,7 +265,7 @@ Description: high-performance database - ODBC libraries
 
 Package: libvirtuoso5.5-cil
 Section: cli-mono
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armhf armel sparc s390x ppc64
 Depends: ${cli:Depends}, ${misc:Depends}
 Description: high-performance database - Mono assemblies
  OpenLink Virtuoso is a high-performance object-relational SQL database.
diff --git a/debian/patches/series b/debian/patches/series
index 7ba13f0..e1fa09e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+use-debian-default-csharp-compiler.patch
 fix-wide-char-encoding.patch
 config-debian-paths.patch
 config-universal-variables.patch
diff --git a/debian/patches/use-debian-default-csharp-compiler.patch b/debian/patches/use-debian-default-csharp-compiler.patch
new file mode 100644
index 0000000..fcaafbe
--- /dev/null
+++ b/debian/patches/use-debian-default-csharp-compiler.patch
@@ -0,0 +1,22 @@
+Index: virtuoso-opensource-6.1.3+dfsg1/binsrc/VirtuosoClient.Net/Makefile.mono
+===================================================================
+--- virtuoso-opensource-6.1.3+dfsg1.orig/binsrc/VirtuosoClient.Net/Makefile.mono	2012-01-31 18:24:06.626254506 +0000
++++ virtuoso-opensource-6.1.3+dfsg1/binsrc/VirtuosoClient.Net/Makefile.mono	2012-01-31 18:24:41.062456289 +0000
+@@ -83,7 +83,7 @@
+ 
+ ifeq  (ADONET2, $(ADONETVERSION))
+ 
+-CSC		= gmcs
++CSC		= mono-csc
+ 
+ #CSFLAGS	= -debug+ /d:MONO /d:DEBUG /d:DEBUG_IO /d:ADONET2
+ CSFLAGS		= /optimize+ /d:MONO /d:ADONET2
+@@ -98,7 +98,7 @@
+ 
+ else
+ 
+-CSC		= mcs
++CSC		= mono-csc
+ 
+ #CSFLAGS	= -debug+ /d:MONO /d:DEBUG /d:DEBUG_IO
+ CSFLAGS		= /optimize+ /d:MONO

-- 
Git repository for pkg-virtuoso