[Pkg-cli-apps-commits] [sparkleshare] 04/10: Adjust the patch to the new upstream build code.

[Andrew Shadura]

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

andrewsh pushed a commit to branch master
in repository sparkleshare.

commit db9e83a9ee295f270df5279eec5536ea140061bc
Author: Andrew Shadura <andrew.shadura at collabora.co.uk>
Date:   Mon Jan 18 13:55:49 2016 +0100

    Adjust the patch to the new upstream build code.
---
 debian/patches/00-build_for_4.5.patch | 32 ++++++++++++++++++++++++
 debian/patches/build_for_4.5.patch    | 47 -----------------------------------
 2 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/debian/patches/00-build_for_4.5.patch b/debian/patches/00-build_for_4.5.patch
new file mode 100644
index 0000000..480d6a8
--- /dev/null
+++ b/debian/patches/00-build_for_4.5.patch
@@ -0,0 +1,32 @@
+--- a/build/m4/shamrock/mono.m4
++++ b/build/m4/shamrock/mono.m4
+@@ -13,6 +13,11 @@
+ 	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)
+@@ -65,4 +70,3 @@
+ 		fi
+ 	done
+ ])
+-
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,8 +27,8 @@
+ SHAMROCK_CHECK_MONO_MODULE(2.8)
+ SHAMROCK_FIND_MONO_RUNTIME
+     
+-PKG_CHECK_EXISTS([mono >= 2.8],
+-[SHAMROCK_FIND_MONO_4_0_COMPILER
++PKG_CHECK_EXISTS([mono >= 3.2.8],
++[SHAMROCK_FIND_MONO_4_5_COMPILER
+ SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES([
+     System
+ ])]
diff --git a/debian/patches/build_for_4.5.patch b/debian/patches/build_for_4.5.patch
deleted file mode 100644
index f254e7f..0000000
--- a/debian/patches/build_for_4.5.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: sparkleshare/build/m4/shamrock/mono.m4
-===================================================================
---- sparkleshare.orig/build/m4/shamrock/mono.m4
-+++ sparkleshare/build/m4/shamrock/mono.m4
-@@ -13,6 +13,11 @@ AC_DEFUN([SHAMROCK_FIND_MONO_4_0_COMPILE
- 	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)
-@@ -92,3 +97,13 @@ AC_DEFUN([SHAMROCK_CHECK_MONO2_4_0_GAC_A
- 	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.0, $*)
- ])
- 
-+AC_DEFUN([SHAMROCK_CHECK_MONO_4_5_GAC_ASSEMBLIES],
-+[
-+	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.5, $*)
-+])
-+
-+AC_DEFUN([SHAMROCK_CHECK_MONO2_4_5_GAC_ASSEMBLIES],
-+[
-+	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.5, $*)
-+])
-+
-Index: sparkleshare/configure.ac
-===================================================================
---- sparkleshare.orig/configure.ac
-+++ sparkleshare/configure.ac
-@@ -27,9 +27,9 @@ dnl Mono and gmcs
- SHAMROCK_CHECK_MONO_MODULE(2.8)
- SHAMROCK_FIND_MONO_RUNTIME
-     
--PKG_CHECK_EXISTS([mono >= 2.8],
--[SHAMROCK_FIND_MONO_4_0_COMPILER
--SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES([
-+PKG_CHECK_EXISTS([mono >= 3.2.8],
-+[SHAMROCK_FIND_MONO_4_5_COMPILER
-+SHAMROCK_CHECK_MONO_4_5_GAC_ASSEMBLIES([
-     System
-     System.Security
-     Mono.Posix

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/sparkleshare.git