[Pkg-cli-libs-commits] [SCM] taglib-sharp branch, master, updated. debian/2.0.3.6+dfsg-1-6-g15927c7

Iain Lane laney at ubuntu.com
Sun Mar 21 14:55:01 UTC 2010


The following commit has been merged in the master branch:
commit 15927c7f5a1eb48109389bc829f1d27e58b1dcb1
Author: Iain Lane <laney at ubuntu.com>
Date:   Sun Mar 21 13:43:28 2010 +0000

    New upstream release 2.0.3.7

diff --git a/debian/changelog b/debian/changelog
index 2c8bdaa..2fc38e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,21 @@
-taglib-sharp (2.0.3.6+dfsg-2) UNRELEASED; urgency=low
+taglib-sharp (2.0.3.7+dfsg-1) UNRELEASED; urgency=low
 
+  [ Chow Loong Jin ]
   * debian/control:
     + Set cli-common-dev version requirement to 0.5.7 for cli.{make,pm}
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 27 Feb 2010 21:09:36 +0800
+  [ Iain Lane ]
+  * New upstream release 2.0.3.7
+    + Solution/projects migrated to VS format
+    + Fix ID3v2 unsyncing
+    + Fix ID3v2.3 exetended header size calculation
+    + Make TagLib.File IDisposable (closes any open streams)
+    + Don't throw an exception if RVA2 data is partially incorrect
+    + Fall back to nunit-console is nunit-console2 not found
+    + Add build check for `al` tool
+  * debian/patches/*: Refresh 
+
+ -- Iain Lane <laney at ubuntu.com>  Sun, 21 Mar 2010 13:39:32 +0000
 
 taglib-sharp (2.0.3.6+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/01_build-system.patch b/debian/patches/01_build-system.patch
index e23e6b1..5c1db26 100644
--- a/debian/patches/01_build-system.patch
+++ b/debian/patches/01_build-system.patch
@@ -1,9 +1,10 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 
 @DPATCH@
-diff -urNad taglib-sharp~/docs/Makefile.am taglib-sharp/docs/Makefile.am
---- taglib-sharp~/docs/Makefile.am	2009-10-08 02:57:21.000000000 +0800
-+++ taglib-sharp/docs/Makefile.am	2009-10-08 02:58:43.975849049 +0800
+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 @@
  XmlInjector.exe: XmlInjector.cs
  	$(MCS) -out:$@ -r:System.Xml $<
@@ -34,10 +35,11 @@ diff -urNad taglib-sharp~/docs/Makefile.am taglib-sharp/docs/Makefile.am
  clean-local:
  	if [ -d en ]; then \
  		rm -rf en; \
-diff -urNad taglib-sharp~/docs/Makefile.in taglib-sharp/docs/Makefile.in
---- taglib-sharp~/docs/Makefile.in	2009-10-08 02:57:21.000000000 +0800
-+++ taglib-sharp/docs/Makefile.in	2009-10-08 02:59:40.763857624 +0800
-@@ -165,7 +165,7 @@
+Index: taglib-sharp.git/docs/Makefile.in
+===================================================================
+--- taglib-sharp.git.orig/docs/Makefile.in	2010-03-21 13:44:23.167221412 +0000
++++ taglib-sharp.git/docs/Makefile.in	2010-03-21 14:06:21.577220184 +0000
+@@ -149,7 +149,7 @@
  DOC_ASSEMBLER = @MDASSEMBLER@ --out taglib-sharp-docs --ecma
  ASSEMBLY = $(top_builddir)/src/$(ASSEMBLY_NAME).dll
  SLASHDOC = $(ASSEMBLY).xml
@@ -46,7 +48,7 @@ diff -urNad taglib-sharp~/docs/Makefile.in taglib-sharp/docs/Makefile.in
  @BUILD_DOCS_TRUE at monodoc_DATA = \
  @BUILD_DOCS_TRUE@	taglib-sharp-docs.zip \
  @BUILD_DOCS_TRUE@	taglib-sharp-docs.tree \
-@@ -411,7 +411,6 @@
+@@ -376,7 +376,6 @@
  @BUILD_DOCS_TRUE@		rm -rf en; \
  @BUILD_DOCS_TRUE@	fi
  @BUILD_DOCS_TRUE@	$(DOC_UPDATER) -assembly:$(ASSEMBLY) -importslashdoc:$(SLASHDOC) -path:en > /dev/null
@@ -54,7 +56,7 @@ diff -urNad taglib-sharp~/docs/Makefile.in taglib-sharp/docs/Makefile.in
  
  @BUILD_DOCS_TRUE at update-html: en
  @BUILD_DOCS_TRUE@	if [ -d taglib-sharp-web-docs ]; then \
-@@ -425,12 +424,6 @@
+@@ -390,12 +389,6 @@
  @BUILD_DOCS_TRUE at taglib-sharp-docs.zip: en/index.xml
  @BUILD_DOCS_TRUE@	$(DOC_ASSEMBLER) en
  
diff --git a/debian/patches/02_al2.patch b/debian/patches/02_al2.patch
index 400aac9..a42f4c9 100644
--- a/debian/patches/02_al2.patch
+++ b/debian/patches/02_al2.patch
@@ -2,25 +2,28 @@
 
 @DPATCH@
 
---- taglib-sharp/src/Makefile.am.old	2008-01-02 19:11:57.000000000 +0100
-+++ taglib-sharp/src/Makefile.am	2008-01-02 19:12:11.000000000 +0100
-@@ -19,7 +19,7 @@
- 	$(CSC) /target:library $(LIBFLAGS) /define:SIGN /out:$@ $(TAGLIB_CSFILES) $(taglib_generated_sources)
+Index: taglib-sharp.git/src/Makefile.am
+===================================================================
+--- taglib-sharp.git.orig/src/Makefile.am	2010-03-21 13:44:23.000000000 +0000
++++ taglib-sharp.git/src/Makefile.am	2010-03-21 14:07:18.717219589 +0000
+@@ -28,7 +28,7 @@
+ 	$(CSC) /target:library $(LIBFLAGS) $(DOCFLAGS) /define:SIGN /out:$@ $(TAGLIB_CSFILES) $(taglib_generated_sources)
  
  policy.%.$(ASSEMBLY_NAME).dll: policy.%.$(ASSEMBLY_NAME).config
--	$(AL) al /link:$< /out:$@ /keyfile:taglib-sharp.snk
+-	$(AL) /link:$< /out:$@ /keyfile:taglib-sharp.snk
 +	al2 /link:$< /out:$@ /keyfile:taglib-sharp.snk
  
  all: $(ASSEMBLY) $(POLICIES)
  
---- taglib-sharp/src/Makefile.in.old	2008-01-02 19:12:02.000000000 +0100
-+++ taglib-sharp/src/Makefile.in	2008-01-02 19:12:29.000000000 +0100
-@@ -450,7 +450,7 @@
- 	$(CSC) /target:library $(LIBFLAGS) /define:SIGN /out:$@ $(TAGLIB_CSFILES) $(taglib_generated_sources)
+Index: taglib-sharp.git/src/Makefile.in
+===================================================================
+--- taglib-sharp.git.orig/src/Makefile.in	2010-03-21 13:44:23.000000000 +0000
++++ taglib-sharp.git/src/Makefile.in	2010-03-21 14:07:36.667219457 +0000
+@@ -461,7 +461,7 @@
+ 	$(CSC) /target:library $(LIBFLAGS) $(DOCFLAGS) /define:SIGN /out:$@ $(TAGLIB_CSFILES) $(taglib_generated_sources)
  
  policy.%.$(ASSEMBLY_NAME).dll: policy.%.$(ASSEMBLY_NAME).config
--	$(AL) al /link:$< /out:$@ /keyfile:taglib-sharp.snk
+-	$(AL) /link:$< /out:$@ /keyfile:taglib-sharp.snk
 +	al2 /link:$< /out:$@ /keyfile:taglib-sharp.snk
  
  all: $(ASSEMBLY) $(POLICIES)
- 

-- 
taglib-sharp



More information about the Pkg-cli-libs-commits mailing list