[Pkg-cli-libs-commits] [SCM] taglib-sharp branch, master, updated. debian/2.0.3.7+dfsg-2-15-g67578a9
Chow Loong Jin
hyperair at debian.org
Sun Feb 5 17:23:05 UTC 2012
The following commit has been merged in the master branch:
commit 38c1206c4e9d61582ba55575f9b32bb90ce1b1ba
Author: Chow Loong Jin <hyperair at debian.org>
Date: Sun Feb 5 23:43:10 2012 +0800
Patch to fix ICSharpCode.SharpZipLib check
diff --git a/debian/patches/0003-Use-gacutil-for-ICSharpCode.SharpZipLib-check.patch b/debian/patches/0003-Use-gacutil-for-ICSharpCode.SharpZipLib-check.patch
new file mode 100644
index 0000000..cc709db
--- /dev/null
+++ b/debian/patches/0003-Use-gacutil-for-ICSharpCode.SharpZipLib-check.patch
@@ -0,0 +1,34 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Sun, 5 Feb 2012 23:42:25 +0800
+Subject: Use gacutil for ICSharpCode.SharpZipLib check
+
+---
+ configure.ac | 7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 59a1b98..4114783 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,6 +13,7 @@ AC_SUBST(ASSEMBLY_VERSION)
+ AC_SUBST(ASSEMBLY_NAME)
+
+ AC_PROG_INSTALL
++AC_PROG_GREP
+
+ MONODOC_REQUIRED=1.1.9
+
+@@ -84,10 +85,8 @@ else
+ fi
+
+ # checking for ICSharpCode.SharpZipLib.dll
+-AC_MSG_CHECKING([for Mono 2.0 GAC for ICSharpCode.SharpZipLib.dll])
+-if test \
+- -e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0/ICSharpCode.SharpZipLib.dll" -o \
+- -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0/ICSharpCode.SharpZipLib.dll"; \
++AC_MSG_CHECKING([Mono GAC for ICSharpCode.SharpZipLib.dll])
++if $GACUTIL -l | $GREP -q ICSharpCode.SharpZipLib; \
+ then \
+ AC_MSG_RESULT([found])
+ AM_CONDITIONAL(HAVE_SHARPZIPLIB, true)
+--
diff --git a/debian/patches/series b/debian/patches/series
index 4178297..e57b382 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-Fix-build-system-for-building-docs.patch
0002-Amend-taglib-sharp.dll-path-in-pc-file.patch
+0003-Use-gacutil-for-ICSharpCode.SharpZipLib-check.patch
--
taglib-sharp
More information about the Pkg-cli-libs-commits
mailing list