[Pkg-cli-apps-commits] [banshee] 02/06: Reexport mono-4.5.patch using gbp pq

[Chow Loong Jin]

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

hyperair pushed a commit to branch master
in repository banshee.

commit 349280f384c73775851dc723bc1dadf116533bcf
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Fri Apr 1 00:28:14 2016 +0800

    Reexport mono-4.5.patch using gbp pq
---
 debian/patches/mono-4.5.patch | 48 ++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/debian/patches/mono-4.5.patch b/debian/patches/mono-4.5.patch
index 1d1f4b8..642a3ba 100644
--- a/debian/patches/mono-4.5.patch
+++ b/debian/patches/mono-4.5.patch
@@ -1,27 +1,17 @@
-Description: Find 4.5 versions of required assemblies
-Author: Iain Lane <laney at debian.org>
+From: Iain Lane <laney at debian.org>
+Date: Fri, 1 Apr 2016 00:18:20 +0800
+Subject: Find 4.5 versions of required assemblies
 
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,9 +65,9 @@
- 
- dnl Mono and gmcs
- SHAMROCK_CHECK_MONO_MODULE(2.4.3)
--SHAMROCK_FIND_MONO_2_0_COMPILER
-+SHAMROCK_FIND_MONO_1_0_COMPILER
- SHAMROCK_FIND_MONO_RUNTIME
--SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib])
-+SHAMROCK_CHECK_MONO_4_5_GAC_ASSEMBLIES([Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib])
- 
- dnl In MeeGo we want the full name, but not in GNOME 3 (see bgo#596242)
- PKG_CHECK_MODULES(MEEGO_PANEL, meego-panel, HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no)
-Index: b/build/m4/shamrock/mono.m4
-===================================================================
+---
+ build/m4/shamrock/mono.m4 | 5 +++++
+ configure.ac              | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4
+index c40ecbf..4d8a13f 100644
 --- a/build/m4/shamrock/mono.m4
 +++ b/build/m4/shamrock/mono.m4
-@@ -87,6 +87,11 @@
+@@ -87,6 +87,11 @@ AC_DEFUN([SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES],
  	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.0, $*)
  ])
  
@@ -33,3 +23,19 @@ Index: b/build/m4/shamrock/mono.m4
  AC_DEFUN([SHAMROCK_CHECK_MONO2_4_0_GAC_ASSEMBLIES],
  [
  	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.0, $*)
+diff --git a/configure.ac b/configure.ac
+index 7926526..28d0380 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,9 +65,9 @@ SHAMROCK_CHECK_GNOME_DOC_UTILS(0.17.3)
+ 
+ dnl Mono and gmcs
+ SHAMROCK_CHECK_MONO_MODULE(2.4.3)
+-SHAMROCK_FIND_MONO_2_0_COMPILER
++SHAMROCK_FIND_MONO_1_0_COMPILER
+ SHAMROCK_FIND_MONO_RUNTIME
+-SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib])
++SHAMROCK_CHECK_MONO_4_5_GAC_ASSEMBLIES([Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib])
+ 
+ dnl In MeeGo we want the full name, but not in GNOME 3 (see bgo#596242)
+ PKG_CHECK_MODULES(MEEGO_PANEL, meego-panel, HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no)

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