[Pkg-cli-apps-commits] [sparkleshare] 02/03: Force build with 4.5 libraries

[Jo Shields]

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

directhex pushed a commit to annotated tag debian/1.1.0-2
in repository sparkleshare.

commit 03139abf062bd313508293bc017d5cf83089870a
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Dec 21 20:57:19 2015 +0000

    Force build with 4.5 libraries
---
 debian/control                     |  3 ++-
 debian/patches/build_for_4.5.patch | 47 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  5 +++-
 4 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 7061885..baa0cb8 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends-Indep: intltool,
                      libgtk2.0-cil-dev (>= 2.12.2),
                      libnotify-cil-dev,
                      libwebkit-cil-dev,
-                     mono-devel (>= 2.10),
+                     mono-devel (>= 3.2.8),
+                     dh-autoreconf,
                      python-nautilus
 Standards-Version: 3.9.3
 Homepage: http://sparkleshare.org/
diff --git a/debian/patches/build_for_4.5.patch b/debian/patches/build_for_4.5.patch
new file mode 100644
index 0000000..f254e7f
--- /dev/null
+++ b/debian/patches/build_for_4.5.patch
@@ -0,0 +1,47 @@
+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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2256999
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build_for_4.5.patch
diff --git a/debian/rules b/debian/rules
index 77611b0..b244442 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,5 +3,8 @@
 override_dh_auto_configure:
 	dh_auto_configure -- MCS=/usr/bin/mono-csc
 
+override_dh_autoreconf:
+	dh_autoreconf autoreconf -- -f -I build/m4/shamrock/ -I build/m4/shave/ -I build/m4/sparkleshare/ -i .
+
 %:
-	dh $@ --with cli
+	dh $@ --with cli,autoreconf

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