[Pkg-cli-libs-commits] [SCM] taglib-sharp branch, master, updated. debian/2.0.3.7+dfsg-2-15-g67578a9

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 9ea27f0baaa51c41a20f854fcbf3cb1fa1fab2d4
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Feb 5 23:33:23 2012 +0800

    Port patches to gbp-pq

diff --git a/debian/patches/01_build-system.patch b/debian/patches/0001-Fix-build-system-for-building-docs.patch
similarity index 52%
rename from debian/patches/01_build-system.patch
rename to debian/patches/0001-Fix-build-system-for-building-docs.patch
index cca7bf2..fbfed4b 100644
--- a/debian/patches/01_build-system.patch
+++ b/debian/patches/0001-Fix-build-system-for-building-docs.patch
@@ -1,11 +1,20 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo at debian.org>
+Date: Sun, 5 Feb 2012 23:26:01 +0800
+Subject: Fix build system for building docs
 
- at DPATCH@
-Index: taglib-sharp.git/docs/Makefile.am
-===================================================================
---- taglib-sharp.git.orig/docs/Makefile.am	2010-03-21 13:44:23.167221412 +0000
-+++ taglib-sharp.git/docs/Makefile.am	2010-03-21 14:06:21.567219463 +0000
-@@ -10,7 +10,7 @@
+ - Don't run XmlInjector.cs (fixes FTBFS with newer monodoc)
+ - Don't include DESTDIR in monodocdir
+
+Bug-Debian: http://bugs.debian.org/475218
+---
+ docs/Makefile.am |    9 +--------
+ 1 files changed, 1 insertions(+), 8 deletions(-)
+
+diff --git a/docs/Makefile.am b/docs/Makefile.am
+index d719cb9..a95cca9 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 $<
  
@@ -14,7 +23,7 @@ Index: taglib-sharp.git/docs/Makefile.am
  monodoc_DATA = \
  	taglib-sharp-docs.zip \
  	taglib-sharp-docs.tree \
-@@ -23,7 +23,6 @@
+@@ -23,7 +23,6 @@ en/index.xml: $(ASSEMBLY) $(SLASHDOC) XmlInjector.exe Package.en.xml
  		rm -rf en; \
  	fi
  	$(DOC_UPDATER) -assembly:$(ASSEMBLY) -importslashdoc:$(SLASHDOC) -path:en > /dev/null
@@ -22,7 +31,7 @@ Index: taglib-sharp.git/docs/Makefile.am
  
  update-html: en
  	if [ -d taglib-sharp-web-docs ]; then \
-@@ -37,12 +36,6 @@
+@@ -37,12 +36,6 @@ taglib-sharp-docs.tree: taglib-sharp-docs.zip
  taglib-sharp-docs.zip: en/index.xml
  	$(DOC_ASSEMBLER) en
  
@@ -35,3 +44,4 @@ Index: taglib-sharp.git/docs/Makefile.am
  clean-local:
  	if [ -d en ]; then \
  		rm -rf en; \
+-- 
diff --git a/debian/patches/0002-Amend-taglib-sharp.dll-path-in-pc-file.patch b/debian/patches/0002-Amend-taglib-sharp.dll-path-in-pc-file.patch
new file mode 100644
index 0000000..6516f0d
--- /dev/null
+++ b/debian/patches/0002-Amend-taglib-sharp.dll-path-in-pc-file.patch
@@ -0,0 +1,19 @@
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo at debian.org>
+Date: Sun, 5 Feb 2012 23:26:01 +0800
+Subject: Amend taglib-sharp.dll path in pc file
+
+---
+ taglib-sharp.pc.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/taglib-sharp.pc.in b/taglib-sharp.pc.in
+index 25d2bd1..f0a8858 100644
+--- a/taglib-sharp.pc.in
++++ b/taglib-sharp.pc.in
+@@ -5,4 +5,4 @@ libdir=${exec_prefix}/lib
+ Name: TagLib Sharp
+ Description: A library for reading and writing tags to audio files.
+ Version: @VERSION@
+-Libs: -r:${libdir}/mono/taglib-sharp/taglib-sharp.dll
++Libs: -r:${libdir}/cli/taglib-sharp-2.0/taglib-sharp.dll
+-- 
diff --git a/debian/patches/03_pkg-config-location.patch b/debian/patches/03_pkg-config-location.patch
deleted file mode 100644
index 7bbc82b..0000000
--- a/debian/patches/03_pkg-config-location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- old/taglib-sharp.pc.in.old	2009-03-06 10:50:05.000000000 +0100
-+++ new/taglib-sharp.pc.in	2009-03-06 10:50:27.000000000 +0100
-@@ -5,4 +5,4 @@
- Name: TagLib Sharp
- Description: A library for reading and writing tags to audio files.
- Version: @VERSION@
--Libs: -r:${libdir}/mono/taglib-sharp/taglib-sharp.dll
-+Libs: -r:${libdir}/cli/taglib-sharp-2.0/taglib-sharp.dll
diff --git a/debian/patches/series b/debian/patches/series
index 77b3f0d..4178297 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-01_build-system.patch
-03_pkg-config-location.patch
+0001-Fix-build-system-for-building-docs.patch
+0002-Amend-taglib-sharp.dll-path-in-pc-file.patch

-- 
taglib-sharp