[Pkg-cli-libs-commits] [SCM] taglib-sharp branch, master, updated. debian/2.0.4.0-1-11-gbd1bffb

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit b1fecd3646aa4c8758c2f7dfd3876de516b42dd0
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon Jul 2 18:52:09 2012 +0800

    Drop upstreamed patches and reexport

diff --git a/debian/patches/0003-Use-gacutil-for-ICSharpCode.SharpZipLib-check.patch b/debian/patches/0003-Use-gacutil-for-ICSharpCode.SharpZipLib-check.patch
deleted file mode 100644
index cc709db..0000000
--- a/debian/patches/0003-Use-gacutil-for-ICSharpCode.SharpZipLib-check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/0004-Readd-Taglib.Mpeg4.FileParser.UserDataBox-property.patch b/debian/patches/0004-Readd-Taglib.Mpeg4.FileParser.UserDataBox-property.patch
deleted file mode 100644
index 295081d..0000000
--- a/debian/patches/0004-Readd-Taglib.Mpeg4.FileParser.UserDataBox-property.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Chow Loong Jin <hyperair at debian.org>
-Date: Mon, 6 Feb 2012 01:06:24 +0800
-Subject: Readd Taglib.Mpeg4.FileParser.UserDataBox property
-
-The UserDataBox property was renamed to UserDataBoxes and its return type
-changed to an array between 2.0.3.7 and 2.0.4.0, resulting in an ABI
-breakage. This patch readds the property for backward compatibility.
----
- src/TagLib/Mpeg4/FileParser.cs |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/TagLib/Mpeg4/FileParser.cs b/src/TagLib/Mpeg4/FileParser.cs
-index 2043a50..72efde7 100644
---- a/src/TagLib/Mpeg4/FileParser.cs
-+++ b/src/TagLib/Mpeg4/FileParser.cs
-@@ -157,6 +157,10 @@ namespace TagLib.Mpeg4 {
- 			get {return udta_boxes.ToArray ();}
- 		}
- 		
-+		public IsoUserDataBox UserDataBox {
-+			get {return UserDataBoxes.Length == 0 ? null : UserDataBoxes[0];}
-+		}
-+
- 		/// <summary>
- 		///    Gets the audio sample entry read by the current instance.
- 		/// </summary>
--- 
diff --git a/debian/patches/0002-Amend-taglib-sharp.dll-path-in-pc-file.patch b/debian/patches/Amend-taglib-sharp.dll-path-in-pc-file.patch
similarity index 92%
rename from debian/patches/0002-Amend-taglib-sharp.dll-path-in-pc-file.patch
rename to debian/patches/Amend-taglib-sharp.dll-path-in-pc-file.patch
index 6516f0d..f817d36 100644
--- a/debian/patches/0002-Amend-taglib-sharp.dll-path-in-pc-file.patch
+++ b/debian/patches/Amend-taglib-sharp.dll-path-in-pc-file.patch
@@ -4,7 +4,7 @@ Subject: Amend taglib-sharp.dll path in pc file
 
 ---
  taglib-sharp.pc.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/taglib-sharp.pc.in b/taglib-sharp.pc.in
 index 25d2bd1..f0a8858 100644
diff --git a/debian/patches/0001-Fix-build-system-for-building-docs.patch b/debian/patches/Fix-build-system-for-building-docs.patch
similarity index 75%
rename from debian/patches/0001-Fix-build-system-for-building-docs.patch
rename to debian/patches/Fix-build-system-for-building-docs.patch
index fbfed4b..e8b9faf 100644
--- a/debian/patches/0001-Fix-build-system-for-building-docs.patch
+++ b/debian/patches/Fix-build-system-for-building-docs.patch
@@ -7,22 +7,13 @@ Subject: Fix build system for building docs
 
 Bug-Debian: http://bugs.debian.org/475218
 ---
- docs/Makefile.am |    9 +--------
- 1 files changed, 1 insertions(+), 8 deletions(-)
+ docs/Makefile.am |    7 -------
+ 1 file changed, 7 deletions(-)
 
 diff --git a/docs/Makefile.am b/docs/Makefile.am
-index d719cb9..a95cca9 100644
+index 67cdbb5..d24c2f3 100644
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
-@@ -10,7 +10,7 @@ all: XmlInjector.exe
- XmlInjector.exe: XmlInjector.cs
- 	$(MCS) -out:$@ -r:System.Xml $<
- 
--monodocdir = $(DESTDIR)$(DOCDIR)
-+monodocdir = $(DOCDIR)
- monodoc_DATA = \
- 	taglib-sharp-docs.zip \
- 	taglib-sharp-docs.tree \
 @@ -23,7 +23,6 @@ en/index.xml: $(ASSEMBLY) $(SLASHDOC) XmlInjector.exe Package.en.xml
  		rm -rf en; \
  	fi
diff --git a/debian/patches/series b/debian/patches/series
index 6c9eb62..854c491 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-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
-0004-Readd-Taglib.Mpeg4.FileParser.UserDataBox-property.patch
+Fix-build-system-for-building-docs.patch
+Amend-taglib-sharp.dll-path-in-pc-file.patch

-- 
taglib-sharp