[Pkg-cli-libs-commits] [mono-zeroconf] 01/03: Make Shamrock m4 assume 4.5, not 2.0 (Closes: #809585)

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/0.9.0-6
in repository mono-zeroconf.

commit e593000c8df2c7997746b3cac0cbcba0d7ddf9f4
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Jan 3 08:44:08 2016 +0000

    Make Shamrock m4 assume 4.5, not 2.0 (Closes: #809585)
---
 debian/control                                   |  2 +-
 debian/patches/04_make_shamrock_use_4.5_classlib | 55 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 7382529..1b16453 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), cli-common-dev (>= 0.5.7)
-Build-Depends-Indep: mono-devel (>= 2.4.3),
+Build-Depends-Indep: mono-devel (>= 3.0.6),
  monodoc-base (>= 2.0),
  pkg-config
 Standards-Version: 3.9.2
diff --git a/debian/patches/04_make_shamrock_use_4.5_classlib b/debian/patches/04_make_shamrock_use_4.5_classlib
new file mode 100644
index 0000000..2bac41a
--- /dev/null
+++ b/debian/patches/04_make_shamrock_use_4.5_classlib
@@ -0,0 +1,55 @@
+Index: mono-zeroconf/configure.ac
+===================================================================
+--- mono-zeroconf.orig/configure.ac
++++ mono-zeroconf/configure.ac
+@@ -15,10 +15,10 @@ AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+ AC_PROG_INSTALL
+ 
+ SHAMROCK_CHECK_MONO_MODULE(1.1.10)
+-SHAMROCK_FIND_MONO_2_0_COMPILER
++SHAMROCK_FIND_MONO_4_5_COMPILER
+ SHAMROCK_FIND_MONO_RUNTIME
+ SHAMROCK_CHECK_MONODOC
+-SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
++SHAMROCK_CHECK_MONO_4_5_GAC_ASSEMBLIES([
+ 	System
+ 	System.Web
+ ])
+Index: mono-zeroconf/shamrock.m4
+===================================================================
+--- mono-zeroconf.orig/shamrock.m4
++++ mono-zeroconf/shamrock.m4
+@@ -38,6 +38,16 @@ AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILE
+ 	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, gmcs)
+ ])
+ 
++AC_DEFUN([SHAMROCK_FIND_MONO_4_0_COMPILER],
++[
++	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs)
++])
++
++AC_DEFUN([SHAMROCK_FIND_MONO_4_5_COMPILER],
++[
++	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, mcs)
++])
++
+ AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME],
+ [
+ 	SHAMROCK_FIND_PROGRAM_OR_BAIL(MONO, mono)
+@@ -75,6 +85,16 @@ AC_DEFUN([SHAMROCK_CHECK_MONO_2_0_GAC_AS
+ 	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(2.0, $*)
+ ])
+ 
++AC_DEFUN([SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES],
++[
++	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(4.0, $*)
++])
++
++AC_DEFUN([SHAMROCK_CHECK_MONO_4_5_GAC_ASSEMBLIES],
++[
++	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(4.5, $*)
++])
++
+ AC_DEFUN([SHAMROCK_CHECK_MONODOC],
+ [
+ 	AC_ARG_ENABLE(docs, AC_HELP_STRING([--disable-docs], 
diff --git a/debian/patches/series b/debian/patches/series
index 534ed27..719cfef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_pkg-config-path
 02_provider-factory-path
 03_fix-multiple-dispose.patch
+04_make_shamrock_use_4.5_classlib

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/mono-zeroconf.git